Merge pull request #2238 from ousttrue/fix/hide_not_impl_option

rotation もしくは scaling だけを freeze するのは難しかった。
vrm-c · Feb 8, 2024 · ccd3a12 · ccd3a12
2 parents 226df16 + 7e07c58
commit ccd3a12
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 36 deletions.
diff --git a/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs b/Assets/UniGLTF/Editor/MeshUtility/MeshUtilityDialog.cs
@@ -300,10 +300,7 @@ protected bool ToggleIsModified(string label, ref bool value)
 
         bool MeshFreezeGui()
         {
-            var blendShape = ToggleIsModified("BlendShape", ref MeshUtility.FreezeBlendShape);
-            var scale = ToggleIsModified("Scale", ref MeshUtility.FreezeScaling);
-            var rotation = ToggleIsModified("Rotation", ref MeshUtility.FreezeRotation);
-            return blendShape || scale || rotation;
+            return ToggleIsModified("BlendShapeRotationScaling", ref MeshUtility.FreezeBlendShapeRotationAndScaling);
         }
 
         protected virtual bool MeshIntegrateGui()

diff --git a/Assets/UniGLTF/Runtime/MeshUtility/BoneNormalizer.cs b/Assets/UniGLTF/Runtime/MeshUtility/BoneNormalizer.cs
@@ -49,13 +49,8 @@ private static MeshAttachInfo CreateMeshInfo(Transform src)
         /// 回転とスケールを除去し、BlendShape の現状を焼き付けた版を作成する(まだ、アタッチしない)
         /// </summary>
         public static Dictionary<Transform, MeshAttachInfo> NormalizeHierarchyFreezeMesh(
-            GameObject go, bool freezeRotation)
+            GameObject go)
         {
-            if (!freezeRotation)
-            {
-                throw new NotImplementedException("WIP");
-            }
-
             var result = new Dictionary<Transform, MeshAttachInfo>();
             foreach (var src in go.transform.Traverse())
             {
@@ -108,4 +103,4 @@ public static void Replace(GameObject go, Dictionary<Transform, MeshAttachInfo>
             }
         }
     }
-}
+}
diff --git a/Assets/UniGLTF/Runtime/MeshUtility/GltfMeshUtility.cs b/Assets/UniGLTF/Runtime/MeshUtility/GltfMeshUtility.cs
@@ -23,23 +23,7 @@ public class GltfMeshUtility
         /// - Node
         /// - InverseBindMatrices
         /// </summary>
-        public bool FreezeBlendShape = false;
-
-        /// <summary>
-        /// Same as VRM-0 normalization
-        /// - Mesh
-        /// - Node
-        /// - InverseBindMatrices
-        /// </summary>
-        public bool FreezeScaling = true;
-
-        /// <summary>
-        /// Same as VRM-0 normalization
-        /// - Mesh
-        /// - Node
-        /// - InverseBindMatrices
-        /// </summary>
-        public bool FreezeRotation = false;
+        public bool FreezeBlendShapeRotationAndScaling = false;
 
         public List<MeshIntegrationGroup> MeshIntegrationGroups = new List<MeshIntegrationGroup>();
 
@@ -172,15 +156,15 @@ public virtual IEnumerable<MeshIntegrationGroup> CopyInstantiate(GameObject go,
         public virtual (List<MeshIntegrationResult>, List<GameObject>) Process(
             GameObject target, IEnumerable<MeshIntegrationGroup> groupCopy)
         {
-            if (FreezeBlendShape || FreezeRotation || FreezeScaling)
+            if (FreezeBlendShapeRotationAndScaling)
             {
                 // MeshをBakeする
-                var meshMap = BoneNormalizer.NormalizeHierarchyFreezeMesh(target, FreezeRotation);
+                var meshMap = BoneNormalizer.NormalizeHierarchyFreezeMesh(target);
 
                 // - ヒエラルキーから回転・拡縮を除去する
                 // - BakeされたMeshで置き換える
                 // - bindPoses を再計算する
-                BoneNormalizer.Replace(target, meshMap, FreezeRotation, FreezeScaling);
+                BoneNormalizer.Replace(target, meshMap, true, true);
             }
 
             var newList = new List<GameObject>();

diff --git a/Assets/VRM/Runtime/SkinnedMeshUtility/VRMBoneNormalizer.cs b/Assets/VRM/Runtime/SkinnedMeshUtility/VRMBoneNormalizer.cs
@@ -76,9 +76,10 @@ public static void Execute(GameObject go, bool forceTPose)
             }
 
             // Transform の回転とスケールを Mesh に適用します。
+            // - BlendShape は現状がbakeされます
             // - 回転とスケールが反映された新しい Mesh が作成されます
-            // - Transform の回転とスケールはクリアされます。world position を維持します。
-            var newMeshMap = BoneNormalizer.NormalizeHierarchyFreezeMesh(go, true);
+            // - Transform の回転とスケールはクリアされます。world position を維持します
+            var newMeshMap = BoneNormalizer.NormalizeHierarchyFreezeMesh(go);
 
             // SkinnedMeshRenderer.sharedMesh と MeshFilter.sharedMesh を新しいMeshで置き換える
             BoneNormalizer.Replace(go, newMeshMap, true, true);

diff --git a/Assets/VRM/Runtime/SkinnedMeshUtility/VrmMeshUtility.cs b/Assets/VRM/Runtime/SkinnedMeshUtility/VrmMeshUtility.cs
@@ -108,7 +108,7 @@ public override (List<UniGLTF.MeshUtility.MeshIntegrationResult>, List<GameObjec
             // TODO: update: firstPerson offset
             var (list, newList) = base.Process(target, copyGroup);
 
-            if (FreezeBlendShape || FreezeRotation || FreezeScaling)
+            if (FreezeBlendShapeRotationAndScaling)
             {
                 var animator = target.GetComponent<Animator>();
                 var newAvatar = AvatarDescription.RecreateAvatar(animator);

diff --git a/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs b/Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs
@@ -11,7 +11,7 @@ public class Vrm10MeshUtility : UniGLTF.MeshUtility.GltfMeshUtility
     {
         public Vrm10MeshUtility()
         {
-            FreezeRotation = true;
+            FreezeBlendShapeRotationAndScaling = true;
         }
 
         bool _generateFirstPerson = false;
@@ -115,7 +115,7 @@ public override (List<UniGLTF.MeshUtility.MeshIntegrationResult>, List<GameObjec
             // TODO: update: firstPerson offset
             var (list, newList) = base.Process(target, groupCopy);
 
-            if (FreezeBlendShape || FreezeRotation || FreezeScaling)
+            if (FreezeBlendShapeRotationAndScaling)
             {
                 var animator = target.GetComponent<Animator>();
                 var newAvatar = AvatarDescription.RecreateAvatar(animator);