summaryrefslogtreecommitdiffstats
path: root/src/animation/frontend
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2389-1763/+1763
| | | | | | | | | | | This reverts commit 03e5f60e585701608c1181365faee484d7a1f14c. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I359e89ed77b1b2750607617d138ebb6c316f0296 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update commercial license headersTarja Sundqvist2021-02-0289-1763/+1763
| | | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qt3d. Examples, documentation files or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4155 Change-Id: I139c8ad72c042b0900239decc36cfed4bc1c4951 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Antti Määttä2020-04-211-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Check we remove a valid node when removing from node propertiesPaul Lemire2020-02-101-1/+2
| | | | | | | | | | Change-Id: Ibcc4d9bfd9d0a9d7697151915f24a6eecc149f6d Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Properly stop running animations when using a negative playratePaul Lemire2020-03-301-1/+4
| | | | | | | | | | | | | | | | When reaching a normalized time of 0 they would otherwise continue to run Change-Id: Idaea755d3a12f9c9da9c25732c2221e9b3f9f4c7 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Revert "Fix post FF API changes"Mike Krus2019-12-031-10/+10
| | | | | | | | | | | | | | 84766ed9098f10efc53e4e43a75eef38fce7fbf6 Change-Id: I12341ec1b7bc68a7586c6671aa7b8f21caed17e0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-251-1/+0
|/ | | | | | | It is being deprecated. Change-Id: Idb6e794be1a26a3ca7c1d19ac1f47e4a0125f11b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Doc: Fix documentation warningsTopi Reinio2019-11-1311-13/+65
| | | | | | | | | | | | | | | | | | | | | | | - 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 post FF API changesMike Krus2019-10-221-10/+10
| | | | | Change-Id: I347f6df41c0a4f2295831e78248669b4a2d6b5ef Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Restore sceneChangeEvent overload that were removedPaul Lemire2019-10-226-1/+21
| | | | | | | | Not BIC compatible so they must stay until Qt6. Added TODO above them to make it easier to track for Qt6. Change-Id: Ia1adba25be5d55d3fa836727877c7c1f7346b668 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix Coverity warningsMike Krus2019-10-212-2/+3
| | | | | Change-Id: I00c875b48d838170fddf0b92f0ac5592828c6f0f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Clean up old property update codeMike Krus2019-10-202-2/+0
| | | | | | | Remove useless includes, clear up commented out or unused code Change-Id: Id3382b16108d79f1e2522d43463c8d70aef8fcb2 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Paul Lemire2019-10-153-0/+24
|\
| * Merge remote-tracking branch 'origin/5.13' into 5.14Paul Lemire2019-10-153-0/+24
| |\ | | | | | | | | | Change-Id: I44133fbc9b93e96918463b0b0891ee5ab7db9f2c
| | * Add documentation for AbstractClipAnimator QML type propertiesMats Honkamaa2019-10-081-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for the following QML properties: channelMapper, clock, normalizedTime, running. Task-number: QTBUG-78482 Change-Id: I1c24b5f9cbf647eda6f7bb329c58e496dcb22f4a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Doc: Add inherits tags to ClipAnimator and BlendedClipAnimatorMats Honkamaa2019-10-042-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-78485 Change-Id: Ic80a17b40c9ee81fd7bac2e669e729358c19c340 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | | Restore use of Added/Removed messages for aspects not supporting syncMike Krus2019-10-141-2/+3
|/ / | | | | | | | | | | | | | | | | If (third party) aspects don't support direct sync, restore use of PropertyValueAdded and PropertyValueRemoved messages so avoid breaking existing code Change-Id: Icac717583a8fe72acdb0cf599981251e310734bd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update animation evaluation jobs to use direct syncMike Krus2019-10-082-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Animation data is now stored in the job which propagates them to the frontend at the end of the frame. Animated properties are passed using Qt's property system. Animated poses are passed via the frontend skeleton node. Syncing on new frame will take care of propagating both for use in other aspects. Callbacks are called by the job directly or stored and invoked on the main thread depending on the callback setting. Change-Id: I78675715799300bc1b27f854f1a445c00a2ac734 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update LoadAnimationClipJob to use direct syncMike Krus2019-10-084-28/+0
| | | | | | | | | | Change-Id: I41f8de8776c40cf9ed4f08c33bd480a719aa1c82 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Clean up includesMike Krus2019-10-014-5/+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>
* | Update QChannelMapper to use direct syncMike Krus2019-09-232-11/+3
| | | | | | | | | | Change-Id: I066b6742cc272155f55322e3aaf73e28980341d0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update mapping classes to use direct syncMike Krus2019-09-233-34/+8
| | | | | | | | | | | | | | QChannelMapping, QSkeletonMapping and QCallbackMapping updated. Change-Id: I10b78d86856f6ad01fbb313fdcbe9f87f6d926ac Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update QLerpClipBlend to use direct syncMike Krus2019-09-201-1/+1
| | | | | | | | | | Change-Id: I91ce052b27eb822e79b80fa11ccd3d4b9f76ded4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update QClipBlendValue to use direct syncMike Krus2019-09-201-1/+1
| | | | | | | | | | Change-Id: I14add80f1519ec3047f7e5e925136230dec6874b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update QAdditiveClipBlend to use direct syncMike Krus2019-09-201-1/+1
| | | | | | | | | | Change-Id: If1349879cd05ce8616152ef4f5395c76b961ab74 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update QAbstractSkeleton to use direct syncMike Krus2019-09-201-1/+1
| | | | | | | | | | | | | | | | Nothing to sync and keep old message based method for backend to backend communication Change-Id: I494f1e8ba62aa772e87878959754a3e6a67681a1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update QBlendedClipAnimator to use direct syncMike Krus2019-09-201-1/+1
| | | | | | | | | | Change-Id: I6b00f22196d29b5219e27e5084c379b69b68c6e5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update QClipAnimator to use direct syncMike Krus2019-09-201-1/+1
| | | | | | | | | | Change-Id: I33cd39df0762a54c7d1beb74b57fd804bb2ae3e9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update QClock to use direct syncMike Krus2019-09-201-1/+1
| | | | | | | | | | Change-Id: I37183c67b3f6e8b08a1b050693879aa811cf48c9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update QAnimationClip (and Loader) to use direct syncMike Krus2019-09-201-1/+1
| | | | | | | | | | Change-Id: I22713a75f59075b1fe997405ad770f3a95ec37ac Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Enable syncing on animation aspectMike Krus2019-09-202-0/+8
|/ | | | | Change-Id: I4333cb98d4339fa9dc02ebb27231aad748fdb3c2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-312-3/+14
|\ | | | | | | Change-Id: Iae9a2903afd5da09cfd9288ff6cf74d7f069c83b
| * Fix LerpClipBlend QML documentationMats Honkamaa2019-08-271-3/+3
| | | | | | | | | | | | Task-number: QTBUG-74682 Change-Id: I346d31333f4bbce9a909798c176ad09fc2267859 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Add QML documentation for ClipBlendValueMats Honkamaa2019-08-261-0/+11
| | | | | | | | | | | | Task-number: QTBUG-74683 Change-Id: I821e52ab071b422c1e1351d59b83e9879fa2a884 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-05-132-2/+5
|\| | | | | | | | | | | | | Conflicts: tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp Change-Id: I27de9b83fa6ef6bb319e4b11c932f91f9ff92dc3
| * QChannelMapping: only send const char *propertyName to backendPaul Lemire2019-05-102-2/+5
| | | | | | | | | | | | | | | | | | | | It was otherwise sending a QString property as well as the const char *propertyName. Given only propertyName is actually used, remove QString property from the backend to avoid useless confusion and stop sending the notification change. Change-Id: Ie26771e320e26d44d7fce3e0a864bad1d4df558f Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Merge remote-tracking branch 5.12 into 5.13Paul Lemire2019-04-263-7/+83
|\| | | | | | | Change-Id: I42affdd02bddb5205b9f2455f0c5e5efbd414dd8
| * Animations: handle variable length propertiesPaul Lemire2019-04-033-7/+83
| | | | | | | | | | | | | | | | | | For that we know determine the expected number of channel components for a given property in the frontend where we have access to both the type and the value rather than in the backend using the type only. Change-Id: I75aca20d43dd1b3db316c303af041acd557c07e4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Switch export macros to standard formKai Koehne2019-04-0231-31/+31
|/ | | | | | | | | | | | 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>
* Use slerp for animating rotation channelsJuan Jose Casafranca2019-02-221-4/+12
| | | | | Change-Id: Ic6aa6fd1c1a1e7757dba9466b59d20834b56e246 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: fix broken links in qanimationcallback.cpp and qframegraphnode.cppv5.12.0-beta3Nico Vertriest2018-10-181-1/+1
| | | | | | | | | | qframegraphnode.cpp:217: Cannot tie this documentation to anything qcallbackmapping.cpp:104: Can't link to 'QAnimationCallback::onValueChanged()' Change-Id: I20fb3a5688c16e86c2a62201991d30f735358d76 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix notifications for QClipAnimator::clip propertyJim Albamont2018-10-051-0/+1
| | | | | | | | | | | Qt3DAnimation::QAbstractAnimationClip was not registered as metatype resulting in the following error when calling QClipAnimator::setClip: QMetaProperty::read: Unable to handle unregistered datatype 'Qt3DAnimation::QAbstractAnimationClip*' for property 'Qt3DAnimation::QClipAnimator::clip Change-Id: If92d781fdab5be06ce11ec88f0b3921cfbd557ff Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Apply similar logic to the native Qt 3D animation clip selectionSean Harmer2018-08-021-0/+4
| | | | | | | | | If the file contains a single animation use that clip. Otherwise we then consider animationName and animationIndex with the index having priority. Change-Id: Id974b1d446d6067bbe4c5ecce9f20891cb1086b0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add support for loading specific animations from glTF 2 filesSean Harmer2018-08-021-1/+7
| | | | | | | | | | | | | | Can now specify source urls to QAnimationClipLoader with query parameters for animationIndex or animationName. Add a new manual test to demonstrate/test this by loading the 2nd animation from the Rigged-Simple.gltf file. Will followup with the same support for Qt 3D native json animation files. Change-Id: Icb66073f29b8471fe06e2e2e9c43720567dc9ee5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Check animator can be played in frontend and backendJuan Jose Casafranca2018-07-114-0/+21
| | | | | | | | | | | We check that the animator can be played in the frontend. Each animator subclass must implement their own canPlay method. In the backend we correctly check the clipAnimator can be played Task-number: QTBUG-69369 Change-Id: If8bca9b73321e2bfdb4d68ddc286df0109ee91f1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Add missing dots (qt3d)Paul Wicking2018-06-1914-21/+21
| | | | | | Task-number: QTBUG-68933 Change-Id: I4226b8b9d70548b6921948c5ea47520f40f5df98 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-205-36/+10
| | | | | | | | | | | | | | | | | | | | | Since Qt 5.11, QDoc uses Clang to parse C++ documentation. Clang requires a module header, as well as proper include paths, to build a precompiled header and process the sources. To do this, add a custom module header that pulls in all Qt 3D modules - this way, we can continue using a single documentation project to covers all of Qt 3D. Fix all documentation warnings are caused by missing namespaces, QML module/type names and typos, as well as a number of linking problems and other minor issues. After this change, the remaining documentation issues consist of 'No documentation for ...' warnings. Task-number: QTBUG-67790 Change-Id: I38b91163c475a00cc1893e793240470c5409eb57 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Either fully qualify property types, or not at allVolker Krause2018-03-063-4/+4
| | | | | | | | | The semi-qualified types confuse the meta type system, QAbstractAnimation in particular, as that also exists as a top-level type. Change-Id: If20387fe76d46f88f6a89523d5d3f4aac8b1fef0 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-153-2/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Doc: add doc to undocumented methods and properties qt3dNico Vertriest2018-02-063-2/+28
| | | | | | | | | | | | Change-Id: Ia498dd96a6d35997a3f493f26b376fb8fa146196 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 22:16:37 +0000