summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3dscene2d
Commit message (Collapse)AuthorAgeFilesLines
* Use QList instead of QVector in implementation and docsJarek Kobus2020-07-093-5/+5
| | | | | | | | | Fix some const correctness. Use list-initialization. Task-number: QTBUG-84469 Change-Id: I9c56742581f48f89a3b02e4121fae414117c7a25 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use QList instead of QVectorJarek Kobus2020-07-072-2/+2
| | | | | | Task-number: QTBUG-84469 Change-Id: Ic726ce85e01190dbc64426388fd454c54ae3c3e3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Clean input event handlingMike Krus2020-06-231-1/+0
| | | | | | | | | - Clean up header dependencies - Remove EventSourceSettingHelper as threading is no longer an issue - Remove some locks which are no longer needed Change-Id: I071173d3b4c681f5420bd7a1f4cb13f80a9c9b2f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove use of clear before rendering settingsMike Krus2020-06-171-1/+2
| | | | | | | | Gone in 0d43e21429ee23442ec3a99f641a5665d66e75e2 in QtDeclarative Rendering will need updated to use new signals Change-Id: I90e34fa974e35b306c6b480643a4a31f7a0eff8c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update dependenciesMike Krus2020-06-121-1/+2
| | | | | | | | Commented out calls to resetOpenGLState which has moved in QtDeclarative. Leaves Scene3D and Scene2D in broken state. Change-Id: Ib1a5dcdde34c1bb177518dd891d123d3a5322d9d Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Update dependenciesPaul Lemire2020-06-121-1/+1
| | | | | | | | | | | - 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 dependenciesMike Krus2020-06-051-2/+4
| | | | | Change-Id: I71ffe477dfa052967c402ce49f45dab13de7b971 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependenciesMike Krus2020-06-012-27/+0
| | | | | | | Includes removal of Angle specific code Change-Id: Id257d4af1c31ff88edbfb07c073cdff9f4c6cdf7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add support for building with CMakeMike Krus2020-05-221-0/+51
| | | | | Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix build for Qt6Mike Krus2020-05-063-6/+6
| | | | | | | | | | | | | - 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>
* Geometry refactoringMike Krus2020-02-271-1/+1
| | | | | | | Move QBuffer, QAttribute, QGeometry to Qt3DCore. Change-Id: I59dfd091eefadcada93350b3aba955f40b304385 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix deprecations and warningsMike Krus2020-02-262-10/+0
| | | | | | | | | | | In particular: - QHash::unite deprecated - QQuickWindow::createTextureFromId deprecated - also removed unused or deprecated code, and fixed out of order initialization Change-Id: Ia583654fcfcd654ca388575aa7716c282b134e33 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove custom deprecation macroPaul Lemire2020-02-121-1/+0
| | | | | Change-Id: If9fdd63d58b2f9d41dc3a6c99d1dde2245506d15 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove deprecated classes and functionsPaul Lemire2020-02-114-30/+2
| | | | | | | Mostly old messaging API Change-Id: I17eb2206b2ede56d2f7d36375d5e711d6149019f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 5.15 into devMike Krus2020-02-075-10/+21
|\ | | | | | | Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
| * Make the OpenGL renderer a pluginPaul Lemire2020-02-051-1/+1
| | | | | | | | | | | | | | | | By default the QRenderAspect will try to load this plugin Change-Id: Ie55e207fb8e6d0b64f717bbb99699eb669eaa3f2 Task-number: QTBUG-61151 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Fix deprecation handlingMike Krus2020-01-141-0/+1
| | | | | | | | | | | | Change-Id: If981333f7a3d78028d4f08c59867453d4192b955 Task-number: QTBUG-81058 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Revert "Fix post FF API changes"Mike Krus2019-12-033-2/+12
| | | | | | | | | | | | | | 84766ed9098f10efc53e4e43a75eef38fce7fbf6 Change-Id: I12341ec1b7bc68a7586c6671aa7b8f21caed17e0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Doc: Fix documentation warningsTopi Reinio2019-11-132-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * Fix Scene2D initializationMike Krus2019-10-231-4/+12
| | | | | | | | | | | | | | | | | | The entity that Scene2D uses to track events may not exist yet when Scene2D is initialized. If so, mark QScene2D as dirty again so it gets updated again on the next frame. Change-Id: I0649a4073afca38ff569cd683d8f2b96c1899ba8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Fix post FF API changesMike Krus2019-10-223-12/+2
| | | | | | | | | | Change-Id: I347f6df41c0a4f2295831e78248669b4a2d6b5ef Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Fix Coverity warningsMike Krus2019-10-211-0/+1
| | | | | | | | | | Change-Id: I00c875b48d838170fddf0b92f0ac5592828c6f0f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update dependenciesMike Krus2020-02-071-1/+1
|/ | | | | | | | | | - Fix build for change in QML private syntax and relocation of OpenGL headers - Fix some deprecation warnings - Update include paths - Update module dependencies Change-Id: I03e65a46b18a9dea872fe2250d5b4fe28128f4e8 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Paul Lemire2019-10-151-0/+4
|\
| * Merge remote-tracking branch 'origin/5.13' into 5.14Paul Lemire2019-10-151-0/+4
| |\ | | | | | | | | | Change-Id: I44133fbc9b93e96918463b0b0891ee5ab7db9f2c
| | * Clarify Scene2D input event supportTomi Korpipaa2019-10-071-0/+4
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63900 Change-Id: I4a0331cd364480f6cdbf89e53ae486f13e6c3fe7 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Update QScene2D to use direct syncMike Krus2019-10-145-122/+85
|/ / | | | | | | | | | | Change-Id: Iba2fa5ce9d295706fc50f904cac68f00bd8f02b7 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Clean up includesMike Krus2019-10-012-4/+0
| | | | | | | | | | | | | | | | | | Remove include statements for classes that are no longer used. Makes it easier to find remaining use cases that need addressed before complete removal in Qt 6. Change-Id: I60529ba1929ad64b162d3847d5df47cde2a60dad Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix deprecation warnings related to QBasicAtomicIntegerFriedemann Kleint2019-09-191-1/+1
| | | | | | | | | | | | | | | | | | Use loadRelaxed(), storeRelaxed(), fixing warnings like: renderers/opengl/renderer/renderer.cpp:451:22: warning: ‘void QBasicAtomicInteger<T>::store(T) [with T = int]’ is deprecated: Use storeRelaxed [-Wdeprecated-declarations] qt3d/src/render/renderers/opengl/renderer/renderer_p.h:188:61: warning: ‘T QBasicAtomicInteger<T>::load() const [with T = int]’ is deprecated: Use loadRelaxed [-Wdeprecated-declarations] Change-Id: Ica946808969e7f311c98e30d1a61c1b4fa22f66a Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Eradicate Q_FOREACH loops and mark the module cleanMarc Mutz2019-05-221-3/+0
| | | | | | | | | | | | | | | | | | | | 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 origin/5.13 into devPaul Lemire2019-04-157-10/+17
|\| | | | | | | Change-Id: Ib5c04e9941aeea1a4cd27519b94b9a53e8349ea3
| * Switch export macros to standard formKai Koehne2019-04-026-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Also remove non-exising QT3DLOGIC_PRIVATE_EXPORT macro from src/doc/qt3d.qdocconf Task-number: QTBUG-74752 Change-Id: I71b9e85ff09c002fb283824aa51a5a8f50e937f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Always load scene2d render plugin in static buildsAnton Kreuzkamp2019-02-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scene2d requires support from the Qt3D renderer, which is implemented in form of a renderer plugin. The renderer plugin is implicitly loaded when the scene2d module is loaded, through use of Q_COREAPP_STARTUP_FUNCTION, which does not support static builds, though. This change adds code to initialize the scene2d render plugin to the constructor of QScene2D, so that the first QScene2D object created will initialize the renderer plugin. Task-number: QTBUG-72378 Change-Id: I6f625e79a5be9f5a23dcc881f9b360382008032b Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix picking in Scene2D following recent changesPaul Lemire2019-03-181-6/+11
|/ | | | | Change-Id: I69c2e31666bc5abb9777ab06e532c949cd21bf7f Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix scene2d starting trigger when setting item lateMäättä Antti2019-02-061-0/+9
| | | | | | | | The update sequence does not start if the item is set after render control has requested render and prepare has been done. Change-Id: If3d63b879c6d8f38a5343413f41197b6a29677fc Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Always export scene2d shared objectMäättä Antti2019-01-311-1/+1
| | | | | | | | This allows implementing scene2d backend nodes in other render aspects. Task-number: QT3DS-2886 Change-Id: Idd3b32bbb2bf55870eccdd6b2470afd62183d676 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add doc to undocumented methodsNico Vertriest2018-11-011-0/+5
| | | | | | | | | | | | | - qcomponent.cpp - qbackendnode.cpp - qjoint.cpp - qskeletonloader.cpp - qframeaction.cpp - qscene2d.h - qrenderaspect.cpp Change-Id: I25881dee19d2d01f948bfaf4a156a97f6caaea73 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* ResourceAccessor: allow read-only access to texturesLaszlo Agocs2018-08-101-1/+1
| | | | | Change-Id: I0a8d20081912f3ff9a037cab74702581b3b02613 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Doc: Use correct module namePaul Wicking2018-07-301-1/+2
| | | | | | | | | QML: Importing Qt3D.Scene2D doesn't work, QtQuick.Scene2D does. CPP: Specify header file, as convenience header doesn't exist. Task-number: QTBUG-67370 Change-Id: Ia53e92c076f52bbb81b91370425279c44bf9e3c5 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix deadlock in scene2dMäättä Antti2018-06-262-1/+25
| | | | | | | | | Use the SurfaceLocker only when using ANGLE. Don't lock the texture when using ANGLE. Task-number: QTBUG-69039 Change-Id: Ib95fcf05febe1ec9c3ddc225932b5e8d15dc6937 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Change scene2d to always clear the windowMäättä Antti2018-05-081-1/+2
| | | | | | | | | | Always clear the window. This enables transparency. Task-number: QT3DS-1497 Change-Id: I2186771ee81963f599048a74b8778fcfead4c75a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Revert "Doc: Divide documentation into submodules"Topi Reinio2018-04-203-146/+0
| | | | | | | | | | | This reverts commit c8964b8f1cf56718a189b0f57bad446cec30a8b8. QDoc now supports documentation-specific custom module headers and include headers that allow us to keep using a single documentation project that covers multiple modules. Change-Id: I84706a7149097a6b03f0f266e55d6f712a6c773e Reviewed-by: Martin Smith <martin.smith@qt.io>
* Document state of the Qt 3D modulesKai Koehne2018-03-121-4/+6
| | | | | | | | | | | | | Do make it explicit which ones are still in development also in the landing page, and add \preliminary and \since tags (for released and TP modules, respectively). Note that the \preliminary, \since tags currently do not work for \qmlmodule, which hopefully gets fixed at one point: QTBUG-65963. Change-Id: I6648311c38f331286be37eefa60794984cd239b7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-151-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/animation/doc/src/qt3danimation-module.qdoc src/render/backend/abstractrenderer_p.h src/render/backend/buffervisitor_p.h src/render/backend/renderer.cpp src/render/backend/renderer_p.h src/render/backend/triangleboundingvolume_p.h src/render/backend/trianglesextractor_p.h src/render/frontend/sphere_p.h src/render/jobs/calcboundingvolumejob.cpp src/render/jobs/job_common_p.h src/render/jobs/pickboundingvolumejob.cpp src/render/jobs/pickboundingvolumejob_p.h src/render/jobs/pickboundingvolumeutils.cpp src/render/jobs/renderviewjobutils_p.h tests/auto/render/boundingsphere/tst_boundingsphere.cpp tests/auto/render/commons/testrenderer.h tests/auto/render/raycasting/tst_raycasting.cpp tests/auto/render/render.pro tests/auto/render/renderer/tst_renderer.cpp Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3
| * Merge remote-tracking branch 'origin/5.9' into 5.10Sean Harmer2018-02-061-5/+8
| |\ | | | | | | | | | Change-Id: I72fdfb9a20be2f819542243e888756818b03c28e
| | * Fix crash in scene2d at shutdownMäättä Antti2018-02-061-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resource manager policy for scene2d nodes has been changed so the scene2d constructor gets called multiple times at startup. That in turn increments render thread user counter every time. The cleanup code gets called for each instanciated QScene2D node so at shutdown the counter never reaches zero and the render thread is not closed properly. Change the implementation so that the counter gets incremented only when the render thread has been properly initialized. Task-number: QTBUG-66003 Change-Id: I33a5b1f407e65329776bcabe0b66ff049581a435 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Render: Use SIMD Vectors and Matrices in the backendPaul Lemire2018-02-021-4/+4
| | | | | | | | | | | | | | | Change-Id: I19b3b2f8fcb06eb2bc600ebe370465dd15a8eabc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-141-5/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/backend/renderer.cpp src/render/backend/renderer_p.h tests/auto/render/renderer/tst_renderer.cpp Done-with: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Change-Id: I2ca9bac4777e51434579edf86030414734f533ac
| * | | Fix crash in scene2d at shutdownv5.10.1Määttä Antti2018-02-081-5/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resource manager policy for scene2d nodes has been changed so the scene2d constructor gets called multiple times at startup. That in turn increments render thread user counter every time. The cleanup code gets called for each instanciated QScene2D node so at shutdown the counter never reaches zero and the render thread is not closed properly. Change the implementation so that the counter gets incremented only when the render thread has been properly initialized. Task-number: QTBUG-66003 Change-Id: I33a5b1f407e65329776bcabe0b66ff049581a435 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 564dfd87c5b1317dcf9fbc4d1c8d858c72513421) Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | | Doc: Divide documentation into submodulesTopi Reinio2018-02-093-0/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc in Qt 5.11 will use Clang (libclang) to parse C++ documentation. In order to do that, Clang needs to have the include paths available when parsing source; qmake provides that information to QDoc but only when the documentation project is located under the correct module (source) path. By having dedicated doc projects for Qt 3D Core, Render, Input, etc. the number of documentation warnings is signicantly reduced. A top-level 'Qt 3D' project is still kept, and contains the landing page, overview, examples, and top-level 'C++ classes' and 'QML types' pages that list all types documented across all Qt 3D submodules. Change-Id: Id5936de36f31c2a8764a64e1e9d7ae0d10e8ab14 Reviewed-by: Martin Smith <martin.smith@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 13:11:33 +0000