Merge pull request #2478 from ousttrue/fix/remove_vrmlib

[vrm10] vrmlib による mesh 処理を gltf/vrm0.x のものと同じものに

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

@@ -3,7 +3,6 @@
 using System.Linq;
 using UniGLTF.Extensions.VRMC_vrm;
 using UnityEngine;
-using VrmLib;
 
 namespace UniVRM10
 {

Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectExpression.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
-using VrmLib;
 
 namespace UniVRM10
 {

Assets/VRM10/Runtime/IO/ExpressionExtensions.cs

@@ -8,16 +8,16 @@ namespace UniVRM10
 {
     public static class ExpressionExtensions
     {
-        public static MorphTargetBinding? Build10(this MorphTargetBind bind, GameObject root, Vrm10Importer.ModelMap loader, VrmLib.Model model)
+        public static MorphTargetBinding? Build10(this MorphTargetBind bind, GameObject root, Vrm10Importer importer)
         {
-            if (bind.Node.TryGetValidIndex(model.Nodes.Count, out var nodeIndex))
+            if (bind.Node.TryGetValidIndex(importer.Nodes.Count, out var nodeIndex))
             {
-                var libNode = model.Nodes[nodeIndex];
-                if (libNode.MeshGroup == null)
+                var node = importer.Nodes[nodeIndex];
+                var smr = node.GetComponent<SkinnedMeshRenderer>();
+                if (smr == null)
                 {
                     return default;
                 }
-                var node = loader.Nodes[libNode].transform;
                 var relativePath = node.RelativePathFrom(root.transform);
                 return new MorphTargetBinding(relativePath, bind.Index.Value, bind.Weight.Value);
             }