summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Re-generate CMake project files for examplesJoerg Bornemann2021-05-1831-0/+126
| | | | | | | Change-Id: Ic123a704f904096e112b5bdece167800dfc295bb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit b7b7285d0198c6d7e0e2f1a10a90a386e04f9e90) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 3dbfb4f73f0ade4d9bee5a243aa94c412b0ed73d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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-172-35/+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>
* Remove most examplesMike Krus2020-06-101-29/+29
| | | | | | | | Trying to please CMake CI which crashes on large resources. Will add back later. Change-Id: I5b57e9b1326e37624bf209813c4ae7c9a0c6762f Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: disable examples on msvc until the big-resources issue is solvedJean-Michaël Celerier2020-06-071-0/+10
| | | | | Change-Id: I250de427ffca49d2736c1f01046733df5fb25d6e Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Remove references to removed TexturedMetalRoughMaterialJean-Michaël Celerier2020-06-041-7/+7
| | | | | Change-Id: Ia1dd8d0441f6e6371cec574f7d937d6d94c57186 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Add support for building with CMakeMike Krus2020-05-2228-0/+2176
| | | | | Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix build for Qt6Mike Krus2020-05-064-7/+5
| | | | | | | | | | | | | - 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-273-28/+30
|\ | | | | | | 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>
| * Merge remote-tracking branch 'origin/5.14' into 5.15Antti Määttä2020-04-211-5/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h src/plugins/renderers/opengl/renderer/renderer.cpp src/render/backend/attachmentpack_p.h src/render/frontend/qrenderaspect.cpp src/render/picking/qabstractraycaster.cpp tests/manual/manual.pro Change-Id: I617b7e34bf7e11b2921bfc15e1b99c3e81891ec7
| | * No need to register input aspect in basicshapes-cpp exampleMauro Persano2020-02-211-5/+0
| | | | | | | | | | | | | | | | | | | | | This is already done in Qt3DExtras::Qt3DWindow. Change-Id: Idf742b93fdc0d8d4226284d6d949758a07921dd5 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * | Split examples so that build works without qtdeclarativeJean-Michaël Celerier2020-03-111-23/+29
| | | | | | | | | | | | | | | Change-Id: I98507808b43b116b1950fd60df54704562a234ce Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Pull bounding volume info from front endMike Krus2020-04-232-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an entity has a bounding QBoundingVolume component AND that has a QGeometryView, the bounding volume can be computed by the core aspect and the results get pulled to the render backend. Otherwise, we use the old code which computes the bounding volume in the render aspect. This means we have 2 jobs to compute bounding volumes and that the core version must complete before the render aspect runs. Change-Id: I4de45e48fa0c4d40d3d5084f387abfed5ea1a2f8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Make default geometries viewsMike Krus2020-02-2718-116/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Geometry refactoringMike Krus2020-02-272-3/+3
|/ / | | | | | | | | | | | | Move QBuffer, QAttribute, QGeometry to Qt3DCore. Change-Id: I59dfd091eefadcada93350b3aba955f40b304385 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Examples: enable HighDPI scaling for AndroidAssam Boudjelthia2020-02-241-0/+3
| | | | | | | | | | | | | | | | | | These examples show very tiny UI elements on Android devices, thus enabling HighDPI. Task-number: QTBUG-80717 Change-Id: Ibc1a82679e36d74ab6f6d51a4a5b06925f913b84 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Remove QtGui module path from OpenGL related pathsMike Krus2020-02-061-1/+1
| | | | | | | | | | | | | | | | Many are moving to opengl module in qt6, will make merging easier. Change-Id: I0ad08510e6999a5d887d9197fe2cb0dc21919fb9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add QRenderCapabilities to query GL about what is supportedMike Krus2020-01-203-3/+53
| | | | | | | | | | Change-Id: I7981e7e4b514e5d15d66c82351f1ab2fe160d20d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add Profiling OverlayMike Krus2020-01-173-2/+18
|/ | | | | | | | | | | | | | | | | Can be activated at adding a QDebugOverlay in the frame graph to identify which surface it should be renderer one (renders only once on first branch that contains such a node). Can be also activated on the forward renderer from Qt3DExtras. - Shows information about FPS and number of jobs/renderviews/commands/vertices/entities/geometries/textures... - Allows to toggle job and gl call tracing and open folder where trace files are stored - Windows to show and dump glinfo and renderview/command details to the console Change-Id: I286ff85760e8f8f0604a23458883ff22229bda94 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 07:39:05 +0000