summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/simple-cpp
Commit message (Collapse)AuthorAgeFilesLines
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-171-1/+1
| | | | | | | | Task-number: QTBUG-95636 Change-Id: I2ae5ba6164cb5ed450c8924d484d30167461c10d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2372efc5d1f754116f6088099e7ac90b2317974c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Re-generate CMake project files for examplesJoerg Bornemann2021-05-181-0/+4
| | | | | | Pick-to: 6.1 Change-Id: Ic123a704f904096e112b5bdece167800dfc295bb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate examples to use qt_add_executableAlexandru Croitor2020-10-201-1/+1
| | | | | | Task-number: QTBUG-87661 Change-Id: I594521a2b9aada164d684b8ef6ce71c730bfb64a Reviewed-by: Mike Krus <mike.krus@kdab.com>
* CMake: Regenerate qt3d examplesAlexandru Croitor2020-10-161-0/+4
| | | | | | | | | | | | Many of the examples were missing find_package() calls. Some were missing some example install dir things. Some missing special cases. Some incorrectly specified library names due to missing mappings in pro2cmake. Some incorrectly specified target names. Change-Id: I131a02dc679502ea6c1cdeb32962e77f09e672af Reviewed-by: Mike Krus <mike.krus@kdab.com>
* CMake: Honor INSTALL_EXAMPLESDIRJoerg Bornemann2020-10-131-1/+5
| | | | | | | | | | | Re-generate examples, but only the chunks that handle INSTALL_EXAMPLESDIR, because there have been so many manual changes that were not special-cased. Fixes: QTBUG-87331 Change-Id: I0926c015ce2733b462adba18e3dbf47621a7e679 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
* Make sample meshes geometry renderers againMike Krus2020-07-301-7/+2
| | | | | | | Introduce new geometry view class for each. Change-Id: I8e9a8f3a078d4cc63f9656ae8142e39f05d755c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add support for building with CMakeMike Krus2020-05-221-0/+34
| | | | | Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix build for Qt6Mike Krus2020-05-061-4/+2
| | | | | | | | | | | | | - updated dependencies, excluding qtgamepad for now - fixed issues with Q_PROPERTY not supporting forward declarations - fixed for changes in QtQuick private API - fixed for changes in QtOpenGLVersionFunctions API - fixed for removal of QT_OPENGL_ES* macros - fixed for changes in QtConcurrent API - fixed RHI based build Change-Id: I42ccd2f101b7f0a78e2860c6d551722bf6710a11 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.15' into devMike Krus2020-04-271-0/+1
|\ | | | | | | Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e
| * rhi: Port most of Qt3DExtras materials to RHIJean-Michaƫl Celerier2020-04-221-0/+1
| | | | | | | | | | Change-Id: Iba20f047404b20c1e5b9bdcef917b3c2a1000d59 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Make default geometries viewsMike Krus2020-02-271-3/+8
|/ | | | | | | | | | In Extras, make QTorusMesh and others a QGeometryView rather than a QGeometryRenderer. Requires changes to scene graphs here and there but going forward there simple shapes could be used as proxies for picking or collision detection, etc. Change-Id: Id488e064080dfd303e448aba11e6b242236b81d4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove excess slashes from include statementsMiikka Heikkinen2016-09-051-2/+2
| | | | | Change-Id: I64f815587947ad2f63462bb38027c533c7aa4bdc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Add documentation for the Simple C++ exampleLeena Miettinen2016-06-092-0/+49
| | | | | | | | Without this change Qt Creator tags this example "broken" and hides it from the Examples tab in the Welcome mode. Change-Id: I276ddb3ea50f05695a6afa7fa34de682bdc944c2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Replaced FPS Camera with Orbit - Simple-cppRobert Brock2016-05-061-2/+3
| | | | | | | | | | | Simple-Cpp example now has OrbitCameraController instead of FirstPersonCameraController Added line setting view center to be a more complete example. Part of the examples cleanup. Change-Id: Ib59d9cc8263e082c4ddce64ad129493fba044ae1 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-012-3/+3
| | | | | | | Also created a Quick3DExtras for QML related extras (Qt3DQuickWindow) Change-Id: I1b95ea841e07ac8d68a07a1911d783b722e6fe03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-231-8/+8
| | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Removed unneeded QFrameGraph imports in examplesWieland Hagen2016-03-091-1/+0
| | | | | Change-Id: Ic5d1f04b365e43389b88862890b1d137c4f50ef9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Increase speed from default in simple-cppSean Harmer2016-02-031-0/+2
| | | | | | Change-Id: I4a7023eb2bbca57661a3f041f138d29a047ad114 Reviewed-by: Robert Brock <robert.brock@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Unify license header usageAntti Kokko2016-01-261-5/+5
| | | | | | | Updated FDL license. Change-Id: If5b261a12d1fba0d317848d3710e45e83f992fdf Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Unify license header usage.Antti Kokko2016-01-263-54/+96
| | | | | | | | 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>
* Move QCamera/QCameraLens to Qt3DRenderPaul Lemire2016-01-161-4/+10
| | | | | | | | Also get rid of Qt3DRender::QWindow and of the hard codes camera controller. Change-Id: I307735d01caf97b7a690b28de8dc99fc9866c35f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Link examples against static libPaul Lemire2016-01-164-90/+212
| | | | | | | | | | | | | 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>
* Camera moved - simple-cppRobert Brock2016-01-051-1/+1
| | | | | | | | From z: -40 to z: 40 Change-Id: I67506d849dd80043109a7aeb431348b09c21755a Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove QAbstractTransform and friendsSean Harmer2015-11-171-5/+0
| | | | | | | | New simplified QTransform doesn't need these any longer. We now get a nice reduction in QObject count when dealing with transformations. Change-Id: I8ba8febada4ad1f05728aa848fb5e70a62028040 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove transforms property of QTransformSean Harmer2015-11-171-21/+79
| | | | | | | | 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-192-10/+10
| | | | | | | | 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-10/+10
| | | | | | | 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-4/+4
| | | | | | | 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>
* simple-cpp: uses the Qt3D::QWindowPaul Lemire2015-08-111-25/+5
| | | | | | | | Note: we don't have the blue clear color because it defaults to white with the default framegraph Change-Id: I993675105530d8f01b1b80b65bc37ec35e98426b 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>
* Target path definition for examplesMika Salmela2015-05-241-1/+4
| | | | | | | Added examples.pri to examples folder to help deployment to devices. Change-Id: Ib7b6514d5b5a31dee9a3b7f6f79277550fb77502 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-042-0/+167
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>