summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
Commit message (Collapse)AuthorAgeFilesLines
* Avoid clash with internal resources handling in static buildsMike Krus2022-06-271-1/+1
| | | | | | | | | | | | quick3d already defines a scene3d resource file, static build generates some symbols to load these. Avoid clash in symbol names by rename resource file here. Task-number: QTBUG-102883 Change-Id: I962c1a62e4a4379e4ccf0ac5d29383dc551ec8ec Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit b8837ca6f559171642c2ba48c00e8e4a2fee2262) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compilation of exampleMike Krus2022-04-051-1/+1
| | | | | | | | Task-number: QTBUG-101595 Change-Id: I9578d2943768c62ad57da9d19d9ca667a2dff3e9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 534cb9cd2cf758c40c47ba302542c55aa4ce92ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-226-413/+0
| | | | | | | | | These are leftovers from the qmake conversion. Change-Id: Id80e21ed99bd67b1d05586f596a9585526d47e7e Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 754fad1ba8d7a5dd2a9462224efd19282ae3a52e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve examples CMakeLists.txtKai Köhne2022-02-1526-416/+125
| | | | | | | | | | | | | | | | | | | - Remove # generated from xyz.pro comment from pro2cmake - Remove "# special case" markers for pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Change-Id: I42cb1788cd53082f71f6a67446dc94f502497dca Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 97c866c75f5d60a79d799279f315d744fbcc2174) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compilationMike Krus2022-02-041-1/+1
| | | | | | | | Task-number: QTBUG-99945 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit a09a74146416a9e17a9ca5dd705688b33151da83) Change-Id: I6bafcb26e976e80a0987e2f1d6950cd7cf811794 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* CMake: Use big resources in some examplesJoerg Bornemann2022-01-273-108/+6
| | | | | | | | | | | | | Update CMake project files for examples that use exampleresources/textures.qrc to use big resources. This avoids too much memory load on the compiler process. Fixes: QTBUG-100201 Change-Id: Iba933361f66ccb459f6fd1b36774748117b9655c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 30199e8ab7e05f5370fc28261c9dc72352fb0c1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-151-24/+24
| | | | | | | | Task-number: QTBUG-90820 Change-Id: I975f67a1899363687092b25d936c874163c661ea Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 7611c48f0c7fbebb33ffa3741de2d6eeb0663217) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: trim down the manifest file from unneeded tagsAssam Boudjelthia2021-12-031-44/+38
| | | | | | | | | | Follow-up to 468e4a8242da3e795fe0b218f97cfd97a1d7e032. Fixes: QTBUG-95439 Pick-to: 6.2 Change-Id: I1584ca4b29b25e669c8844be1a6941025c93288f Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Use qDegreesToRadians() in preference to hand-rolled macrosEdward Welbourne2021-09-101-7/+5
| | | | | | | | Also remove an unused macro, as well as the one that was used. Change-Id: I230c6ffded0a6db7e25c0a6b8f3f82bf583f4005 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-1725-25/+25
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-95636 Change-Id: I2ae5ba6164cb5ed450c8924d484d30167461c10d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix incorrect dependency on private modulesAlexandru Croitor2021-08-052-2/+1
| | | | | | | | | | | Public modules shouldn't propagate private modules as usage requirements. Pick-to: 6.2 Fixes: QTBUG-93428 Change-Id: Ic7aca0e8a6469604722596782e87d92d7e510e9e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Disable RHI Renderer by defaultMike Krus2021-07-1912-0/+46
| | | | | | | | | | | | | | | | | | | | RHI renderer use ShaderTools which is GPL licensed. This patch disables the plugin by default until Qt3D provides a suitable replacement for the dependency. To enable the RHI backend, compile Qt3D and pass parameter -DFEATURE_qt3d_rhi_renderer=ON to cmake. Unfortunate side effect of RHI backend being disabled is that when using Scene3D, the QtQuick renderer must be configured to use the opengl backend. [ChangeLog] RHI Backend is not longer built by default Task-number: QTBUG-94960 Pick-to: 6.1 6.2 Change-Id: I0bff7523e159b800734b58bfef37e5088d0a0d41 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Disable the audio visualizer example for nowLars Knoll2021-06-072-2/+2
| | | | | | | | It requires Qt Multimedia, but as that API has changed significantly, the example won't currently compile. Change-Id: Ic64ec8382b6a3dc778b1a9e2d6ff95a200fe8415 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-06-048-500/+125
| | | | | | | Task-number: QTBUG-86726 Change-Id: I2a7748b67b55008962809ece1a34c6cf2a0617bb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* wireframe example: fix to run properlyPaul Lemire2021-06-022-1/+4
| | | | | | | | | - use qrc:/ prefix for resources required by Qt 6 - for Qt3D OpenGL backend as RHI as no support for Geometry/Tessellation shaders Change-Id: Ie5bd0381088de561ead0c5592f16bbacb68043e6 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* wave example: for Qt3D's OpenGL backendPaul Lemire2021-06-021-0/+3
| | | | | | | As RHI has no support for Geometry Shaders Change-Id: I1f7f3a375be463936e5bda59362b08d9b0e34c9a Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Don't build Scene2D examplesPaul Lemire2021-06-022-2/+2
| | | | | | | | Since we haven't ported Scene2D over to Qt6 yet following the whole QtQuick rendering changes. Change-Id: I95c6eb8d70bcfafa2ee51ee684b2e4b9177f1f13 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Re-generate CMake project files for examplesJoerg Bornemann2021-05-1831-0/+126
| | | | | | Pick-to: 6.1 Change-Id: Ic123a704f904096e112b5bdece167800dfc295bb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* pbr-material example: add qrc:/ prefix resource for assetsPaul Lemire2021-04-232-35/+35
| | | | | | | | So that assets are properly picked up by Qt 6 Change-Id: I78eb79f0c4f5a2e124d57692d4af2947e743bd33 Pick-to: 6.1 6.0 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Minor fixes to compile against 5.15Paul Lemire2021-02-011-4/+12
| | | | | Change-Id: Id9574cf23b9af29815d8452915cebfc380fd94d1 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update QtQuick API to build with 5.15Mike Krus2021-01-111-1/+0
| | | | | | | Haven't tried to run anything, it just builds Change-Id: I6c2c2a949bc3892a363697cf38f1608af87c303c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Enable compiling non-QML API against Qt 5.15Mike Krus2021-01-051-0/+4
| | | | | | | | | | | | Built with QtQuick disabled. - C++17 required - minor issues with QList vs QVector - QMutexLocker templated vs not - moc forward declaration handling Change-Id: I5540625e74e2c009e528f56203e4b88be8d54599 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QtQuick based examples: let QtQuick/Qt3D decide on backendPaul Lemire2020-11-264-4/+0
| | | | | Change-Id: Id3ab38d02f8df7701410b8fcef8e112057825ecf Reviewed-by: Mike Krus <mike.krus@kdab.com>
* planet-qml example: port to RHIPaul Lemire2020-11-2620-6/+1385
| | | | | | Change-Id: I4246c59903a6d8f302a916ba7d19e9e37b5fe9c8 Pick-to: 6.0 6.0.0 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* control examples: fix asset path to also work on Qt6Paul Lemire2020-11-261-1/+1
| | | | | | Pick-to: 6.0 6.0.0 Change-Id: I723807d46d043c4d78dd6c6ead598886a7974efb Reviewed-by: Mike Krus <mike.krus@kdab.com>
* advancedcustommaterial example: add RHI supportPaul Lemire2020-11-265-0/+185
| | | | | | Pick-to: 6.0 6.0.0 Change-Id: I2e356cb893710c759a4d73eaf850ce39d46e5935 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* simplecustommaterial example: add RHI supportPaul Lemire2020-11-265-0/+61
| | | | | | Pick-to: 6.0 6.0.0 Change-Id: Id1dfc3c6a6f0c8090b5c5facc1a0dd9bb5a02bd6 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* compute-particles examples: add RHI techniques and shadersPaul Lemire2020-11-249-19/+171
| | | | | | | Pick-to: 6.0 Pick-to: 6.0.0 Change-Id: I56f1bb06479f82a10dda6dce0902a64381cd8147 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix deprecated API usage and compile warningsMike Krus2020-11-201-1/+1
| | | | | | | | | - QVariant::Type deprecated, use QMetaType related APIs - QNodeId not used as reference in for loops (nop but really noisy) - some unused code Change-Id: I291219207fcd1ad0bf89533b4e2bb5fa47a353bb Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix build for latest qtbase changesMike Krus2020-11-051-1/+2
| | | | | Change-Id: Ifc20f29a849be695558851d5ea01a68f94c35f26 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Finish removing traces of Scene3DViewMike Krus2020-10-2810-490/+0
| | | | | Change-Id: I450e53cc716235db1bc0675c904466050e17296d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* CMake: Regenerate examples to use qt_add_executableAlexandru Croitor2020-10-2032-32/+32
| | | | | | Task-number: QTBUG-87661 Change-Id: I594521a2b9aada164d684b8ef6ce71c730bfb64a Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Port instanced-arrays-qml to RHIPaul Lemire2020-10-197-17/+138
| | | | | Change-Id: I272cfa7688260f4ffb6b8ff49012188f717f62f4 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* CMake: Regenerate qt3d examplesAlexandru Croitor2020-10-1630-8/+504
| | | | | | | | | | | | 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-1325-25/+125
| | | | | | | | | | | 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>
* Use internal CMake APIMike Krus2020-10-071-1/+1
| | | | | | Task-number: QTBUG-86815 Change-Id: I7a8755571c8977be1f16b2287e5a8055e9016ee5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: rename Android's package name for Qt 6Assam Boudjelthia2020-10-031-2/+2
| | | | | | | | | Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Task-number: QTBUG-86969 Change-Id: Ife5db0d7272473872231a9f3cf94171dea95945a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* rhi: Start adding compute supportJean-Michaël Celerier2020-08-052-11/+11
| | | | | Change-Id: I37d0e1a0c56b874122e0db3ac60a90d19819630d Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Handle backend type based on QtQuick settingsMike Krus2020-08-053-1/+2
| | | | | | | | | | | | | | | | By default, Scene3D will select the RHI backend. If QQuickWindow::graphicsApi() is set to QSGRendererInterface::OpenGLRhi (QSG_RHI_BACKEND set to "opengl") then Qt3D will select the OpenGL backend. It's possible to use the OpenGL backend to RHI by setting QQuickWindow::graphicsApi() to QSGRendererInterface::OpenGLRhi AND setting QT3D_RENDERER to "rhi". (Note that setting to QSGRendererInterface::OpenGL has not effect). Change-Id: I71488ddb290ce2e30c724ddcc10c57ed8afe267b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Make sample meshes geometry renderers againMike Krus2020-07-3017-156/+91
| | | | | | | Introduce new geometry view class for each. Change-Id: I8e9a8f3a078d4cc63f9656ae8142e39f05d755c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* rhi: fix shadow map exampleJean-Michaël Celerier2020-07-299-5/+416
| | | | | Change-Id: I7c91d265d1eecaceff434b88311a8f0ea9c1c51d Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Replace QTouchDevice with QInputDeviceEdward Welbourne2020-07-271-4/+4
| | | | | | | | Its DeviceType also becomes an enum class, so needs one more layer of namespace prefix. Change-Id: Iec519721f30811d91348de92a11ffc82ba86e81d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* phong-cubes: reference existing assetsPaul Lemire2020-06-251-16/+16
| | | | | | | | Example was referencing assets that were removed a long time ago Change-Id: I9ab76c53d565d4579b9f7ffc9c69789d836d0159 Pick-to: 5.15 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update examplesMike Krus2020-06-2516-112/+88
| | | | | | | Not all work Change-Id: I7954f9fe41160c929ff48f8bdeae635b900fef33 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2020-06-242-2/+2
| | | | | Change-Id: I1e62b901adc2896129aab7ff714ca8bd3e762d69 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Restore building of examplesMike Krus2020-06-171-25/+27
| | | | | Change-Id: Ie9a73a025bc8de8dc58b6f283dc8467d9a6a1473 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Change how resources are bundled for Scene3dMike Krus2020-06-131-1/+1
| | | | | | | Fix static build Change-Id: Ifc2ef78694c2b8fe53961cee75371e5431fff9c4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependenciesPaul Lemire2020-06-121-1/+0
| | | | | | | | | | | - QOpenGLEXtensions now private API in GUI - Removed support for tessellation in GL 3 - Use QMouseEvent position - Removed use of QDesktopWidget - Adapt to change in QQuickWindow API Change-Id: I79df8780b9d02c6d2a3620529f5f41daec7120fe Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update Scene2D example to use QtQuick.Controls 2Paul Lemire2020-06-113-29/+28
| | | | | | | Change-Id: I4ab815079a5fd794714bc5a7cad05e970afcd731 Pick-to: 5.15 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Jean-Michaël Celerier <jean-michael.celerier@kdab.com>
* Fix Scene3D to work with latest QtQuick SceneGraph RHI changesPaul Lemire2020-06-111-0/+4
| | | | | Change-Id: If507aac8d48cc33fa7acf993ab77b76cdd70ee9a Reviewed-by: Mike Krus <mike.krus@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 16:02:43 +0000