cleaned up the authoredmotionsystem

Author: dooly123

Basis/Packages/com.basis.framework/Avatar/BasisAvatarFactory.cs

@@ -417,6 +417,9 @@ private static void SetupPlayerAvatar(BasisPlayer Player, BasisAvatar avatar, bo
                 ? loadHarvest.Renderers.ToArray()
                 : avatar.GetComponentsInChildren<Renderer>(true);
             Player.BasisAvatar.SkinnedMeshRenderers = loadHarvest.SkinnedMeshRenderers?.ToArray();
+            Player.BasisAvatar.AuthoredMotions = loadHarvest.AuthoredMotions != null
+                ? loadHarvest.AuthoredMotions.ToArray()
+                : avatar.GetComponentsInChildren<BasisAuthoredMotion>(true);
             avatar.Harvest = null;
             Player.BasisAvatar.IsOwnedLocally = Player.IsLocal;
 

Basis/Packages/com.basis.framework/Drivers/AuthoredMotion/BasisAuthoredMotionSystem.cs

@@ -231,8 +231,9 @@ static float Wave(int waveform, float phase, float pulseWidth)
 /// networked humanoid skeleton, so there's no write contention with the bone pipeline.
 ///
 /// <para>Registration is calibration-driven (no scene discovery): the local/remote avatar drivers
-/// call <see cref="Register"/> for each <see cref="BasisAuthoredMotion"/> on the avatar and
-/// <see cref="Unregister"/> on teardown/recalibration. Authoritative state lives in managed
+/// call <see cref="Register"/> for each <see cref="BasisAuthoredMotion"/> on the avatar at calibration;
+/// recalibration re-registers (dedup drops the stale record) and a torn-down avatar's slots are
+/// reclaimed by the next <see cref="Schedule"/> rebuild. Authoritative state lives in managed
 /// <c>Registration</c> records (rest poses captured once at registration); a structural change
 /// rebuilds the native containers from them.</para>
 /// </summary>

Basis/Packages/com.basis.framework/Drivers/Local/BasisLocalAvatarDriver.cs

@@ -150,10 +150,13 @@ public void InitialLocalCalibration(BasisLocalPlayer player, List<BasisHeadChop.
             }
 
             // Register authored motion (drives non-humanoid transforms IK doesn't touch); rest captured at the current TPose.
-            var authoredMotions = player.BasisAvatar.GetComponentsInChildren<BasisAuthoredMotion>(true);
-            for (int i = 0; i < authoredMotions.Length; i++)
+            var authoredMotions = player.BasisAvatar.AuthoredMotions;
+            if (authoredMotions != null)
             {
-                BasisAuthoredMotionSystem.Register(authoredMotions[i]);
+                for (int i = 0; i < authoredMotions.Length; i++)
+                {
+                    BasisAuthoredMotionSystem.Register(authoredMotions[i]);
+                }
             }
 
             player.LocalRigDriver.Builder = BasisHelpers.GetOrAddComponent<RigBuilder>(AvatarAnimatorParent);

Basis/Packages/com.basis.framework/Drivers/Remote/BasisRemoteAvatarDriver.cs

@@ -139,10 +139,13 @@ public void RemoteCalibration(BasisRemotePlayer RemotePlayer)
             }
 
             // Register authored motion (drives non-humanoid transforms the bone job / IK don't touch); rest captured at the current TPose.
-            var authoredMotions = RemotePlayer.BasisAvatar.GetComponentsInChildren<BasisAuthoredMotion>(true);
-            for (int i = 0; i < authoredMotions.Length; i++)
+            var authoredMotions = RemotePlayer.BasisAvatar.AuthoredMotions;
+            if (authoredMotions != null)
             {
-                BasisAuthoredMotionSystem.Register(authoredMotions[i]);
+                for (int i = 0; i < authoredMotions.Length; i++)
+                {
+                    BasisAuthoredMotionSystem.Register(authoredMotions[i]);
+                }
             }
 
             // Face visibility setup

Basis/Packages/com.basis.framework/Players/Remote/BasisRemotePlayer.cs

@@ -529,17 +529,6 @@ public void OnDestroy()
 
             OnRemotePlayerDestroying?.Invoke();
 
-            // Unregister authored motion while the avatar transforms are still alive, so the
-            // TransformAccessArray entries drop cleanly before Unity destroys them.
-            if (BasisAvatar != null)
-            {
-                var authoredMotions = BasisAvatar.GetComponentsInChildren<BasisAuthoredMotion>(true);
-                for (int i = 0; i < authoredMotions.Length; i++)
-                {
-                    BasisAuthoredMotionSystem.Unregister(authoredMotions[i]);
-                }
-            }
-
             RemoveFromBoneDriver();
         }
 

Basis/Packages/com.basis.sdk/Scripts/Basis Components/BasisAvatar.cs

