Fix for rogue CmpAccessory with dynamic bones.

OrangeSpork · Oct 22, 2021 · fce3888 · fce3888
1 parent 063981d
commit fce3888
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 8 deletions.
diff --git a/AdditionalAccessoryControls/AdditionalAccessoryAdvancedParentController.cs b/AdditionalAccessoryControls/AdditionalAccessoryAdvancedParentController.cs
@@ -218,7 +218,7 @@ private bool CheckAndLinkDynamicBone(GameObject go, List<Transform> parentTransf
                         dynamicBonesInstantiated = true;
                         AdditionalAccessoryControlDynamicBoneUpdateManager.RegisterDynamicBone(bone, OnDynamicBoneUpdate);
 #if DEBUG
-                        Log.LogInfo($"Dynamic Bone Link Established: {bone.gameObject.name}");
+                        Log.LogInfo($"Dynamic Bone Link Established: {bone.gameObject.name} {bone.gameObject.GetInstanceID()}");
 #endif
                         return true;
                     }
@@ -240,7 +240,7 @@ private bool CheckAndLinkDynamicBone(GameObject go, List<Transform> parentTransf
                         dynamicBonesInstantiated = true;
                         AdditionalAccessoryControlDynamicBoneUpdateManager.RegisterDynamicBone(bone, OnDynamicBoneV2Update);
 #if DEBUG
-                        Log.LogInfo($"Dynamic Bone Link Established: {bone.gameObject.name}");
+                        Log.LogInfo($"Dynamic Bone Link Established: {bone.gameObject.name} {bone.gameObject.GetInstanceID()}");
 #endif
                         return true;
                     }
@@ -334,9 +334,11 @@ public void OnSkinnedMeshUpdate(SkinnedMeshRenderedVertex vertex)
             gameObject.transform.localEulerAngles = Vector3.zero;
 
             gameObject.transform.position = vertex.position;
-      //      gameObject.transform.eulerAngles = gameObject.transform.TransformDirection(gameObject.transform.parent.InverseTransformDirection(gameObject.transform.parent.eulerAngles));
+            //      gameObject.transform.eulerAngles = gameObject.transform.TransformDirection(gameObject.transform.parent.InverseTransformDirection(gameObject.transform.parent.eulerAngles));
+
         }
 
+        private bool eofCoroutineRunning = false;
         private void LateUpdate()
         { 
             if (LinkParent != null && parentTransform == null)
@@ -357,10 +359,35 @@ private void LateUpdate()
 
                     gameObject.transform.position = parentTransform.position;
                     gameObject.transform.eulerAngles = parentTransform.eulerAngles;
+
+#if DEBUG                    
+                    if (Time.frameCount % 60 == 0)
+                    {
+                        Log.LogInfo($"Updating {gameObject.name} {gameObject.GetInstanceID()} My Pos: {gameObject.transform.position} Par Pos: {parentTransform.position}");
+                        if (!eofCoroutineRunning)
+                        {
+                            StartCoroutine(EndOfFrame());
+                            eofCoroutineRunning = true;
+                        }
+                    }
+
+#endif
                 }
             }
         }
 
+        private IEnumerator EndOfFrame()
+        {
+            yield return new WaitForEndOfFrame();
+
+#if DEBUG
+            if (Time.frameCount % 60 == 0)
+                Log.LogInfo($"EOF {gameObject.name} {gameObject.GetInstanceID()} My Pos: {gameObject.transform.position} Par Pos: {parentTransform.position}");
+
+            eofCoroutineRunning = false;
+#endif
+        }
+
         private void OnDestroy()
         {
             if (DynamicBone != null && DynamicBone.GetType() == typeof(DynamicBone))

diff --git a/AdditionalAccessoryControls/AdditionalAccessoryAdvancedParentSkinnedMeshHelper.cs b/AdditionalAccessoryControls/AdditionalAccessoryAdvancedParentSkinnedMeshHelper.cs
@@ -246,7 +246,7 @@ private void DoUpdate()
         {
             try
             {
-                if (!gameObject.activeInHierarchy)
+                if (gameObject == null || !gameObject.activeInHierarchy)
                 {
                     return;
                 }

diff --git a/AdditionalAccessoryControls/AdditionalAccessoryControlsPlugin.cs b/AdditionalAccessoryControls/AdditionalAccessoryControlsPlugin.cs
@@ -28,7 +28,7 @@ public partial class AdditionalAccessoryControlsPlugin : BaseUnityPlugin
 
         public const string GUID = "orange.spork.additionalaccessorycontrolsplugin";
         public const string PluginName = "Additional Accessory Controls";
-        public const string Version = "1.1.8";
+        public const string Version = "1.1.9";
 
         public static AdditionalAccessoryControlsPlugin Instance { get; set; }  // Me
 

diff --git a/AdditionalAccessoryControls/AdditionalAccessoryHooks.cs b/AdditionalAccessoryControls/AdditionalAccessoryHooks.cs
@@ -40,10 +40,15 @@ static void MoreAccessoriesLateUpdateForcePostfixPostfix(CmpBase __instance, ref
             if (__instance.GetType() != typeof(CmpAccessory))
                 return;
 
-            int slot = int.Parse(__instance.gameObject.name.Substring(7));            
-            if (slot >= 20 && __instance.isVisible)
+            if (__instance.gameObject.name.Length < 7 || !__instance.gameObject.name.StartsWith("ca_slot"))
+                return;
+
+            if (int.TryParse(__instance.gameObject.name.Substring(7), out int slot))
             {
-                enable = !enable;
+                if (slot >= 20 && __instance.isVisible)
+                {
+                    enable = !enable;
+                }
             }
         }