summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/assimp
Commit message (Collapse)AuthorAgeFilesLines
* assimp: Add QInputSettings componentPaul Lemire2016-01-231-6/+11
| | | | | | | Inputs now working without setData Change-Id: I5aba21a7f2d29090106df50a679f7933d84003bd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Link examples against static libPaul Lemire2016-01-162-15/+5
| | | | | | | | | | | | | Contains: Qt3DWindow Qt3DQuickWindow QFirstPersonCameraController FirstPersonCameraController.qml This will allow to get rid of the Camera configuration hack Change-Id: I55c5634aa4c162f9dd2852d3258073a6352b426c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Moved the camera from Z: -40 to Z: 40Robert Brock2016-01-051-1/+1
| | | | | | Task-number: QTBUG-49800 Change-Id: I5ea57a174fed19687e66aa1be16b7c5430053f27 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove initialize/shutdown from APIv5.6.0-beta1Kevin Ottens2015-12-141-1/+0
| | | | | | | | Hiding them in QAspectEnginePrivate and calling them when needed from setRootEntity. Change-Id: I4c3dfb19d84ae90cc15bbff29a4abd0705bb61dc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Adapt examples to use no args form of Qt.matrix4x4()Sean Harmer2015-11-201-5/+6
| | | | | Change-Id: If289d74601e2244d4175ba6b1ea3eb95df0bd50b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove transforms property of QTransformSean Harmer2015-11-172-28/+62
| | | | | | | | Compound transformations are now built up using QMatrix4x4 in both QML and C++. Updating examples accordingly. Change-Id: I03c9abf1f6cdd1b56226dc0e16a7ad5ce84516dd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Documentation clean upVenugopal Shivashankar2015-11-061-1/+1
| | | | | | | | | | - Changed 'Qt3D' references to 'Qt 3D'. - Fixed incorrect \inqmlmodule instances. - Fixed broken \printuntil instances in the example docs. - Updated the namespace qualifier for a few class references. Change-Id: I250afe6843b10ed520f9ce5d7465203cc5c212c1 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-193-4/+4
| | | | | | | | This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Change import name of Qt3D Core from Qt3D 2.0 to Qt3D.Core 2.0Sean Harmer2015-10-161-1/+1
| | | | | | | Makes the QML imports consistent with the C++ namespaces. Change-Id: I8c781a67a9010124bd22bb1fab16c4f1082fd962 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-131-4/+4
| | | | | | | Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Render aspect into the Qt3DRender namespaceSean Harmer2015-10-131-3/+3
| | | | | | | Updated examples and tests accordingly. Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Input aspect to Qt3DInput namespaceSean Harmer2015-10-131-1/+1
| | | | | | | Also update examples accordingly. Change-Id: I8d19c3165899e4b7b791deb33098af4fb439f44a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Create proper Quick extended classes in scene loadersLaszlo Agocs2015-08-202-2/+125
| | | | | | | | | | | | This allows exploring the loaded subtrees from QML/Javascript code. The C++ classes are not suitable for this as they lack properties that involve QML specifics. The assimp (QML) example is updated to show how to do this (with the help of some C++ code). Say hello to the pulsating torus and the rotating monkey! Change-Id: I60401272105df5d72f4b7afebe26a3271e92f19e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.5.0' into 5.5Sean Harmer2015-06-212-3/+3
|\ | | | | | | | | | | | | Conflicts: src/input/qkeyboardcontroller.cpp Change-Id: Ifb0b5af165fb11dbe07849f34d3b93d9cc78eeaa
| * Move temporary window class to examplesSean Harmer2015-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | So as to avoid public header without a QPrefix. Real integration points will be added later. Also removed it from the Qt3D namespace and fixed linkage. Task-number: QTBUG-46617 Change-Id: I1bea09f45f5fdba3d658b57b86b907ab57164479 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Use Qt3D.Renderer rather than RenderSean Harmer2015-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | This should make the documentation and code terminology consistent throughout. We can rename the source directories at a later date if needed. Task-number: QTBUG-46622 Change-Id: I2737e54192341808f4a0270ad19ba70f6c4af589 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Update assimp example to use 2 SceneLoadersPaul Lemire2015-06-072-32/+33
|/ | | | | Change-Id: I4592e1366651fd7cc9790267a57b692b80b95320 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Target path definition for examplesMika Salmela2015-05-241-1/+3
| | | | | | | Added examples.pri to examples folder to help deployment to devices. Change-Id: Ib7b6514d5b5a31dee9a3b7f6f79277550fb77502 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Examples: Remove shared resource library.Friedemann Kleint2015-05-202-7/+2
| | | | | | | | | | Split example-assets.qrc into smaller resource files per directory and add those to the examples as required. Task-number: QTBUG-45990 Change-Id: I0a5a6cee64dc23560e9e093f272ff0d90a6e2e97 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Add skeleton documentation for the examplesTopi Reinio2015-03-171-0/+32
| | | | | | | | | | | | Add a skeleton version of the example documentation for each example, create a group page for them and link to it from the module landing pages. This allows browsing the example code from the docs and also enables listing them in Qt Creator's Welcome mode. Change-Id: I1ba16399b115bb8c5503bc91d2a8dee46417cd01 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move the examples under a qt3d subdirLaszlo Agocs2015-03-044-0/+174
Modules cannot have their examples in the top-level examples directory because in the pre-built packages all modules' examples are merged together. Change-Id: I80fdbb8f1ec6f3d8fd793e4d856e705000237127 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>