summaryrefslogtreecommitdiffstats
path: root/src/animation/backend/additiveclipblend_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-02-23 10:51:33 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-24 20:41:52 +0000
commit7253d10a1026be03eab83edd628b72455d7bcd28 (patch)
tree276ec62fe50b35dd09ec66fa95cbc33743e50d36 /src/animation/backend/additiveclipblend_p.h
parent87cf108f5da481d9a4eeb5d0fbb7145ecef4863e (diff)
Add baseClip and additiveClip properties to QAdditiveClipBlend
Also added corresponding backend node properties. Task-number: QTBUG-58903 Change-Id: I4b441e305c1ddfc062b215b713a6b894960cdd4b Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/animation/backend/additiveclipblend_p.h')
-rw-r--r--src/animation/backend/additiveclipblend_p.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/animation/backend/additiveclipblend_p.h b/src/animation/backend/additiveclipblend_p.h
index 036992f06..bbb318de4 100644
--- a/src/animation/backend/additiveclipblend_p.h
+++ b/src/animation/backend/additiveclipblend_p.h
@@ -62,6 +62,12 @@ public:
AdditiveClipBlend();
~AdditiveClipBlend();
+ inline Qt3DCore::QNodeId baseClipId() const { return m_baseClipId; }
+ void setBaseClipId(Qt3DCore::QNodeId baseClipId) { m_baseClipId = baseClipId; } // For unit tests
+
+ inline Qt3DCore::QNodeId additiveClipId() const { return m_additiveClipId; }
+ void setAdditiveClipId(Qt3DCore::QNodeId additiveClipId) { m_additiveClipId = additiveClipId; } // For unit tests
+
inline float additiveFactor() const { return m_additiveFactor; }
void setAdditiveFactor(float additiveFactor) { m_additiveFactor = additiveFactor; } // For unit tests
@@ -71,6 +77,8 @@ public:
private:
void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ Qt3DCore::QNodeId m_baseClipId;
+ Qt3DCore::QNodeId m_additiveClipId;
float m_additiveFactor;
};