diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-09-18 20:16:16 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-21 22:23:13 +0200 |
commit | a0f8be4021caa9bb5055923f0eea3bee0e345235 (patch) | |
tree | cf33dd92e8284f5692e65b1a574749d50da4a3f0 /src/qml | |
parent | 0fc040ef70513ccaeb9e96f7ca05a3df4d6c7879 (diff) |
Animators - Render thread animation system
This introduces 6 new QML types for animating state in the
scene graph when the UI thread is blocked. The QObject property
being animated is updated after the animation completes.
It works also with the "windows" and "basic" render loops, but
offer litte benefit then compared to in the "threaded" case.
Change-Id: Ic19e47c898c0b8bd53e457db922b3c9c457c8147
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/animations/qabstractanimationjob.cpp | 2 | ||||
-rw-r--r-- | src/qml/animations/qabstractanimationjob_p.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/animations/qabstractanimationjob.cpp b/src/qml/animations/qabstractanimationjob.cpp index 343338c661..da961763ed 100644 --- a/src/qml/animations/qabstractanimationjob.cpp +++ b/src/qml/animations/qabstractanimationjob.cpp @@ -277,6 +277,8 @@ QAbstractAnimationJob::QAbstractAnimationJob() , m_isGroup(false) , m_disableUserControl(false) , m_hasCurrentTimeChangeListeners(false) + , m_isRenderThreadJob(false) + , m_isRenderThreadProxy(false) { } diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index abf3cd6df6..95a238405c 100644 --- a/src/qml/animations/qabstractanimationjob_p.h +++ b/src/qml/animations/qabstractanimationjob_p.h @@ -113,6 +113,10 @@ public: QAbstractAnimationJob *nextSibling() const { return m_nextSibling; } QAbstractAnimationJob *previousSibling() const { return m_previousSibling; } + bool isGroup() const { return m_isGroup; } + bool isRenderThreadJob() const { return m_isRenderThreadJob; } + bool isRenderThreadProxy() const { return m_isRenderThreadProxy; } + protected: virtual void updateCurrentTime(int) {} virtual void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState); @@ -157,6 +161,8 @@ protected: bool m_isGroup:1; bool m_disableUserControl:1; bool m_hasCurrentTimeChangeListeners:1; + bool m_isRenderThreadJob:1; + bool m_isRenderThreadProxy:1; friend class QQmlAnimationTimer; friend class QAnimationGroupJob; |