Custom targets grouping

VamTimeline.AtomAnimation.cslist

@@ -116,6 +116,7 @@ src\UI\Screens\BulkScreen.cs
 src\UI\Screens\ControllerTargetSettingsScreen.cs
 src\UI\Screens\DiagnosticsScreen.cs
 src\UI\Screens\EditAnimationScreen.cs
+src\UI\Screens\GroupingScreen.cs
 src\UI\Screens\HelpScreen.cs
 src\UI\Screens\ImportAssignScreen.cs
 src\UI\Screens\ImportExportScreen.cs

VamTimeline.csproj

@@ -191,6 +191,7 @@
     <Compile Include="src\UI\Screens\ControllerTargetSettingsScreen.cs" />
     <Compile Include="src\UI\Screens\DiagnosticsScreen.cs" />
     <Compile Include="src\UI\Screens\EditAnimationScreen.cs" />
+    <Compile Include="src\UI\Screens\GroupingScreen.cs" />
     <Compile Include="src\UI\Screens\HelpScreen.cs" />
     <Compile Include="src\UI\Screens\ImportAssignScreen.cs" />
     <Compile Include="src\UI\Screens\ImportExportScreen.cs" />

meta.json

@@ -128,6 +128,7 @@
     "Custom\\Scripts\\AcidBubbles\\Timeline\\src\\UI\\Screens\\ControllerTargetSettingsScreen.cs",
     "Custom\\Scripts\\AcidBubbles\\Timeline\\src\\UI\\Screens\\DiagnosticsScreen.cs",
     "Custom\\Scripts\\AcidBubbles\\Timeline\\src\\UI\\Screens\\EditAnimationScreen.cs",
+    "Custom\\Scripts\\AcidBubbles\\Timeline\\src\\UI\\Screens\\GroupingScreen.cs",
     "Custom\\Scripts\\AcidBubbles\\Timeline\\src\\UI\\Screens\\HelpScreen.cs",
     "Custom\\Scripts\\AcidBubbles\\Timeline\\src\\UI\\Screens\\ImportAssignScreen.cs",
     "Custom\\Scripts\\AcidBubbles\\Timeline\\src\\UI\\Screens\\ImportExportScreen.cs",

src/AtomAnimations/Animatables/Base/AnimationTargetBase.cs

@@ -52,6 +52,8 @@ public bool collapsed
             }
         }
 
+        public string group { get; set; }
+
         public string name => animatableRef.name;
         public string GetShortName() => animatableRef.GetShortName();
         public string GetFullName() => animatableRef.GetFullName();

src/AtomAnimations/Animatables/Base/IAtomAnimationTarget.cs

@@ -11,6 +11,7 @@ public interface IAtomAnimationTarget : IDisposable
         string name { get; }
         bool selected { get; set; }
         bool collapsed { get; set; }
+        string group { get; set; }
         IAtomAnimationClip clip { get; set; }
 
         void Validate(float animationLength);

src/AtomAnimations/Animations/AtomAnimation.Playback.cs

@@ -617,6 +617,7 @@ public void SampleParentedControllers(AtomAnimationClip source)
             if (simulationFrozen) return;
             if (_globalScaledWeight <= 0) return;
             // TODO: Index keep track if there is any parenting
+            if (source == null) return;
             var layers = GetMainAndBestSiblingPerLayer(playingAnimationSegmentId, source.animationNameId, source.animationSetId);
             for (var layerIndex = 0; layerIndex < layers.Count; layerIndex++)
             {
@@ -637,7 +638,6 @@ public void SampleParentedControllers(AtomAnimationClip source)
                         if (controller.currentPositionState != FreeControllerV3.PositionState.Off)
                             controller.control.position = Vector3.Lerp(controller.control.position, targetPosition, _globalWeight);
                     }
