summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3danimation/items
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-097-0/+14
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I81f01dbde95cc9cd8e98c7fb9bf3a390aa27f379
| * Qt3DQuickAnimation: includemocsMike Krus2022-06-277-0/+14
| | | | | | | | | | | | | | | | Task-number: QTBUG-103286 Change-Id: I3cc1eb16e1986ffb5f908a60f6f333cf33b9a347 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 4af3641935144d59544b6856a1b1561673800b01) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2314-292/+292
|/ | | | | | | | | | | 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-0214-292/+292
| | | | | | | | | | | | | | | | 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>
* Switch export macros to standard formKai Koehne2019-04-027-7/+7
| | | | | | | | | | | | 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>
* Alter QChannelMapping to accept QAbstractChannelMapping pointersSean Harmer2017-08-312-18/+18
| | | | | | | In preparation for the new mapping subclasses. Change-Id: I3d659b350da72cca9f5ad195f7aa7fea3d943810 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add quick3d class for VertexBlendAnimationAntti Määttä2017-05-093-2/+201
| | | | | | | | | Add the missing class for VertexBlendAnimation so that it can be used from qml. Task-number: QTBUG-60618 Change-Id: If47dccf5e44d0158053ca3b9122fcef91d73ea93 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove clips property from QAbstractClipBlendNode and friendsSean Harmer2017-03-263-183/+0
| | | | | | | | No longer needed as concrete subclasses each provide their own specific APIs for managing clips or sub trees. Change-Id: I8e090bcf18ad9bf0d19e36128d7556aaa6cd6edf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Introduce QAbstractAnimationClip and rename QAnimationClipSean Harmer2017-02-242-19/+19
| | | | | | | | | | | | | Introduced an abstract base class for types of animation clip. Also renamed QAnimationClip to QAnimationClipLoader since it loads data from files. Also renamed corresponding backend type and fixed up unit tests accordingly. Task-number: QTBUG-58898 Change-Id: I01a96e108cbbcd12e01913693e96610598965018 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Quick3DChannelMapper: make mappings the default propertyPaul Lemire2017-02-161-0/+2
| | | | | | Task-number: QTBUG-58900 Change-Id: Ie3bdb17d03242c22bf899aa4addcace03927bac9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move animations from extras to animationsAntti Määttä2017-02-0711-2/+946
| | | | | Change-Id: If3bcfe24ebe7ecfb4519e0e400e601819783edad Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Register QAbstractClipBlendNode and QLerpBlend to QMLPaul Lemire2017-01-293-2/+185
| | | | | Change-Id: Ifc3d4d8a66b763323a3ff6a3b840ae0e1a9f9c0d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add API to map animation channels to propertiesSean Harmer2017-01-273-0/+187
Change-Id: I98aecf101eb052979f7a2e98c8bfcf899f27fb02 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>