summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Doc: Fix documentation warningsTopi Reinio2019-11-134-15/+15
| | | | | | | | | | | | | | | | | | | | | | | - Add (basic) documentation for Qt3DAnimation::QAnimationCallback. - Add missing namespace qualifiers for \class, \fn, \instantiates, \sa, and \property commands. - Remove linking to example file pages, as QDoc no longe treats them as linkable targets. - Fix function/QML method parameter documentation - Fix missing \qmlproperty types - Fix linking to QKeyEvent in QtGui. - Move Qt3DRender::Quick namespace documentation to where QDoc can see it. - Add enum documentation for Qt3DRender::QBlitFramebuffer::InterpolationMethod and Qt3DRender::QMesh::Status. - Other minor fixes This brings the current warning count to zero. Fixes: QTBUG-79822 Change-Id: I1154a7f9c34917a3f240e99da0e7a300be7d65a0 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update AndroidManifest.xml to be compatible with Qt 5.14Eskil Abrahamsen Blomfeldt2019-10-251-5/+3
| | | | | | | | | | The bundled_in_lib and bundled_in_assets entries have been removed, so all manifests have to be updated to no longer refer to these. In addition, android-16 is no longer supported, so the minimum SDK versions have to be updated. Change-Id: Id01326df5522195647eb107b60ea7e637a950bb3 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* planets-qml: fix flickerring by using less precise scale unitPaul Lemire2019-10-232-22/+24
| | | | | | | | | | Essentially use 10^3 KM instead of KM so that we don't end up with too much precision in the positions which can then result in the camera flickering when the viewMatrix is computed for rendering Change-Id: Id2f878c2e1ccd22a2e72a3494d2e7f623f2b4eb6 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Scene3DView example: fix QML importsPaul Lemire2019-10-071-5/+5
| | | | | Change-Id: Ia46926faa46568a12dc02f7983477af6b395616d Reviewed-by: Mike Krus <mike.krus@kdab.com>
* QForwardRenderer: rename clearBuffers to buffersToClearPaul Lemire2019-10-071-1/+1
| | | | | Change-Id: Ifda1f6f69a6dc58d426dfddbd711620c185a30ab Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Introduce Scene3DViewPaul Lemire2019-08-278-1/+436
| | | | | | | | | | Allows to render several 3D scenes using a single Scene3D. To be used when you need multiple Scene3D instances. [ChangeLog] Introduce Scene3DView to render multiple distinct 3D scenes Change-Id: I5d51c5935218cc84c15d57def3703aa0d92040ba Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Scene3D: introduce compositingMode (FBO or Underlay)Paul Lemire2019-08-277-1/+4519
| | | | | | | | | | | | | | | | | | | | | | | | | The default compositing mode is FBO. One of the problematic aspects of Scene3D is its round trip through a FBO, which is moderately expensive on low-end hardware, although it makes it a fully fledged Qt Quick 2 item. If one wants MSAA then things are even worse, as an intermediate MS'ed FBO is needed, then resolving into the final one, whose color texture is then sampled. However, there's a significant use case for which these FBOs can be avoided, and that's the case of a 3D scene "below" other QQ2 content. In this setup, Qt3D can simply render to the screen, driven by QQ2; then QQ2 can draw on top. (It's the typical "underlay" scenario.) This can be enabled by setting the compositing mode to Underlay [ChangeLog] Scene3D add compositingMode property. Allows underlay rendering. Task-number: QTBUG-74977 Change-Id: I1ec5f5d60eab45835dbdb2596a7bf1b2ac3624e0 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Merge remote-tracking branch 'origin/5.13' into devPaul Lemire2019-06-0366-25093/+0
|\ | | | | | | | | | | | | | | Conflicts: src/render/renderers/opengl/renderer/renderer.cpp tests/auto/render/textures/tst_textures.cpp Change-Id: I4da0eafe7ddd4dd822c3dcb5f5fa826653a335b4
| * Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-05-2966-25093/+0
| |\ | | | | | | | | | Change-Id: I9e9214906c5cda56d0bcc98678c77be69189699d
| | * Remove assets that are no longer usedDmitry Shachnev2019-03-2366-25093/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Files chest.qrc, houseplants.qrc and metalbarrel.qrc which used these assets were removed in commit 74c06c02f896c6aba408cfd0857d317378572736. Change-Id: Idd8d5b9baedf4c8f608aff6e3b5dbfe1a4f5a25e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Eradicate Q_FOREACH loops and mark the module cleanMarc Mutz2019-05-221-1/+2
|/ / | | | | | | | | | | | | | | | | | | The only noteworth change is where a loop around spy.events modified the container using takeFirst(). There was no reason to do so, so it was changed to use the loop variable instead of the result of taking. Change-Id: I02c62a7c2efc5d042c6e669fe5daddd7da7e85d2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 5.12 into 5.13Paul Lemire2019-04-261-0/+3
|\| | | | | | | Change-Id: I42affdd02bddb5205b9f2455f0c5e5efbd414dd8
| * Fix the build with -no-guiLiang Qi2019-04-091-0/+3
| | | | | | | | | | | | Task-number: QTBUG-74602 Change-Id: If9cf0795e887a0b3cdfed0a6f5e7798116ef137d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Fix deprecation warnings about Qt3DRender::QBuffer::BufferTypeFriedemann Kleint2019-03-121-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the calls as 6158b4ae7cc88848b03d5d592a671de7113c4faf states that it no longer has any effect, fixing: gltfgeometryloader.cpp:333:18: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations] gltfgeometryloader.cpp:371:54: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] basegeometryloader.cpp:155:39: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations] basegeometryloader.cpp:202:46: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations] instancebuffer.cpp:61:39: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is dep tst_qbuffer.cpp:79:96: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_qbuffer.cpp:85:100: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_qbuffer.cpp:128:109: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_qbuffer.cpp:132:57: warning: ‘void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)’ is deprecated [-Wdeprecated-declarations] tst_attribute.cpp:56:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_attribute.cpp:108:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_buffer.cpp:74:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_buffer.cpp:271:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_buffer.cpp:297:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:519:95: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:574:95: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:967:83: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:969:82: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_trianglesextractor.cpp:56:118: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_trianglesextractor.cpp:57:116: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_trianglesextractor.cpp:199:118: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] Change-Id: I6835598a1771a0ec3a0b080911fa4cada210a01a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Fix various documentation warningsTopi Reinio2018-11-071-1/+1
| | | | | Change-Id: I3eecd06bba9438b5aa472f3ba7ecaecdeda985e2 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Remove unused CameraController.qml from simple-qml exampleKai Koehne2018-10-023-314/+0
| | | | | Change-Id: Id76f8fc4d4701933e7744ff0dff837ec5e4bcc02 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Document third party asset 'miramar'Kai Koehne2018-09-241-0/+14
| | | | | | | | | | | | | The files got added in commit f49cabe35cbd. However, the original sources from the linked url are in .tga format, so I assume they got converted before importing. We should probably add a 'Modifications' entry to highlight such conversions in the future. https://opengameart.org/content/miramar-skybox categorises the license as CC-BY 3.0, but the upload was done not by the author. Change-Id: I312a871716104507434eb6d12a547c3752da51af Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Document third party asset 'wine'Kai Koehne2018-08-142-0/+48
| | | | | | | | | | The code was originally imported in commit 2a9a67d1b179, and then updated in to upstream version 0.8 in commit 473bd13ed37. LICENSE.md is from upstream repository. Change-Id: I20f97d46125abc4f1c7d54c52b891acc50336ac5 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Doc: Add missing dots (qt3d)Paul Wicking2018-06-192-2/+2
| | | | | | Task-number: QTBUG-68933 Change-Id: I4226b8b9d70548b6921948c5ea47520f40f5df98 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-1/+0
|\ | | | | | | Change-Id: I666d4ca1ad39f81e41a9b47a8828d1689ff2b33e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 06:36:03 +0000