Merge pull request #2573 from ousttrue/fix/custom_material

_MainTex_ST の参照を修正

Author: ousttrue

Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs

@@ -22,10 +22,6 @@ public static string GetProperty(MaterialColorType bindType)
         {
             switch (bindType)
             {
-                // case MaterialBindType.UvOffset:
-                // case MaterialBindType.UvScale:
-                //     return UV_PROPERTY;
-
                 case MaterialColorType.color:
                     return COLOR_PROPERTY;
 

Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs

@@ -56,7 +56,9 @@ public PreviewMaterialItem(Material material)
             Material = material;
 
             // uv default value
-            DefaultUVScaleOffset = material.GetVector(UV_PROPERTY);
+            var s = material.mainTextureScale;
+            var o = material.mainTextureOffset;
+            DefaultUVScaleOffset = new(s.x, s.y, o.x, o.y);
         }
 
         public Dictionary<UniGLTF.Extensions.VRMC_vrm.MaterialColorType, PropItem> PropMap = new Dictionary<UniGLTF.Extensions.VRMC_vrm.MaterialColorType, PropItem>();
@@ -77,7 +79,6 @@ public void RestoreInitialValues()
             }
         }
 
-        public static readonly string UV_PROPERTY = $"{MToon10Prop.BaseColorTexture.ToUnityShaderLabName()}_ST";
         public static readonly string COLOR_PROPERTY = MToon10Prop.BaseColorFactor.ToUnityShaderLabName();
         public static readonly string EMISSION_COLOR_PROPERTY = MToon10Prop.EmissiveFactor.ToUnityShaderLabName();
         public static readonly string RIM_COLOR_PROPERTY = MToon10Prop.ParametricRimColorFactor.ToUnityShaderLabName();
@@ -132,7 +133,8 @@ public void Clear()
             }
 
             // clear UV
-            Material.SetVector(UV_PROPERTY, DefaultUVScaleOffset);
+            Material.mainTextureScale = new(DefaultUVScaleOffset.x, DefaultUVScaleOffset.y);
+            Material.mainTextureOffset = new(DefaultUVScaleOffset.z, DefaultUVScaleOffset.w);
         }
 
         /// <summary>
@@ -142,9 +144,12 @@ public void Clear()
         /// <param name="weight"></param>
         public void AddScaleOffset(Vector4 scaleOffset, float weight)
         {
-            var value = Material.GetVector(UV_PROPERTY);
+            var s = Material.mainTextureScale;
+            var o = Material.mainTextureOffset;
+            var value = new Vector4(s.x, s.y, o.x, o.y);
             value += (scaleOffset - DefaultUVScaleOffset) * weight;
-            Material.SetColor(UV_PROPERTY, value);
+            Material.mainTextureOffset = new(value.z, value.w);
+            Material.mainTextureScale = new(value.x, value.y);
         }
     }
 }

Assets/VRM10/Runtime/Components/VrmAnimationInstance/IVrm10Animation.cs

@@ -9,6 +9,7 @@ public interface IVrm10Animation : IDisposable
         (INormalizedPoseProvider, ITPoseProvider) ControlRig { get; }
         IReadOnlyDictionary<ExpressionKey, Func<float>> ExpressionMap { get; }
         public void ShowBoxMan(bool enable);
+        public void SetBoxManMaterial(Material material);
         LookAtInput? LookAt { get; }
     }
 }

Assets/VRM10/Runtime/Components/VrmAnimationInstance/Vrm10AnimationInstance.cs

@@ -15,6 +15,11 @@ public void ShowBoxMan(bool enable)
             BoxMan.enabled = enable;
         }
 
+        public void SetBoxManMaterial(Material material)
+        {
+            BoxMan.material = material;
+        }
+
         public void Dispose()
         {
             if (Application.isPlaying)

Assets/VRM10/Runtime/Components/VrmAnimationInstance/Vrm10TPose.cs

@@ -65,5 +65,9 @@ public void Dispose()
         public void ShowBoxMan(bool enable)
         {
         }
+
+        public void SetBoxManMaterial(Material material)
+        {
+        }
     }
 }

Assets/VRM10_Samples/ClothSample/ClothViewer/Motions/BvhMotion.cs

@@ -55,6 +55,10 @@ public void ShowBoxMan(bool enable)
             m_boxMan.enabled = enable;
         }
 
+        public void SetBoxManMaterial(Material material)
+        {
+        }
+
         public void Dispose()
         {
             GameObject.Destroy(m_context.Root);