summaryrefslogtreecommitdiffstats
path: root/src/animation/backend/lerpclipblend_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-02-22 15:23:33 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-24 20:41:44 +0000
commit3624ddb7beeff87196cf1ccc6684dd05457945e1 (patch)
tree5b3e53c861528fa07bc8122b7a6a954821952a7e /src/animation/backend/lerpclipblend_p.h
parent28938073a228a38c2a5beccdb3357b5a8c172def (diff)
Add startClip and endClip properties to QLerpClipBlend
Task-number: QTBUG-58904 Change-Id: I67a28b5f311d0065e8ca81df692de33ef1aeefcf Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/animation/backend/lerpclipblend_p.h')
-rw-r--r--src/animation/backend/lerpclipblend_p.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/animation/backend/lerpclipblend_p.h b/src/animation/backend/lerpclipblend_p.h
index 8b925b5b6..8d2a9839b 100644
--- a/src/animation/backend/lerpclipblend_p.h
+++ b/src/animation/backend/lerpclipblend_p.h
@@ -65,12 +65,20 @@ public:
inline float blendFactor() const { return m_blendFactor; }
void setBlendFactor(float blendFactor) { m_blendFactor = blendFactor; } // For unit tests
+ inline Qt3DCore::QNodeId startClipId() const { return m_startClipId; }
+ void setStartClipId(Qt3DCore::QNodeId startClipId) { m_startClipId = startClipId; } // For unit tests
+
+ inline Qt3DCore::QNodeId endClipId() const { return m_endClipId; }
+ void setEndClipId(Qt3DCore::QNodeId endClipId) { m_endClipId = endClipId; } // For unit tests
+
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
float blend(float value1, float value2) const Q_DECL_FINAL;
private:
void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ Qt3DCore::QNodeId m_startClipId;
+ Qt3DCore::QNodeId m_endClipId;
float m_blendFactor;
};