-
                     var rotationParentRB = ctrl.GetRotationParentRB();
                     if (!ReferenceEquals(rotationParentRB, null))
                     {

src/AtomAnimations/Animations/AtomAnimationClip.cs

@@ -615,17 +615,19 @@ public void DirtyAll()
         public IEnumerable<IAtomAnimationTargetsList> GetTargetGroups()
         {
             yield return targetTriggers;
-            foreach (var group in targetControllers.GroupBy(t => t.animatableRef.groupKey))
+            foreach (var group in targetControllers.GroupBy(t => t.group ?? t.animatableRef.groupKey))
             {
-                yield return new AtomAnimationTargetsList<FreeControllerV3AnimationTarget>(group) { label = group.First().animatableRef.groupLabel };
+                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.animatableRef.groupKey))
+            foreach (var group in targetFloatParams.GroupBy(t => t.group ?? t.animatableRef.groupKey))
             {
-                yield return new AtomAnimationTargetsList<JSONStorableFloatAnimationTarget>(group) { label = group.First().animatableRef.groupLabel };
+                var first = group.First();
+                yield return new AtomAnimationTargetsList<JSONStorableFloatAnimationTarget>(group) { label = first.group ?? first.animatableRef.groupLabel };
             }
         }
 

src/AtomAnimations/Operations/AddAnimationOperations.cs

