summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/instanced-arrays-qml
Commit message (Collapse)AuthorAgeFilesLines
* Re-generate CMake project files for examplesJoerg Bornemann2021-05-181-0/+4
| | | | | | | 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>
* 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>
* 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-161-0/+5
| | | | | | | | | | | | 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>
* Add support for building with CMakeMike Krus2020-05-221-0/+54
| | | | | Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29 Reviewed-by: Mike Krus <mike.krus@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>
* 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>
* 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-232-1/+2
| | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAnnotation changesFranck Arrecot2016-03-171-1/+1
| | | | | | Task-number: QTBUG-51454 Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Some fixes for examples.Wieland Hagen2016-03-091-1/+1
| | | | | | | | Mostly insertion of RenderSurfaceSelector, FrameGraph->RendererSettings, remove parameter bindings Change-Id: I182092d43b0842da07e995387c0fe174d45345df Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAttribute API changesPaul Lemire2016-02-291-2/+2
| | | | | | | | - rename dataType to vertexBaseType - rename dataSize to vertexSize Change-Id: I0eca7054dd69e8aac69bc1d7d5023a7ca6ca9da2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove ParameterMappingPaul Lemire2016-02-261-3/+0
| | | | | | | | | | | | | | * Bindings are now entirely deduced from shader introspection * Modified the BackendNodeDirtyFlags to remove the class at this prevents the operator~() to be called * Make the Renderer loop check for the ComputeDirty flag and don't unset it if set Note: uses a hack to reset m_changeSet in performCompute as right know we are sometimes missing the markDirty(ComputeDirty) set by the ComputeJob nodes. Will be sorted out later. Change-Id: Ic4fa71ecf01b625e885a58a66278387bf5b36339 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Unify license header usage.Antti Kokko2016-01-264-76/+132
| | | | | | | | 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>
* instanced-arrays-qml: add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I094c423997dbdeb427886b33b3d53aab69a6ac65 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Have Qt3DQuickWindow manage window surfaceSean Harmer2016-01-181-1/+0
| | | | | Change-Id: I3d034728781aa5b99868c92ea73ebf427ee88c5a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Temporarily expose window to QML contextSean Harmer2016-01-181-0/+1
| | | | | | | | | Allows to restore most of the QML examples using this approach until a more permanent solution can be developed (I have an idea on how to do this and will try it today). Change-Id: I9b9bb86a5323140be3ed2456cdfa91b1f93187b1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Link examples against static libPaul Lemire2016-01-162-21/+7
| | | | | | | | | | | | | 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>
* instanced examples: Add proper annotations to techniquePaul Lemire2016-01-141-0/+1
| | | | | | | | This wasn't needed before because the TechniqueFiltering was broken. This is now needed to respect the intended behavior. Change-Id: I4f28e9757a6e726ab45a7806a74b34553e700aea Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* RenderView/GraphicsContext: support SSBO/UBO with buffer used as ParametersPaul Lemire2016-01-131-2/+2
| | | | | Change-Id: I347aa5deea6521b43b9033e2200ab2f8b272f671 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Camera moved - instanced-arrays-qmlRobert Brock2016-01-051-2/+2
| | | | | | | | | | From x: 10 to x: 9.5, z: 35 to z: 45 View from x: 10 to x: 9.5 This was to have the instanced items centered Change-Id: I79c2f71f3e171932c015a6e911ccaee73d3e4ebe Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove initialize/shutdown from APIv5.6.0-beta1Kevin Ottens2015-12-141-1/+0
| | | | | | | | Hiding them in QAspectEnginePrivate and calling them when needed from setRootEntity. Change-Id: I4c3dfb19d84ae90cc15bbff29a4abd0705bb61dc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename QOpenGLFilter to QGraphicsApiFilterAndy Nichols2015-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | This API change is part of an effort to remove anything specific to one graphics API (in this case OpenGL) from the public APIs. In addition to the name of the class being changed, the QGraphicsApiFilter::Api has been refactored to reference the Graphics API, rather than an OpenGL API. Now this list includes OpenGL, and OpenGLES, but could also include Vulkan, DirectX, or any other graphics rendering API we wish to support in the future. Right now the properties in this class are still reflective of the OpenGL APIs, and may need to be extended with other properties in the future for other rendering technologies. The QGraphicsApiFilter::Profile enum has also been changed to be more more clear. So for now there are enums NoProfile, CoreProfile, and CompatibilityProfile. Task-number:QTBUG-49078 Change-Id: Ib5f9c3b7adee5badec6bce8a12b23683eb43b4cb Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-194-4/+4
| | | | | | | | 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>
* Add an example showing instancing using VBO with divisor of 1Sean Harmer2015-10-198-0/+483
Change-Id: I710df314902ca592c236e2120119718fc3b90c2c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>