summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/assimp/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Moved assimp example to manual testSean Harmer2016-05-151-117/+0
| | | | | | | | | tests.pro edited to add the new folder along with a .pro and .pri in the manual folder. Part of an examples cleanup Change-Id: I20b555f6d131b423e1f8986071bb4b62d8fac0ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Q_NULLPTR -> nullptrSean Harmer2016-05-011-1/+1
| | | | | | Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move last remaining pieces of examples-common to Qt3DExtrasPaul Lemire2016-05-011-2/+2
| | | | | | | Also created a Quick3DExtras for QML related extras (Qt3DQuickWindow) Change-Id: I1b95ea841e07ac8d68a07a1911d783b722e6fe03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QComponentList -> QComponentVectorPaul Lemire2016-02-221-1/+1
| | | | | Change-Id: Ic4f60f7d035c561d68ea806c72607028c9e12160 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Unify license header usage.Antti Kokko2016-01-261-18/+32
| | | | | | | | Updated license headers to use new BSD header instead of LGPL3 one (in those files which will be under BSD) Change-Id: I300c5840db3fd4708d5d85e84f7c6729cba326e5 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Link examples against static libPaul Lemire2016-01-161-13/+3
| | | | | | | | | | | | | 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>
* 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>
* Remove transforms property of QTransformSean Harmer2015-11-171-0/+14
| | | | | | | | 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>
* Rename Renderer -> Render throughoutSean Harmer2015-10-191-2/+2
| | | | | | | | 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>
* 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-201-2/+39
| | | | | | | | | | | | 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>
* 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>
* Examples: Remove shared resource library.Friedemann Kleint2015-05-201-4/+0
| | | | | | | | | | 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>
* Move the examples under a qt3d subdirLaszlo Agocs2015-03-041-0/+67
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 20:53:53 +0000