Merge pull request #678 from anatawa12/fix-proxy-animation

fix: proxy animation can be remapped
anatawa12 · Nov 2, 2023 · aa3fcf8 · aa3fcf8
2 parents 8dd613a + 164e610
commit aa3fcf8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- proxy animation can be modified `#678`
 
 ### Security
 

diff --git a/Editor/ObjectMapping/AnimationObjectMapper.cs b/Editor/ObjectMapping/AnimationObjectMapper.cs
@@ -130,6 +130,12 @@ public EditorCurveBinding[] MapBinding(EditorCurveBinding binding)
 
                 if (componentInfo.PropertyMapping.TryGetValue(binding.propertyName, out var newProp))
                 {
+                    // if mapped one is exactly same as original, return null
+                    if (newProp.AllCopiedTo.Length == 1
+                        && newProp.AllCopiedTo[0].InstanceId == instanceId
+                        && newProp.AllCopiedTo[0].Name == binding.propertyName)
+                        return null;
+
                     // there are mapping for property
                     var curveBindings = new EditorCurveBinding[newProp.AllCopiedTo.Length];
                     var copiedToIndex = 0;

diff --git a/Editor/ObjectMapping/ObjectMappingContext.cs b/Editor/ObjectMapping/ObjectMappingContext.cs
@@ -142,6 +142,10 @@ private Object CustomClone(Object o)
         {
             if (o is AnimationClip clip)
             {
+#if AAO_VRCSDK3_AVATARS
+                // TODO: when BuildContext have property to check if it is for VRCSDK3, additionally use it.
+                if (clip.IsProxy()) return clip;
+#endif
                 var newClip = new AnimationClip();
                 newClip.name = "rebased " + clip.name;
 

diff --git a/Editor/Utils/Utils.VRCSDK.cs b/Editor/Utils/Utils.VRCSDK.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 using VRC.Dynamics;
@@ -25,5 +26,8 @@ public static IEnumerable<Transform> GetAffectedTransforms(this VRCPhysBoneBase
                         queue.Enqueue(child);
             }
         }
+
+        // https://creators.vrchat.com/avatars/#proxy-animations
+        public static bool IsProxy(this AnimationClip clip) => clip.name.StartsWith("proxy_", StringComparison.Ordinal);
     }
 }