export with bone normalize cause, drop look at curve params

vrm-c · May 19, 2021 · b8223a2 · b8223a2
1 parent 3f7fa08
commit b8223a2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/Assets/VRM/Runtime/LookAt/CurveMapper.cs b/Assets/VRM/Runtime/LookAt/CurveMapper.cs
@@ -7,7 +7,7 @@
 namespace VRM
 {
     [Serializable]
-    public class CurveMapper
+    public class CurveMapper : IEquatable<CurveMapper>
     {
         public AnimationCurve Curve = AnimationCurve.Linear(0, 0, 1.0f, 1.0f);
 
@@ -37,6 +37,12 @@ public void OnValidate()
             }
         }
 
+        public void Assign(CurveMapper mapper)
+        {
+            CurveXRangeDegree = mapper.CurveXRangeDegree;
+            CurveYRangeDegree = mapper.CurveYRangeDegree;
+        }
+
         public void Apply(glTF_VRM_DegreeMap degreeMap)
         {
             CurveXRangeDegree = degreeMap.xRange;
@@ -71,5 +77,21 @@ public float Map(float src)
             }
             return Curve.Evaluate(src / CurveXRangeDegree) * CurveYRangeDegree;
         }
+
+        public bool Equals(CurveMapper other)
+        {
+            if (CurveXRangeDegree != other.CurveXRangeDegree) return false;
+            if (CurveYRangeDegree != other.CurveYRangeDegree) return false;
+            return true;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is CurveMapper mapper)
+            {
+                return Equals(mapper);
+            }
+            return base.Equals(obj);
+        }
     }
 }
diff --git a/Assets/VRM/Runtime/SkinnedMeshUtility/VRMBoneNormalizer.cs b/Assets/VRM/Runtime/SkinnedMeshUtility/VRMBoneNormalizer.cs
@@ -228,6 +228,10 @@ public static GameObject Execute(GameObject go, bool forceTPose)
                 if (src != null)
                 {
                     var dst = root.AddComponent<VRMLookAtBoneApplyer>();
+                    dst.HorizontalInner.Assign(src.HorizontalInner);
+                    dst.HorizontalOuter.Assign(src.HorizontalOuter);
+                    dst.VerticalUp.Assign(src.VerticalUp);
+                    dst.VerticalDown.Assign(src.VerticalDown);
                 }
             }
             {
@@ -236,6 +240,9 @@ public static GameObject Execute(GameObject go, bool forceTPose)
                 if (src != null)
                 {
                     var dst = root.AddComponent<VRMLookAtBlendShapeApplyer>();
+                    dst.Horizontal.Assign(src.Horizontal);
+                    dst.VerticalUp.Assign(src.VerticalUp);
+                    dst.VerticalDown.Assign(src.VerticalDown);
                 }
             }