Merge pull request #2460 from ousttrue/version/v0_127_1

UniVRM-0.127.1
vrm-c · Oct 15, 2024 · 0214d88 · 0214d88
2 parents 4055adc + 573ad56
commit 0214d88
Show file tree

Hide file tree

Showing 12 changed files with 4,413 additions and 412 deletions.
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
@@ -5,7 +5,7 @@ public static partial class PackageVersion
     {
         public const int MAJOR = 0;
         public const int MINOR = 127;
-        public const int PATCH = 0;
-        public const string VERSION = "0.127.0";
+        public const int PATCH = 1;
+        public const string VERSION = "0.127.1";
     }
 }
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
@@ -5,7 +5,7 @@ public static partial class UniGLTFVersion
     {
         public const int MAJOR = 2;
         public const int MINOR = 63;
-        public const int PATCH = 0;
-        public const string VERSION = "2.63.0";
+        public const int PATCH = 1;
+        public const string VERSION = "2.63.1";
     }
 }
diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.gltf",
-  "version": "0.127.0",
+  "version": "0.127.1",
   "displayName": "UniGLTF",
   "description": "GLTF importer and exporter",
   "unity": "2021.3",

diff --git a/Assets/VRM/Samples~/SimpleViewer/Loaded.cs b/Assets/VRM/Samples~/SimpleViewer/Loaded.cs
@@ -1,5 +1,6 @@
 using System;
 using UniGLTF;
+using UniGLTF.SpringBoneJobs.Blittables;
 using UniHumanoid;
 using UnityEngine;
 
@@ -40,9 +41,12 @@ public bool EnableLipSyncValue
             }
         }
 
-        public Loaded(RuntimeGltfInstance instance, HumanPoseTransfer src, Transform lookAtTarget)
+        IVrm0XSpringBoneRuntime _springbone;
+
+        public Loaded(RuntimeGltfInstance instance, HumanPoseTransfer src, Transform lookAtTarget, IVrm0XSpringBoneRuntime springbone)
         {
             _instance = instance;
+            _springbone = springbone;
 
             var lookAt = instance.GetComponent<VRMLookAtHead>();
             if (lookAt != null)
@@ -104,15 +108,19 @@ public void EnableTPose(HumanPoseClip pose)
             }
         }
 
-        public void ResetSpring()
+        public void ResetSpringbone()
         {
-            if (_pose != null)
-            {
-                foreach (var spring in _pose.GetComponentsInChildren<VRMSpringBone>())
-                {
-                    spring.Setup();
-                }
-            }
+            _springbone.RestoreInitialTransform();
+        }
+
+        public void ReconstructSpringbone()
+        {
+            _springbone.ReconstructSpringBone();
+        }
+
+        public void SetSpringboneModelLevel(BlittableModelLevel modelSettings)
+        {
+            _springbone.SetModelLevel(_instance.transform, modelSettings);
         }
     }
-}
+}