Update naming of animation building blocks

Rename:
    Groups -> Channels
    Channels -> ChannelComponents

Update function and variable names accordingly.

Also updated ChannelComponents to contain not only the component suffix
to make them more readable in large files.

Replaced animation clip in AnimationUtils unit test and adjusted
suffix -> component index mapping code to use upper case.

Will update clips in manual test in a follow up commit.

Change-Id: If5ed565d57efbed07a4d6771336a14f6a4cddb65
Reviewed-by: Mike Krus <mike.krus@kdab.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/animation/backend/animationutils_p.h b/src/animation/backend/animationutils_p.h
index d88492e98..cb8014e7b 100644
--- a/src/animation/backend/animationutils_p.h
+++ b/src/animation/backend/animationutils_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DAnimation {
 namespace Animation {
 
-struct ChannelGroup;
+struct Channel;
 class Handler;
 class AnimationClipLoader;
 class ChannelMapper;
@@ -114,13 +114,13 @@ public:
 
     static ClipPreEvaluationData evaluationDataForClip(AnimationClipLoader *clip, const AnimatorEvaluationData &animatorData);
 
-    static QVector<int> channelsToIndices(const ChannelGroup &channelGroup,
-                                          int dataType,
-                                          int offset = 0);
-    static QVector<int> channelsToIndicesHelper(const ChannelGroup &channelGroup,
-                                                int dataType,
-                                                int offset,
-                                                const QStringList &suffixes);
+    static QVector<int> channelComponentsToIndices(const Channel &channelGroup,
+                                                   int dataType,
+                                                   int offset = 0);
+    static QVector<int> channelComponentsToIndicesHelper(const Channel &channelGroup,
+                                                         int dataType,
+                                                         int offset,
+                                                         const QStringList &suffixes);
     static QVector<float> evaluateClipAtLocalTime(AnimationClipLoader *clip,
                                               float localTime);
     static QVector<Qt3DCore::QSceneChangePtr> preparePropertyChanges(Qt3DCore::QNodeId peerId,