Merge pull request #1917 from ousttrue/version/v0_107_0

UniVRM-0.107.0
vrm-c · Nov 9, 2022 · 802d0f6 · 802d0f6
2 parents 870318b + d25f6d3
commit 802d0f6
Show file tree

Hide file tree

Showing 14 changed files with 8,325 additions and 20 deletions.
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
@@ -4,8 +4,8 @@ namespace UniGLTF
     public static partial class UniGLTFVersion
     {
         public const int MAJOR = 2;
-        public const int MINOR = 42;
+        public const int MINOR = 43;
         public const int PATCH = 0;
-        public const string VERSION = "2.42.0";
+        public const string VERSION = "2.43.0";
     }
 }
diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.gltf",
-  "version": "0.106.0",
+  "version": "0.107.0",
   "displayName": "UniGLTF",
   "description": "GLTF importer and exporter",
   "unity": "2019.4",
@@ -11,7 +11,7 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.106.0",
+    "com.vrmc.vrmshaders": "0.107.0",
     "com.unity.modules.animation": "1.0.0"
   },
   "samples": [

diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs
@@ -4,8 +4,8 @@ namespace VRM
     public static partial class VRMVersion
     {
         public const int MAJOR = 0;
-        public const int MINOR = 106;
+        public const int MINOR = 107;
         public const int PATCH = 0;
-        public const string VERSION = "0.106.0";
+        public const string VERSION = "0.107.0";
     }
 }
diff --git a/Assets/VRM/Samples~/SimpleViewer/Motions.meta b/Assets/VRM/Samples~/SimpleViewer/Motions.meta
diff --git a/Assets/VRM/Samples~/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt b/Assets/VRM/Samples~/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt
diff --git a/Assets/VRM/Samples~/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt.meta b/Assets/VRM/Samples~/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt.meta
diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.univrm",
-  "version": "0.106.0",
+  "version": "0.107.0",
   "displayName": "VRM",
   "description": "VRM importer",
   "unity": "2019.4",
@@ -14,8 +14,8 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.106.0",
-    "com.vrmc.gltf": "0.106.0",
+    "com.vrmc.vrmshaders": "0.107.0",
+    "com.vrmc.gltf": "0.107.0",
     "com.unity.ugui": "1.0.0"
   },
   "samples": [

diff --git a/Assets/VRM10/Samples~/VRM10Viewer/Motions.meta b/Assets/VRM10/Samples~/VRM10Viewer/Motions.meta
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/Motions/vrm10viewer_test_motion.txt b/Assets/VRM10/Samples~/VRM10Viewer/Motions/vrm10viewer_test_motion.txt
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/Motions/vrm10viewer_test_motion.txt.meta b/Assets/VRM10/Samples~/VRM10Viewer/Motions/vrm10viewer_test_motion.txt.meta
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity
@@ -5572,7 +5572,7 @@ MonoBehaviour:
   m_src: {fileID: 0}
   m_target: {fileID: 802105000}
   Root: {fileID: 0}
-  m_motion: {fileID: 4900000, guid: 7d2617171adc40b41ac50228f101e178, type: 3}
+  m_motion: {fileID: 4900000, guid: 08df5151e71aed748b13547492fb8b9a, type: 3}
   m_texts:
     m_textModelTitle: {fileID: 1111491925}
     m_textModelVersion: {fileID: 1045380263}
@@ -5591,7 +5591,6 @@ MonoBehaviour:
     ToggleMotionTPose: {fileID: 1791103380}
     ToggleMotionBVH: {fileID: 1311520910}
     ToggleMotion: {fileID: 224350194}
-  m_pose: {fileID: 11400000, guid: 879e332f84a378c4da3b87af13da3e85, type: 2}
 --- !u!1 &1791103378
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
@@ -168,9 +168,6 @@ public bool IsBvhEnabled
         [SerializeField]
         UIFields m_ui = default;
 
-        [SerializeField]
-        HumanPoseClip m_pose = default;
-
         private void Reset()
         {
             var buttons = GameObject.FindObjectsOfType<Button>();
@@ -204,9 +201,12 @@ private void Start()
             }
 
             string[] cmds = System.Environment.GetCommandLineArgs();
-            if (cmds.Length > 1)
+            for (int i = 1; i < cmds.Length; ++i)
             {
-                LoadModel(cmds[1]);
+                if (File.Exists(cmds[i]))
+                {
+                    LoadModel(cmds[i]);
+                }
             }
 
             m_texts.Start();
@@ -224,6 +224,8 @@ private void LoadMotion(string source)
             context.Load();
             m_src = context.Root.GetComponent<Animator>();
             m_ui.IsBvhEnabled = true;
+            // hide box man
+            context.Root.GetComponent<SkinnedMeshRenderer>().enabled = false;
         }
 
         private void Update()

diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.vrm",
-  "version": "0.106.0",
+  "version": "0.107.0",
   "displayName": "VRM-1.0",
   "description": "VRM-1.0 importer",
   "unity": "2019.4",
@@ -14,8 +14,8 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.106.0",
-    "com.vrmc.gltf": "0.106.0"
+    "com.vrmc.vrmshaders": "0.107.0",
+    "com.vrmc.gltf": "0.107.0"
   },
   "samples": [
     {

diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.vrmshaders",
-  "version": "0.106.0",
+  "version": "0.107.0",
   "displayName": "VRM Shaders",
   "description": "VRM Shaders",
   "unity": "2019.4",