summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3d/items
Commit message (Collapse)AuthorAgeFilesLines
* Fix sourceComponent property of EntityLoaderFriedemann Kleint2019-01-031-1/+1
| | | | | | | | | | Add the accessor to the property macro, fixing warning: Property declaration sourceComponent has no READ accessor function or associated MEMBER variable. The property will be invalid. Amends 4030e1796ca10c0eeab4fcb6cc6000b5bdb08028. Change-Id: Icc5048d34ecae4f7d0648002727362eaa97614a8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Quick3DEntityLoaderPrivateSubject: Fix warning about unused variableFriedemann Kleint2018-09-171-2/+0
| | | | | | | | In member function ‘void Qt3DCore::Quick::Quick3DEntityLoaderPrivate::loadComponent(QQmlComponent*)’: ../qtbase/include/QtCore/../../src/corelib/global/qglobal.h:1056:34: warning: unused variable ‘q’ [-Wunused-variable] Change-Id: I5ae96ae09f40578857355f114c0e71c8af0c575f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* EntityLoader: add sourceComponent propertyPaul Lemire2018-08-203-5/+53
| | | | | | | | | Now handles either loading from file or from a Component [ChangeLog] EntityLoader now also supports loading an Entity from a Component Change-Id: I1988f897071e5527b36e1b494bba57e9ab165bd8 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Doc: Add missing dots (qt3d)Paul Wicking2018-06-191-1/+1
| | | | | | Task-number: QTBUG-68933 Change-Id: I4226b8b9d70548b6921948c5ea47520f40f5df98 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix build without features.qml-delegate-modelTasuku Suzuki2018-05-151-2/+24
| | | | | | Change-Id: I349a6ea5440aef5bc354ce90bc24284407893c60 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix for a missing headerNikolay Zamotaev2018-05-041-0/+1
| | | | | | | | | | | | QQmlIncubator was used in the code, but not included. Change-Id: Ie31be9578c24ae39ca0685fd8b4a050df6680bee Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Nikita Krupitskas <nkrupitskas@luxoft.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Svetlana Abramenkova <sabramenkova@luxoft.com> Reviewed-by: Nikolay Zamotaev <nzamotaev@luxoft.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Fix documentation warnings for Qt 3D CoreTopi Reinio2018-02-161-10/+0
| | | | | | | | | | | | This change fixes multiple QDoc warnings for Qt 3D Core that are related to how Clang parses the source code and the \fn QDoc commands. We still have a number of 'No documentation for ...' warnings left - those are not addressed in this change. Change-Id: Ia6394f453d7bd959bc4d4cc9347ac0039b80f661 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge branch '5.10' into devSean Harmer2018-01-171-2/+4
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d
| * Merge branch '5.9' into 5.10Sean Harmer2018-01-121-2/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/animation/backend/handle_types_p.h src/extras/defaults/qtexturematerial.h src/render/backend/entity_p.h src/render/backend/handle_types_p.h src/render/backend/renderview.cpp src/render/io/scenemanager.cpp Change-Id: Ic145062cc98360e9067fd60f0992c7a6b51e41bb
| | * Quick3DNodeInstantiatorPrivate: Fix build after private API changeFriedemann Kleint2017-12-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | qtdeclarative/60d589ccddb036e84883a6c2ef63a5292c8ad022 changed QQmlInstanceModel::object() to take an enumeration. Task-number: QTBUG-61537 Change-Id: I2fab7e80b728f9265e201f47614a79167199667f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-251-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-251-2/+2
|/ / | | | | | | | | Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* / Add extension object for QJoint to manage child joints from QMLSean Harmer2017-08-163-2/+187
|/ | | | | Change-Id: I074e78f5e0c0be878d697dc87846ecc6ed6cd78f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update NodeInstantiator's children on parent updateMauro Persano2017-06-162-0/+15
| | | | | | | | | | | | | | Currently the parent for elements created by NodeInstantiator are set to the instantiator's parent. This doesn't work for nested instantiators, since at the time the inner instantiator's children are being created the instantiator itself doesn't yet have a parent node yet. Update the parent of elements created by the instantiator when the instantiator's parent changes. Change-Id: I6f260ad2a8a81af5551799e6c643d8849f46e342 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Fix memory leak in Quick3DNodeInstantiatorPrivateMauro Persano2017-06-141-1/+2
| | | | | | | | | Objects are managed by the instance model, so delete instead of deleting objects directly. Task-number: QTBUG-61293 Change-Id: I6ff17e646fce60bf12d575c4c377bee3c82a60cb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.8' into 5.9Sean Harmer2017-04-029-18/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/jobs/qthreadpooler.cpp src/core/nodes/qcomponent.cpp src/core/qpostman.cpp src/core/qscene_p.h src/core/services/qservicelocator_p.h src/input/frontend/qinputaspect.cpp src/plugins/sceneparsers/assimp/assimpimporter.cpp src/plugins/sceneparsers/assimp/assimpimporter.h src/plugins/sceneparsers/gltf/gltfimporter.h src/plugins/sceneparsers/gltf/gltfio.cpp src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp src/quick3d/imports/render/qt3dquick3drenderplugin.cpp src/quick3d/quick3dextras/qt3dquickwindow.cpp Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
| * Coding convention fix for Src/Quick3DRobert Brock2017-04-019-18/+21
| | | | | | | | | | | | | | | | Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I60008858a4975621b9159d909908b6bba2f98f14 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QNode PropertyTrackMode cleanupPaul Lemire2017-02-243-2/+316
| | | | | | | | | | | | Task-number: QTBUG-58897 Change-Id: Ie92c26e7b34ea7730461786f484ff50b003f747a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Quick3DEntity: use dedicated list of QML componentsPaul Lemire2017-02-122-3/+5
| | | | | | | | | | | | | | So that we can add layers to prebuilt Entities Change-Id: I608c3dfcb6351c95f4cd373f14bea0f3a247508c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Allow Quick3DEntityLoader to work when created from C++Kevin Ottens2017-01-271-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | For that we try harder at finding the QML engine. If it's not known to the Quick3DEntityLoader instance, we climb up the parent/child relationship to find an object associated to the engine and we get the loader to work from there. In practice will be useful for LevelOfDetailLoader in the next commit. Change-Id: I64ab709d25e8edbecc3662eb96f5d92f99f1b13e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | EntityLoader: add a status propertyPaul Lemire2017-01-253-2/+64
| | | | | | | | | | | | | | | | And complete the documentation a bit Change-Id: I3d3520e09456d256ee258d14656e97a08f2727aa Task-number: QTBUG-57613 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.8' into devSean Harmer2017-01-101-1/+10
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iae28acac3058d5c2f223c989393cededad49da08
| * Update EntityLoader docsAntti Määttä2017-01-101-1/+10
| | | | | | | | | | | | Change-Id: I5b87cc9a581267fab5a0c482f243f9e1d611423a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.8' into devSean Harmer2016-12-212-1/+8
|\| | | | | | | | | | | | | Conflicts: src/input/frontend/qaxisaccumulator.cpp Change-Id: I7d213339241743e60f11cf0f3ae68076cb762c62
| * Only pass static metaobjects around and fix EntityLoaderPaul Lemire2016-12-162-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Ensure the notification changes only pass in static metaobjects. - Make the EntityLoader use the AsynchronousIfNested incubation mode to avoid cases where we could destroy something still being incubated - Add a manual test to test this cases This fixes the crashes occurring when using NodeInstantiators and EntityLoaders as delegates. Change-Id: I104c60b4be34cfb843a74dd09a8b96fdac44657d Task-number: QTBUG-57655 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add missing emit keyword when calling signalsSergio Martins2016-12-181-9/+9
|/ | | | | | | It's improves readability and fixes clazy-incorrect-emit warnings. Change-Id: I1cfda5534e08f6f3ce0809716e0adbe182c50c0d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-241-1/+1
|\ | | | | | | Change-Id: Idb141c715c7d06d2ecdce403d0f3740ee18b2b8f
| * NodeInstantiator created nodes go to its parentv5.7.1Kevin Ottens2016-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, elements created by the NodeInstantiator are children of the instantiator itself. Change that to parent them in the instantiator parent instead. Rationale for that is that it will behave similarly to Repeater this way, and gives a chance of using NodeInstantiator in frame graphs. Indeed, anything which is not a FrameGraphNode gets pruned in that context that would include branches starting from NodeInstantiator. Change-Id: I651a51471d92fcf466c9abd5dbbbfa2960ef1247 Task-Id: QTBUG-55908 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix NodeInstantiator::objectAdded docsDaniel Vrátil2016-11-011-2/+2
|/ | | | | | | | | The 2nd argument name in the documentation was different from the actual name. Change-Id: I626f2ab4258d977a4679bf1750dace3b23b65dd5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update QEntity docsAntti Määttä2016-09-021-5/+22
| | | | | | Change-Id: I4a28761474d961d39074490e12f21b3d0c7ac911 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Quick3DNode: eradicate Q_FOREACH loops [const-& returns]Marc Mutz2016-05-141-2/+2
| | | | | | | | | | ... by replacing them with C++11 range-for loops. The function QObject::children() returns by const-reference, so its result can be passed to range-for without further changes. Change-Id: Ia0c51e585f9b10f0a98ad6cbf294182051f14069 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* quick3d: eradicate Q_FOREACH loops [low-risk]Marc Mutz2016-05-142-4/+6
| | | | | | | | | | | | | ... by replacing them with C++11 range-for loops. This is the batch with low-risk changes. They operate on local containers or the loop body clearly does not cause the container to change. Sprinkled in a reserve() or two. Change-Id: I5a3da485213791ae58c82f4a81829cfba558a3d6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Q_NULLPTR -> nullptrSean Harmer2016-05-013-19/+19
| | | | | | Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Strip out cloning subsystemSean Harmer2016-04-294-32/+16
| | | | | Change-Id: I4def54a11de0f9c676ef6b2d7bd8e723ded25ab9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QNode: make cleanup a private slotPaul Lemire2016-04-234-12/+0
| | | | | | | | | | QT3D_CLONEABLE now implements a default dtor that calls _q_ cleanup QT3D_CLONEABLE_CUSTOM_DTOR is used for classes that really need to implement their own dtor but they need to invoke _q_cleanup manually Change-Id: I2937a3b9edeb5a763749f0044360d78ab4461a5e Task-number: QTBUG-51464 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QComponentList -> QComponentVectorPaul Lemire2016-02-221-1/+1
| | | | | Change-Id: Ic4f60f7d035c561d68ea806c72607028c9e12160 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-262-5/+0
|\ | | | | | | | | | | | | | | | | Conflicts: src/doc/src/qt3dcollision-module.qdoc src/render/frontend/qcamera.cpp src/render/frontend/qcameralens.cpp Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
| * Doc: Exclude private header files from the documentation buildTopi Reinio2016-01-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | In the documentation configuration, exclude all '_p.h' files from the documentation build. This prevents QDoc from generating documentation for private classes, and also allows removal of documentation that explicitly set the private classes \internal. Change-Id: I8fcf5c99a2a0b75e9ee5dcd928fa4a2b4b8cf34f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Doc: Removed Qt3DCollision namespace and module docsVenugopal Shivashankar2016-01-211-0/+3
| | | | | | | | | | | | | | | | Besides that, fixed a few qdoc warnings. Change-Id: Ibaf8fd6ffbb93f3f2bd73fa5fedf06e94f6ac2eb Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Fixed some documentation warningsTomi Korpipää2016-01-191-4/+0
| | | | | | | | | | | | | | Change-Id: I5055043641a1916dde47ad614d8ab7a5788fd93b Task-number: QTBUG-46037 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-01-269-99/+126
| | | | | | | | | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Remove the Quick3DConfiguration HackPaul Lemire2016-01-163-190/+0
|/ | | | | Change-Id: If256d843c2a783fb617c0082f5bd1f15ef72ef19 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Stop using enum references that require C++11.Raphael Kubo da Costa2015-12-301-2/+2
| | | | | | | | | | | Use Qt::Foo instead of Qt::Enum::Foo, which is a C++11 extension. When building with clang without -std=c++11, this results in warnings. With older GCC versions, the code simply does not build. This is similar to commit deffdaf9 ("GraphicsHelper: fix switch"). Change-Id: I28389b90bafb3df87187742ef55267ce2df1ba1a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix QDoc warnings and do further cleanupTopi Reinio2015-11-231-12/+11
| | | | | | | | | Fix the documentation issues that still remained broken after renaming the namespaces/QML modules. Do further cleanup and minor doc editing. Change-Id: Iff38c8c1b99e7f712dc3f9ad07ecd37a747b3a26 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Remove transforms property of QTransformSean Harmer2015-11-173-194/+0
| | | | | | | | Compound transformations are now built up using QMatrix4x4 in both QML and C++. Updating examples accordingly. Change-Id: I03c9abf1f6cdd1b56226dc0e16a7ad5ce84516dd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Documentation clean upVenugopal Shivashankar2015-11-066-6/+6
| | | | | | | | | | - Changed 'Qt3D' references to 'Qt 3D'. - Fixed incorrect \inqmlmodule instances. - Fixed broken \printuntil instances in the example docs. - Updated the namespace qualifier for a few class references. Change-Id: I250afe6843b10ed520f9ce5d7465203cc5c212c1 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Header naming fixed for quick3d partsTomi Korpipää2015-11-0415-180/+166
| | | | | | | Change-Id: Ifd7823af9ffe5761b4863d559c9321207fb62998 Task-number: QTBUG-49138 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-1314-101/+84
| | | | | | | Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add "We mean it" warnings to private headersSean Harmer2015-10-133-0/+33
| | | | | Change-Id: Ic4a69123255c33990765ea3601e01914c2d8cb70 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Quick3DEntityLoader: fix insert the item when it is fully createdPaul Lemire2015-07-251-7/+21
| | | | | | | | | | | | QQmlIncubator::setInitialState is called after the object is created but the bindings aren't evaluated at this point Instead use QQmlIncubator::statusChanged and check for a status Ready at which point all the bindings have been properly evaluated Task-number: QTBUG-47281 Change-Id: I1dc6e5a76b0bb42cc012b0e5bc980701813791f3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 21:43:45 +0000