Allow grouping controls, triggers and morphs

acidbubbles · Sep 16, 2022 · 05b3d80 · 05b3d80
1 parent 469410e
commit 05b3d80
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/src/AtomAnimations/Animatables/Base/AnimationTargetBase.cs b/src/AtomAnimations/Animatables/Base/AnimationTargetBase.cs
@@ -5,6 +5,7 @@ namespace VamTimeline
 {
     public abstract class AnimationTargetBase<TAnimatableRef> : IDisposable where TAnimatableRef : AnimatableRefBase
     {
+        public AnimatableRefBase animatableRefBase => animatableRef;
         public TAnimatableRef animatableRef { get; }
         public UnityEvent onAnimationKeyframesDirty { get; } = new UnityEvent();
         public UnityEvent onAnimationKeyframesRebuilt { get; } = new UnityEvent();

diff --git a/src/AtomAnimations/Animatables/Base/IAtomAnimationTarget.cs b/src/AtomAnimations/Animatables/Base/IAtomAnimationTarget.cs
@@ -13,6 +13,7 @@ public interface IAtomAnimationTarget : IDisposable
         bool collapsed { get; set; }
         string group { get; set; }
         IAtomAnimationClip clip { get; set; }
+        AnimatableRefBase animatableRefBase { get; }
 
         void Validate(float animationLength);
 

diff --git a/src/AtomAnimations/Animations/AtomAnimationClip.cs b/src/AtomAnimations/Animations/AtomAnimationClip.cs
@@ -614,21 +614,13 @@ public void DirtyAll()
 
         public IEnumerable<IAtomAnimationTargetsList> GetTargetGroups()
         {
-            yield return targetTriggers;
-            foreach (var group in targetControllers.GroupBy(t => t.group ?? t.animatableRef.groupKey))
-            {
-                var first = group.First();
-                yield return new AtomAnimationTargetsList<FreeControllerV3AnimationTarget>(group) { label = first.group ?? first.animatableRef.groupLabel };
-            }
-            foreach (var target in targetFloatParams)
-            {
-                target.animatableRef.EnsureAvailable();
-            }
-            foreach (var group in targetFloatParams.GroupBy(t => t.group ?? t.animatableRef.groupKey))
-            {
-                var first = group.First();
-                yield return new AtomAnimationTargetsList<JSONStorableFloatAnimationTarget>(group) { label = first.group ?? first.animatableRef.groupLabel };
-            }
+            return GetAllTargets()
+                .GroupBy(t => t.group ?? t.animatableRefBase.groupKey)
+                .Select(group =>
+                {
+                    var first = group.First();
+                    return (IAtomAnimationTargetsList) new AtomAnimationTargetsList<IAtomAnimationTarget>(group) { label = first.group ?? first.animatableRefBase.groupLabel };
+                });
         }
 
         public void Validate()