summaryrefslogtreecommitdiffstats
path: root/src/animation/backend/animationutils_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-03-23 12:25:12 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-03-25 14:23:41 +0000
commit63aa2898615bffb37a3d9f949b089b2ac2bf2737 (patch)
treeeef54c89332c98d506f6a0fda20666d0f27023a5 /src/animation/backend/animationutils_p.h
parent37fd551490035a2004e4151857b2f7fd35078b97 (diff)
Add overload of buildPropertyMappings
Eventually we should remove the original form which is currently called by the non-blended animation code path. It will be better to merge the blended and non-blended code paths so we have less code to maintain. Also the blended code path seems more efficient. Change-Id: Ib6aa4006e4b830a32b985527bae900ce6f3facec Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/animation/backend/animationutils_p.h')
-rw-r--r--src/animation/backend/animationutils_p.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/animation/backend/animationutils_p.h b/src/animation/backend/animationutils_p.h
index 7ec611633..4e56f9d95 100644
--- a/src/animation/backend/animationutils_p.h
+++ b/src/animation/backend/animationutils_p.h
@@ -62,6 +62,7 @@ class BlendedClipAnimator;
class Handler;
class AnimationClipLoader;
class ChannelMapper;
+class ChannelMapping;
typedef QVector<int> ComponentIndices;
@@ -173,6 +174,11 @@ QVector<MappingData> buildPropertyMappings(Handler *handler,
const ChannelMapper *mapper);
Q_AUTOTEST_EXPORT
+QVector<MappingData> buildPropertyMappings(const QVector<ChannelMapping *> &channelMappings,
+ const QVector<ChannelNameAndType> &channelNamesAndTypes,
+ const QVector<ComponentIndices> &channelComponentIndices);
+
+Q_AUTOTEST_EXPORT
QVector<ChannelNameAndType> buildRequiredChannelsAndTypes(Handler *handler,
const ChannelMapper *mapper);