@@ -121,6 +121,9 @@ public bool TryGetLinkedPlayer(out ushort Id)
         [System.NonSerialized]
         public SkinnedMeshRenderer[] SkinnedMeshRenderers;
 
+        [System.NonSerialized]
+        public BasisAuthoredMotion[] AuthoredMotions;
+
         /// <summary>
         /// Humanoid bone transforms captured at build time, indexed by HumanBodyBones, so
         /// runtime calibration can skip the per-bone Animator.GetBoneTransform lookups.

Basis/Packages/com.basis.sdk/Scripts/Basis Components/BasisContentHarvest.cs

@@ -72,6 +72,7 @@ public sealed class BasisContentHarvest
         public BasisComponentKind[] Kinds;
         public List<Renderer> Renderers;
         public List<SkinnedMeshRenderer> SkinnedMeshRenderers;
+        public List<BasisAuthoredMotion> AuthoredMotions;
 
         /// <summary>
         /// Maps a component to its <see cref="BasisComponentKind"/>. Single source of truth for the
@@ -149,6 +150,7 @@ public static BasisContentHarvest BuildFrom(GameObject root, bool includeInactiv
                 Kinds = new BasisComponentKind[count],
                 Renderers = new List<Renderer>(),
                 SkinnedMeshRenderers = new List<SkinnedMeshRenderer>(),
+                AuthoredMotions = new List<BasisAuthoredMotion>(),
             };
             for (int i = 0; i < count; i++)
             {
@@ -162,6 +164,10 @@ public static BasisContentHarvest BuildFrom(GameObject root, bool includeInactiv
                         harvest.SkinnedMeshRenderers.Add(skinned);
                     }
                 }
+                if (component is BasisAuthoredMotion authored)
+                {
+                    harvest.AuthoredMotions.Add(authored);
+                }
             }
             return harvest;
         }

Basis/Packages/com.basis.sdk/Scripts/Content Police/ContentPoliceControl.cs

@@ -49,6 +49,7 @@ public static GameObject ContentControl(GameObject DisabledGameobject, GameObjec
                 // so shader prewarm runs without paying for a second GetComponentsInChildren.
                 List<Renderer> renderersForPrewarm = new List<Renderer>();
                 List<SkinnedMeshRenderer> skinnedForHarvest = harvest != null ? new List<SkinnedMeshRenderer>() : null;
+                List<BasisAuthoredMotion> authoredForHarvest = harvest != null ? new List<BasisAuthoredMotion>() : null;
                 BasisComponentKind[] kinds = harvest != null ? new BasisComponentKind[count] : null;
 
                 // BasisHeadChop is harvested during this walk so the local avatar driver
@@ -77,6 +78,9 @@ public static GameObject ContentControl(GameObject DisabledGameobject, GameObjec
                             GameObject.DestroyImmediate(headChop);
                             if (kinds != null) kinds[Index] = BasisComponentKind.Removed;
                             break;
+                        case BasisAuthoredMotion authoredMotion:
+                            authoredForHarvest?.Add(authoredMotion);
+                            break;
                         case Animator animator:
                             // AnimationEvents dispatch via SendMessage(methodName, arg),
                             // which invokes any method of that name on any component on
@@ -172,6 +176,7 @@ public static GameObject ContentControl(GameObject DisabledGameobject, GameObjec
                     harvest.Kinds = kinds;
                     harvest.Renderers = renderersForPrewarm;
                     harvest.SkinnedMeshRenderers = skinnedForHarvest;
+                    harvest.AuthoredMotions = authoredForHarvest;
                 }
 
                 if (MaterialCorrectionEnabled)

Basis/Packages/dev.hai-vr.basis.comms/Scripts/Systems/Runtime/Vixxy/Internal/HVR_VixxyPermitted.cs

@@ -18,6 +18,8 @@ public static class HVR_VixxyPermitted
             typeof(GameObject),
             typeof(ParticleSystem),
             typeof(Cloth),
+            // Authored motion
+            typeof(BasisAuthoredMotion),
             // Renderers
             typeof(MeshRenderer), // NOTE: MeshRenderer and SkinnedMeshRenderer have hard-coded leniency on material properties. If a property recursively affects a SkinnedMeshRenderer, then it will also affect a MeshRenderer.
             typeof(SkinnedMeshRenderer),
@@ -53,8 +55,6 @@ public static class HVR_VixxyPermitted
             "UnityEngine.Rendering.Universal.DecalProjector",
             // Jiggle
             "GatorDragonGames.JigglePhysics.JiggleRig",
-            // Authored motion (toggle the component's enabled state per movement group)
-            "BasisAuthoredMotion",
             // UI
             "TMPro.TextMeshPro",
             "TMPro.TextMeshProUGUI",