summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
Commit message (Collapse)AuthorAgeFilesLines
* Change license for snippets and examples filesLucie Gérard2024-04-1712-12/+12
| | | | | | | | | | | | According to QUIP-18 [1], all examples and snippets files should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I34b4d6d4a5a6715fb270a916ac7c19c3a09b27d9 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Doc: Move examples to '3D' categoryTopi Reinio2024-02-217-7/+7
| | | | | | | | Pick-to: 6.7 Task-number: QTBUG-122377 Change-Id: I674641da56e2a5c3578a81ff3236f7389e5ddd24 Reviewed-by: Jaishree Vyas <jaishree.vyas@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Doc: Add example categories for Qt 3D examplesMats Honkamaa2023-08-117-0/+7
| | | | | | | Task-number: QTBUG-115985 Pick-to: 6.5 6.6 Change-Id: I1064f04d39d59146e4b5af70403853ad65d12efa Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* pbr-materials: Fix runtime warningKai Köhne2023-06-071-1/+1
| | | | | | | | | | Fixes qt.qml.context: qrc:/BasicCamera.qml:14:5 Parameter "aspectRatio" is not declared. Injection of parameters into signal handlers is deprecated. Use JavaScript functions with formal parameters instead. Pick-to: 6.5 6.6 Change-Id: I51f8e912c41c96fdd10c9fe633ec2be3e52a8ecc Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Restore missing assetsMike Krus2023-03-1755-186/+247724
| | | | | | | | | Got removed erroneously when moving stuff to manual tests. Task-number: QTBUG-111980 Pick-to: 6.5 6.5.0 Change-Id: I66cd16ea570b77825987a9297d317e03a0789d67 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Replace \quotefromfile with \snippet to make code left-alignedAndreas Eliasson2023-03-064-16/+15
| | | | | | | | | | | | | | The \quotefromfile command is smart enough to keep the left indentation from the source file when it renders the code in a code snippet in a qdoc file. This is all good when you're listing multiple code snippets and you can clearly see the left-most-aligned code, or 'starting point'. However, when you use \quotefromfile for a single code snippet that is indented in the source file, the rendered code in the qdoc file is not left-aligned - and this looks a bit odd. Pick-to: 6.5 6.4 6.2 Change-Id: Ie6d2445b37faa4a75749d6013001892de012a1ef Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge both controls based examplesMike Krus2023-02-2810-4447/+38
| | | | | | | | Can toggle underlay mode from main.cpp. Pick-to: 6.5 Change-Id: Id3ef156b0df9b30dd9d7d3620a2878e70434d69b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move some examples to manual testsMike Krus2023-02-27365-338294/+4
| | | | | | | | | | Reduces the maintenance burden. Also fixed a few issues when moving code. Pick-to: 6.5 Change-Id: I647f0c1a215f27a0e834d328ca64cfb570639b04 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove scene2d example and manual testMike Krus2023-02-2310-4614/+0
| | | | | | | | Not supported in Qt6 Pick-to: 6.5 Change-Id: Id33603d3b88e0eda1ae27e6ed4b8d08e2e0c91c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove Qt6 QT_VERSION checks from the code basePaul Lemire2023-02-101-4/+0
| | | | | | | | | | Those are left overs from the Qt 5.15 to Qt 6 port. Now that both code based have diverged, there's no much point in keeping those checks. Pick-to: 6.5 Change-Id: I4e83876b6b4cb18b181af32e376f4411054a1183 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix audio-visualizer exampleTomi Korpipaa2022-10-203-22/+23
| | | | | | | | Pick-to: 6.2 6.4 Fixes: QTCREATORBUG-27852 Change-Id: Icc10aa51f54a7ff19dcff2349048b436f273d6bf Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Use SPDX license identifiersLucie Gérard2022-10-1223-1144/+63
| | | | | | | | | Amends commit 2f1bc82b35209aacd8d214a3c7e8e725bee85de6. Some files were still missing. Task-number: QTBUG-67283 Change-Id: Ia16185d82a339fb83939a1d91ecacd717c19eb6e Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Apply fixes for SPDX compliance and easier parsingLucie Gérard2022-09-262-0/+2
| | | | | | Task-number: QTBUG-106233 Change-Id: I376f131892f3adf9785ffa214671f7d5922ef172 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-2426-26/+26
| | | | | | | Task-number: QTBUG-105718 Change-Id: I97fa27f60a8546ea3d73cc7daf1b728c615a1ab0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-0826-0/+78
| | | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I141f5077ae0c11e1058de64d573ca33e2a308ccd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Avoid clash with internal resources handling in static buildsMike Krus2022-06-231-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 Pick-to: 6.3 Change-Id: I962c1a62e4a4379e4ccf0ac5d29383dc551ec8ec Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Use SPDX license identifiersLucie Gérard2022-06-22169-7957/+359
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I8105424281eed871037fa6c463871ca8829876b5 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Fix compilation of exampleMike Krus2022-04-191-1/+1
| | | | | | Task-number: QTBUG-101595 Change-Id: I9578d2943768c62ad57da9d19d9ca667a2dff3e9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-226-413/+0
| | | | | | | | These are leftovers from the qmake conversion. Pick-to: 6.3 Change-Id: Id80e21ed99bd67b1d05586f596a9585526d47e7e Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* 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 Pick-to: 6.3 Change-Id: I42cb1788cd53082f71f6a67446dc94f502497dca Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@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. Pick-to: 6.2 6.3 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>
* Fix compilationMike Krus2022-01-191-1/+1
| | | | | | | Task-number: QTBUG-99945 Pick-to: 6.2 Change-Id: I6bafcb26e976e80a0987e2f1d6950cd7cf811794 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-151-24/+24
| | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: I975f67a1899363687092b25d936c874163c661ea Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 01:35:25 +0000