@@ -69,19 +69,20 @@ public CreatedAnimation AddAnimation(AtomAnimationClip source, string animationN
                 {
                     if (!origTarget.animatableRef.EnsureAvailable(false)) continue;
                     var newTarget = clip.Add(new JSONStorableFloatAnimationTarget(origTarget));
+                    newTarget.group = origTarget.group;
                     newTarget.value.keys = new List<BezierKeyframe>(origTarget.value.keys);
                     newTarget.dirty = true;
                 }
 
                 foreach (var origTarget in source.targetTriggers)
                 {
                     var newTarget = clip.Add(new TriggersTrackAnimationTarget(origTarget.animatableRef, _animation.logger));
+                    newTarget.group = origTarget.group;
                     foreach (var origTrigger in origTarget.triggersMap)
                     {
                         var trigger = newTarget.CreateKeyframe(origTrigger.Key);
                         trigger.RestoreFromJSON(origTrigger.Value.GetJSON());
                     }
-
                     newTarget.dirty = true;
                 }
 
@@ -101,13 +102,15 @@ public CreatedAnimation AddAnimation(AtomAnimationClip source, string animationN
                 {
                     if (!origTarget.animatableRef.EnsureAvailable(false)) continue;
                     var newTarget = clip.Add(origTarget.animatableRef);
+                    newTarget.group = origTarget.group;
                     newTarget.SetKeyframeToCurrent(0f);
                     newTarget.SetKeyframeToCurrent(clip.animationLength);
                 }
 
                 foreach (var origTarget in source.targetTriggers)
                 {
                     var newTarget = new TriggersTrackAnimationTarget(origTarget.animatableRef, _animation.logger);
+                    newTarget.group = origTarget.group;
                     newTarget.AddEdgeFramesIfMissing(clip.animationLength);
                     clip.Add(newTarget);
                 }
@@ -183,6 +186,7 @@ private static FreeControllerV3AnimationTarget CopyTarget(AtomAnimationClip clip
             newTarget.weight = origTarget.weight;
             newTarget.controlPosition = origTarget.controlPosition;
             newTarget.controlRotation = origTarget.controlRotation;
+            newTarget.group = origTarget.group;
             return newTarget;
         }
 

src/AtomAnimations/Serialization/AtomAnimationSerializer.cs

@@ -178,6 +178,7 @@ private void DeserializeClip(AtomAnimationClip clip, JSONClass clipJSON, Animata
                     target.controlPosition = DeserializeBool(controllerJSON["ControlPosition"], true);
                     target.controlRotation = DeserializeBool(controllerJSON["ControlRotation"], true);
                     target.weight = DeserializeFloat(controllerJSON["Weight"], 1f);
+                    target.group = DeserializeString(controllerJSON["Group"], null);
                     if (controllerJSON.HasKey("Parent"))
                     {
                         var parentJSON = controllerJSON["Parent"].AsObject;
@@ -232,6 +233,7 @@ private void DeserializeClip(AtomAnimationClip clip, JSONClass clipJSON, Animata
                         SuperController.LogError($"Timeline: Float param {atom.name} / {storableId} / {floatParamName} was added more than once in clip {clip.animationNameQualified}. Dropping second instance.");
                         continue;
                     }
+                    target.group = DeserializeString(paramJSON["Group"], null);
                     var dirty = false;
                     DeserializeCurve(target.value, paramJSON["Value"], ref dirty);
                     target.AddEdgeFramesIfMissing(clip.animationLength);
@@ -263,6 +265,7 @@ private void DeserializeClip(AtomAnimationClip clip, JSONClass clipJSON, Animata
                             SuperController.LogError($"The triggers track {triggerTrackName} exists more than once in clip {clip.animationNameQualified}. Trigger keyframes may be overwritten.");
                         }
                     }
+                    target.group = DeserializeString(triggerJSON["Group"], null);
                     foreach (JSONClass entryJSON in triggerJSON["Triggers"].AsArray)
                     {
                         var trigger = target.CreateCustomTrigger();
@@ -547,6 +550,10 @@ private static void SerializeClipTargets(AtomAnimationClip clip, JSONClass clipJ
                 {
                     controllerJSON["Weight"] = target.weight.ToString(CultureInfo.InvariantCulture);
                 }
+                if (target.group != null)
+                {
+                    controllerJSON["Group"] = target.group;
+                }
                 controllersJSON.Add(controllerJSON);
             }
             if(controllersJSON.Count > 0)
@@ -570,10 +577,15 @@ private static void SerializeClipTargets(AtomAnimationClip clip, JSONClass clipJ
                     }
                     paramJSON["Atom"] = target.animatableRef.storable.containingAtom.uid;
                 }
+                if (target.group != null)
+                {
+                    paramJSON["Group"] = target.group;
+                }
                 var min = target.animatableRef.floatParam?.min ?? target.animatableRef.assignMinValueOnBound;
                 if (min != null) paramJSON["Min"] = min.Value.ToString(CultureInfo.InvariantCulture);
                 var max = target.animatableRef.floatParam?.max ?? target.animatableRef.assignMaxValueOnBound;
                 if (max != null) paramJSON["Max"] = max.Value.ToString(CultureInfo.InvariantCulture);
+
                 floatParamsJSON.Add(paramJSON);
             }
             if(floatParamsJSON.Count > 0)
@@ -587,6 +599,10 @@ private static void SerializeClipTargets(AtomAnimationClip clip, JSONClass clipJ
                     {"Name", target.name},
                     {"Live", target.animatableRef.live ? "1" : "0"},
                 };
+                if (target.group != null)
+                {
+                    triggerJSON["Group"] = target.group;
+                }
                 var entriesJSON = new JSONArray();
                 foreach (var x in target.triggersMap.OrderBy(kvp => kvp.Key))
                 {

src/AtomPlugin.cs

@@ -1103,6 +1103,7 @@ public void OnBindingsListRequested(List<object> bindings)
             bindings.Add(new JSONStorableAction("OpenUI_MoreTab_Diagnostics", () => { ChangeScreen(DiagnosticsScreen.ScreenName, null); SelectAndOpenUI(); }));
             bindings.Add(new JSONStorableAction("OpenUI_MoreTab_Options", () => { ChangeScreen(OptionsScreen.ScreenName, null); SelectAndOpenUI(); }));
             bindings.Add(new JSONStorableAction("OpenUI_MoreTab_Logging", () => { ChangeScreen(LoggingScreen.ScreenName, null); SelectAndOpenUI(); }));
+            bindings.Add(new JSONStorableAction("OpenUI_MoreTab_Grouping", () => { ChangeScreen(GroupingScreen.ScreenName, null); SelectAndOpenUI(); }));
             bindings.Add(new JSONStorableAction("Toggle_DopeSheetMode", () => _ui.ToggleDopeSheetMode()));
             bindings.Add(new JSONStorableAction("Toggle_ExpandCollapseRightPanel", () => _ui.ToggleExpandCollapse()));
             bindings.Add(new JSONStorableAction("Toggle_SelectAllTargets", () => animationEditContext.SelectAll(!animationEditContext.current.GetAllTargets().Any(t => t.selected))));

src/UI/Screens/GroupingScreen.cs

@@ -0,0 +1,63 @@
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace VamTimeline
+{
+    public class GroupingScreen : ScreenBase
+    {
+        public const string ScreenName = "Grouping";
+
+        private JSONStorableString _assignGroupJSON;
+
+        public override string screenId => ScreenName;
+
+        public override void Init(IAtomPlugin plugin, object arg)
+        {
+            base.Init(plugin, arg);
+
+            CreateChangeScreenButton("<b><</b> <i>Back</i>", MoreScreen.ScreenName);
+
+            InitAssignToGroupUI();
+
+            prefabFactory.CreateButton("Assign to selected targets").button.onClick.AddListener(Assign);
+
+            animation.animatables.onTargetsSelectionChanged.AddListener(OnTargetsSelectionChanged);
+            OnTargetsSelectionChanged();
+        }
+
+        private void InitAssignToGroupUI()
+        {
+            _assignGroupJSON = new JSONStorableString("Group name (empty for auto)", "");
+            prefabFactory.CreateTextInput(_assignGroupJSON);
+        }
+
+        private void OnTargetsSelectionChanged()
+        {
+            var groups = animationEditContext.GetSelectedTargets().Select(t => t.group).Distinct().ToList();
+            if (groups.Count == 1) _assignGroupJSON.val = groups[0];
+        }
+
+        private void Assign()
+        {
+            var group = _assignGroupJSON.val;
+            if (string.IsNullOrEmpty(group)) group = null;
+            foreach (var target in animationEditContext.GetSelectedTargets())
+            {
+                foreach (var c in animationEditContext.currentLayer)
+                {
+                    var t = c.GetAllTargets().FirstOrDefault(x => x.TargetsSameAs(target));
+                    if (t == null) continue;
+                    t.group = group;
+                }
+            }
+            current.onTargetsListChanged.Invoke();
+        }
+
+        public override void OnDestroy()
+        {
+            animation.animatables.onTargetsSelectionChanged.RemoveListener(OnTargetsSelectionChanged);
+            base.OnDestroy();
+        }
+    }
+}
+

src/UI/Screens/MoreScreen.cs

@@ -26,6 +26,7 @@ public override void Init(IAtomPlugin plugin, object arg)
 
             CreateChangeScreenButton("<b>Bulk</b> changes...", BulkScreen.ScreenName);
             CreateChangeScreenButton("<b>Advanced</b> keyframe tools...", AdvancedKeyframeToolsScreen.ScreenName);
+            CreateChangeScreenButton("<b>Grouping</b>...", GroupingScreen.ScreenName);
 
             prefabFactory.CreateSpacer();
 

src/UI/Screens/ScreensManager.cs

@@ -213,6 +213,10 @@ private IEnumerator RefreshCurrentUIDeferred(string screen)
                 case LoggingScreen.ScreenName:
                     _current = screenContainer.AddComponent<LoggingScreen>();
                     break;
+                case GroupingScreen.ScreenName:
+                    _current = screenContainer.AddComponent<GroupingScreen>();
+                    break;
+
                 default:
                     throw new InvalidOperationException($"Unknown screen {screen}");
             }

tests/VamTimeline.Tests.cslist

@@ -116,6 +116,7 @@
 ..\src\UI\Screens\ControllerTargetSettingsScreen.cs
 ..\src\UI\Screens\DiagnosticsScreen.cs
 ..\src\UI\Screens\EditAnimationScreen.cs
+..\src\UI\Screens\GroupingScreen.cs
 ..\src\UI\Screens\HelpScreen.cs
 ..\src\UI\Screens\ImportAssignScreen.cs
 ..\src\UI\Screens\ImportExportScreen.cs