summaryrefslogtreecommitdiffstats
path: root/examples/torus-qml
Commit message (Collapse)AuthorAgeFilesLines
* Copyright header change.Mika Salmela2015-02-092-38/+28
| | | | | | | | As for preparation for Qt5.5 release the copyright header is updated to correspond the current license requirements. Change-Id: I36632918b66f455539453b42c369689fb11298ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* The input aspect don't need QWindow anymoreKevin Ottens2015-01-231-1/+1
| | | | | | | | | This aspect doesn't need to depend on a QWindow, any QObject can do as long as we can have an event filter on it and we see input events on it. Rename the whole concept to "view" in the process. Change-Id: Idce2fcc37c5679fe0f7915d27793685167dd59a6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove the now useless QuickWindowKevin Ottens2015-01-231-2/+3
| | | | | Change-Id: I714cf941230fdd83f0de37125bf44b4888662b25 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move CameraController in the input aspectKevin Ottens2015-01-232-2/+3
| | | | | | | | | | | | | | | With this move it also becomes a private class. As a result I had to touch all the examples as you won't get camera navigation anymore if the input aspect is not registered. Quick3DConfiguration doesn't depend on the QuickWindow singleton hack anymore, it tries to get back to the aspects and set the camera on the ones having a corresponding property. It also mostly empties Window and QuickWindow. Change-Id: Ife1644bd338e51929bad1e99089bd5e4c68ebc68 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* use the default ForwardRenderer in the examplesPaul Lemire2015-01-184-76/+2
| | | | | Change-Id: Iade146d9d63ba9d8b33953467e67d5864d0469b9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Qt3D::Window simplifiedPaul Lemire2014-11-141-6/+9
| | | | | | | | | | | | | | The Qt3D::Window doesn't contain the QAspectEngine anymore. This will allow to to pass any kind of surface to the QAspectEngine. We could still have a wrapper like QQuickView around the QQmlAspectEngine if needed but if it weren't for the camera controller that we need to keep a little longer, a simple QWindow could be used in every example. All examples were updated. Change-Id: I4921df0df6f1066cd409ea886faf41d7e8834ef6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Qt3DQuick value type and color providersPaul Lemire2014-10-311-7/+0
| | | | | | | | | | | | | | | | | Provides the following value types under the Qt3D QML import: QColor QVector2D QVector3D QVector4D QQuaternion QMatrxi4x4 This allow users not to import QtQuick everwhere when they just need one of those types. Change-Id: I7bd7e29c70c22886c40edb7abfb6ff1b7329b235 Task-number: QTBUG-41550 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QCamera refactoredPaul Lemire2014-10-301-15/+8
| | | | | | | | All examples updated to work with the modifications. Change-Id: I51a3036fa750ca297a2180c488747d0878b940a4 Task-number: QTBUG-41543 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename RendererAspect -> QRenderAspectSean Harmer2014-10-261-2/+2
| | | | | Change-Id: Ib16fe125e160764571775f3667cff082db921f7d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QTechniqueFilter: renamed criteria property to requiresPaul Lemire2014-10-201-1/+1
| | | | | Change-Id: Id7b06add196edc64c553cdeff31bc3333fa7acaf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed QCriterion to QAnnotationPaul Lemire2014-10-171-1/+1
| | | | | | Change-Id: I4b40120807a60873b38687ba8ce0b6c2dfd77127 Task-number: QTBUG-41534 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Updated examples to use ClearBufferPaul Lemire2014-09-151-2/+5
| | | | | | Change-Id: I2ef4c1b78b973b8a0e0df1452b398b96d5b8366b Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Updated examples to not use the removed renderPassName propertyPaul Lemire2014-08-141-2/+0
| | | | | Change-Id: Iccf0aeef6d0f3ed173f8db4f2d8f161f71d17ac9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed QML TechniqueCriterion to CriterionPaul Lemire2014-07-251-1/+1
| | | | | Change-Id: I9b0892816dd190c83a6f1bb3834dd97a9dfb9871 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Examples updates to use new QTechniqueCriterion syntaxPaul Lemire2014-07-251-1/+1
| | | | | Change-Id: I871be19f417a2ac1dae531c4c2807bda7e59c8e8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Shape subclassesPaul Lemire2014-07-051-2/+1
| | | | | | | | QTorusMesh and QSphereMesh subclasses. Shape rename to QAbstractShapeMesh. They all have a d-pointer. Change-Id: I2c97fd01d7fa5e8bfa7c5e1b07f1a5249e79b36c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Compile again on OS XSean Harmer2014-06-121-2/+2
| | | | | Change-Id: I5c3dc490e6b324733713b791dcfa61305378d904 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Torus QML : removed custom properties from EffectPaul Lemire2014-06-071-2/+0
| | | | | | | | At the moment the Effect is no longer exposed as a Custom QML Type hence using custom properties results in QML errors. Change-Id: Ife2f8187e0b68932afda27a8b3f03d99399a95ab Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a minimal C++ + QML shape example (showing a torus)Giuseppe D'Angelo2014-06-045-0/+272
Change-Id: I04fcbdd28c5c05697fb04f6dfc809a2d8b8de5c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>