summaryrefslogtreecommitdiffstats
path: root/src/animation/frontend/qclipanimator.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update commercial license headersTarja Sundqvist2021-02-021-20/+20
| | | | | | | | | | | | | | | | 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>
* Doc: Fix documentation warningsTopi Reinio2019-11-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | - 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>
* Doc: Add inherits tags to ClipAnimator and BlendedClipAnimatorMats Honkamaa2019-10-041-0/+1
| | | | | | Task-number: QTBUG-78485 Change-Id: Ic80a17b40c9ee81fd7bac2e669e729358c19c340 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Check animator can be played in frontend and backendJuan Jose Casafranca2018-07-051-0/+9
| | | | | | | | | | 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 Change-Id: Idf48f0e3263c426c8806ac4b11f6262a38920fd7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add support for setting a time index in the ClipAnimatorChristian Strømme2018-01-231-0/+1
| | | | | | | | | This makes it possible to seek the animation clip to a specific position in the time-line. The index is a real value between 0 and 1, where 0.0 is the start of the clip and 1.0 is at the end of the clip Change-Id: Ic8c57d04e4f1e0a7628713e057b5b8a41a400c5a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move animation callback handling to QAbstractClipAnimatorChristian Stromme2017-12-011-13/+0
| | | | | | | | | | | | The code that triggers the callbacks on the GUI thread should be the used for all clip animators, and not just the QClipAnimator. This change also fixes the scene change event handler to call the parent implementation for all events not handled by the clip animator, so it doesn't silently drops all events not handled explicitly. Change-Id: I0b1f57f362f2dc2e82e05d432426cc46d4a100ae Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix warnings caused by QClipAnimator calling QNode::sceneChangeEventAndy Nichols2017-11-141-1/+2
| | | | | | | | | | | | Calling the base implementation of sceneChangeEvent unnecessarily can cause lots of warnings to be printed: "sceneChangeEvent should have been subclassed" To prevent this (and still work around the bug this line intended to fix) a conditional has been added to make sure that we do not hit the warning condition. Change-Id: Ibaa771b4b58d6f4e38ba815bde1b635ed83867d2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix setting running property when animators finishSean Harmer2017-10-061-0/+1
| | | | | | | | We need to call the base class handler so that the generic code in QNode can process the call to update the running property. Change-Id: I7fa3c051f47c2a41c5620f1a72f309192d5ea907 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge branch '5.9' into devSean Harmer2017-08-191-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/backend/renderer.cpp src/render/backend/renderview.cpp src/render/graphicshelpers/graphicscontext_p.h src/render/graphicshelpers/graphicshelperes2_p.h src/render/graphicshelpers/graphicshelpergl2_p.h src/render/graphicshelpers/graphicshelpergl3_2_p.h src/render/graphicshelpers/graphicshelpergl3_3_p.h src/render/graphicshelpers/graphicshelpergl4_p.h src/render/graphicshelpers/graphicshelperinterface_p.h src/render/jobs/pickboundingvolumejob.cpp tests/auto/animation/clipanimator/tst_clipanimator.cpp tests/auto/auto.pro tests/manual/manual.pro Also disabled the QQmlMetaType codepaths following commit 49a11e882059ee1729f776722e085dd21d378c36 in qtdeclarative. The QQmlMetaType codepaths will be re-enabled once a qt5.git integration has succeeded. Change-Id: Ia654d75425e6d406c472d19864383612208cad2b
| * Doc: correct declaration qml propertiesNico Vertriest2017-08-111-2/+1
| | | | | | | | | | | | | | | | | | | | qadditiveclipblend.cpp:173: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode baseClip qadditiveclipblend.cpp:191: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode additiveClip qblendedclipanimator.cpp:276: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode blendTree qclipanimator.cpp:124: warning: Unrecognizable QML module/component qualifier for AbstractAnimationClip clip Change-Id: Ic761f75986e41dc4ec7ab9e97e6776e49498f870 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Add clock property to QAbstractClipAnimatorChip Collier2017-07-241-0/+2
| | | | | | | | | | | | | | | | | | Introduces "clock" property to QAbstractClipAnimator and updates associated tests. Updated backend animator nodes and associated evaluation jobs. Change-Id: Id18cabdd710b9b7253772642f21f63043d316a42 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into devAndy Nichols2017-07-111-2/+2
|\| | | | | | | Change-Id: I4ceccd338a937a2ada231f568ed02c7a87bd6e80
| * Doc: link errorsNico Vertriest2017-06-201-1/+1
| | | | | | | | | | | | | | | | | | qclipanimator.cpp:55: warning: Can't link to AbstractAnimationClip qparameter.cpp:47: warning: Can't link to 'Texture' qclipanimator.cpp:55: warning: Can't link to 'ChannelMapper' Change-Id: I84d8de99d5cfdc390b4e33fdae5882d60842b519 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * Doc: correct \property statementsNico Vertriest2017-06-201-1/+1
| | | | | | | | | | | | | | | | qblendedclipanimator.cpp:276: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode blendTree qclipanimator.cpp:124: warning: Unrecognizable QML module/component qualifier for AbstractAnimationClip clip Change-Id: Ia1b43f1089ad9d4c8079084c4b2d29e487a55b8a Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Add support for animation callbacksLaszlo Agocs2017-06-231-0/+11
|/ | | | | | | | Let QChannelMapping optionally specify a callback, which then gets invoked either directly on a worker thread or the gui thread. Change-Id: I871776f47cc921ceb254f9dc1a7b89ae5c5618d8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Document QClipAnimatorSean Harmer2017-04-271-0/+62
| | | | | Change-Id: Iac75f836033e07c2d525c495e4cf0656a5ab11f5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Introduce QAbstractAnimationClip and rename QAnimationClipSean Harmer2017-02-241-3/+3
| | | | | | | | | | | | | 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>
* Introduce QAbstractClipAnimatorKevin Ottens2017-02-231-63/+3
| | | | | | | | This becomes the new base class for QClipAnimator. Change-Id: I53d38cae8c3cee73e07084d2d58e317ba19ced7b Task-Id: QTBUG-58899 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add loops property to ClipAnimator and implement logic for itSean Harmer2017-01-291-0/+18
| | | | | Change-Id: Ied67635f202e01c626177b4869b77db5bd3e80d4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add channelMapper property to QClipAnimatorSean Harmer2017-01-271-0/+28
| | | | | Change-Id: I50a07e51188ae31f58e57d1baf98e22792ce88db Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add running property to QClipAnimatorSean Harmer2017-01-271-0/+18
| | | | | Change-Id: I5ef29ada7fd6584674d98162f7106177e199b720 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add animation componentsSean Harmer2017-01-271-0/+104
Three levels of animation playback are available at present for keyframe animation: 1) Direct playback of a clip via QClipAnimator 2) Playback of a blend tree of clips via QBlendedClipAnimator 3) Playback of a set of blend trees controlled with a state machine via QConductedClipAnimator This commit adds the frontend and backend nodes for all 3 components and registers them. The blended and conducted animator components are just empty skeletons for now. Change-Id: If2f0a912c003f3d20f830a8f6174946eea6b47e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 16:41:01 +0000