Merge pull request #2316 from ousttrue/version/v0_123_0

UniVRM-0.123.0
vrm-c · Jun 7, 2024 · 999714e · 999714e
2 parents 47ee539 + 3a754d7
commit 999714e
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 13 deletions.
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
@@ -4,8 +4,8 @@ namespace UniGLTF
     public static partial class PackageVersion
     {
         public const int MAJOR = 0;
-        public const int MINOR = 122;
+        public const int MINOR = 123;
         public const int PATCH = 0;
-        public const string VERSION = "0.122.0";
+        public const string VERSION = "0.123.0";
     }
 }
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 = 58;
+        public const int MINOR = 59;
         public const int PATCH = 0;
-        public const string VERSION = "2.58.0";
+        public const string VERSION = "2.59.0";
     }
 }
diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.gltf",
-  "version": "0.122.0",
+  "version": "0.123.0",
   "displayName": "UniGLTF",
   "description": "GLTF importer and exporter",
   "unity": "2021.3",
@@ -11,7 +11,7 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.122.0",
+    "com.vrmc.vrmshaders": "0.123.0",
     "com.unity.modules.animation": "1.0.0"
   },
   "samples": [

diff --git a/Assets/VRM/Samples~/FirstPersonSample/CanvasManager.cs b/Assets/VRM/Samples~/FirstPersonSample/CanvasManager.cs
@@ -15,8 +15,13 @@ public class CanvasManager : MonoBehaviour
 
         private void Reset()
         {
+#if UNITY_2022_3_OR_NEWER
             LoadVRMButton = GameObject.FindObjectsByType<Button>(FindObjectsSortMode.InstanceID).FirstOrDefault(x => x.name == "LoadVRM");
             LoadBVHButton = GameObject.FindObjectsByType<Button>(FindObjectsSortMode.InstanceID).FirstOrDefault(x => x.name == "LoadBVH");
+#else
+            LoadVRMButton = GameObject.FindObjectsOfType<Button>().FirstOrDefault(x => x.name == "LoadVRM");
+            LoadBVHButton = GameObject.FindObjectsOfType<Button>().FirstOrDefault(x => x.name == "LoadBVH");
+#endif
         }
     }
 }
diff --git a/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs b/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
@@ -175,22 +175,40 @@ public void UpdateToggle(Action onBvh, Action onTPose)
 
         private void Reset()
         {
+#if UNITY_2022_3_OR_NEWER
             var buttons = GameObject.FindObjectsByType<Button>(FindObjectsSortMode.InstanceID);
+#else
+            var buttons = GameObject.FindObjectsOfType<Button>();
+#endif
             m_open = buttons.First(x => x.name == "Open");
 
             m_reset = buttons.First(x => x.name == "ResetSpringBone");
 
+#if UNITY_2022_3_OR_NEWER
             var toggles = GameObject.FindObjectsByType<Toggle>(FindObjectsSortMode.InstanceID);
+#else
+            var toggles = GameObject.FindObjectsOfType<Toggle>();
+#endif
             m_useFastSpringBone = toggles.First(x => x.name == "UseFastSpringBone");
             m_enableLipSync = toggles.First(x => x.name == "EnableLipSync");
             m_enableAutoBlink = toggles.First(x => x.name == "EnableAutoBlink");
 
+#if UNITY_2022_3_OR_NEWER
             var texts = GameObject.FindObjectsByType<Text>(FindObjectsSortMode.InstanceID);
+#else
+            var texts = GameObject.FindObjectsOfType<Text>();
+#endif
             m_version = texts.First(x => x.name == "Version");
 
+#if UNITY_2022_3_OR_NEWER
             m_src = GameObject.FindFirstObjectByType<HumanPoseTransfer>();
 
             m_target = GameObject.FindFirstObjectByType<TargetMover>().gameObject;
+#else
+            m_src = GameObject.FindObjectOfType<HumanPoseTransfer>();
+
+            m_target = GameObject.FindObjectOfType<TargetMover>().gameObject;
+#endif
         }
 
         Loaded m_loaded;

diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.univrm",
-  "version": "0.122.0",
+  "version": "0.123.0",
   "displayName": "VRM",
   "description": "VRM importer",
   "unity": "2021.3",
@@ -14,8 +14,8 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.122.0",
-    "com.vrmc.gltf": "0.122.0",
+    "com.vrmc.vrmshaders": "0.123.0",
+    "com.vrmc.gltf": "0.123.0",
     "com.unity.ugui": "1.0.0"
   },
   "samples": [

diff --git a/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10CanvasManager.cs b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10CanvasManager.cs
@@ -15,8 +15,13 @@ public class VRM10CanvasManager : MonoBehaviour
 
         private void Reset()
         {
+#if UNITY_2022_3_OR_NEWER
             LoadVRMButton = GameObject.FindObjectsByType<Button>(FindObjectsSortMode.InstanceID).FirstOrDefault(x => x.name == "LoadVRM");
             LoadBVHButton = GameObject.FindObjectsByType<Button>(FindObjectsSortMode.InstanceID).FirstOrDefault(x => x.name == "LoadBVH");
+#else
+            LoadVRMButton = GameObject.FindObjectsOfType<Button>().FirstOrDefault(x => x.name == "LoadVRM");
+            LoadBVHButton = GameObject.FindObjectsOfType<Button>().FirstOrDefault(x => x.name == "LoadBVH");
+#endif
         }
     }
 }
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
@@ -106,7 +106,11 @@ class TextFields
 
             public void Reset()
             {
+#if UNITY_2022_3_OR_NEWER
                 var texts = GameObject.FindObjectsByType<Text>(FindObjectsSortMode.InstanceID);
+#else
+                var texts = GameObject.FindObjectsOfType<Text>();
+#endif
                 m_textModelTitle = texts.First(x => x.name == "Title (1)");
                 m_textModelVersion = texts.First(x => x.name == "Version (1)");
                 m_textModelAuthor = texts.First(x => x.name == "Author (1)");
@@ -123,7 +127,11 @@ public void Reset()
                 m_textDistributionLicense = texts.First(x => x.name == "LicenseType (1)");
                 m_textDistributionOther = texts.First(x => x.name == "OtherLicense (1)");
 
+#if UNITY_2022_3_OR_NEWER
                 var images = GameObject.FindObjectsByType<RawImage>(FindObjectsSortMode.InstanceID);
+#else
+                var images = GameObject.FindObjectsOfType<RawImage>();
+#endif
                 m_thumbnail = images.First(x => x.name == "RawImage");
             }
 
@@ -205,11 +213,19 @@ class UIFields
 
             public void Reset()
             {
+#if UNITY_2022_3_OR_NEWER
                 var toggles = GameObject.FindObjectsByType<Toggle>(FindObjectsSortMode.InstanceID);
+#else
+                var toggles = GameObject.FindObjectsOfType<Toggle>();
+#endif
                 ToggleMotionTPose = toggles.First(x => x.name == "TPose");
                 ToggleMotionBVH = toggles.First(x => x.name == "BVH");
 
+#if UNITY_2022_3_OR_NEWER
                 var groups = GameObject.FindObjectsByType<ToggleGroup>(FindObjectsSortMode.InstanceID);
+#else
+                var groups = GameObject.FindObjectsOfType<ToggleGroup>();
+#endif
                 ToggleMotion = groups.First(x => x.name == "_Motion_");
             }
 
@@ -228,26 +244,42 @@ public bool IsTPose
 
         private void Reset()
         {
+#if UNITY_2022_3_OR_NEWER
             var buttons = GameObject.FindObjectsByType<Button>(FindObjectsSortMode.InstanceID);
+#else
+            var buttons = GameObject.FindObjectsOfType<Button>();
+#endif
             m_openModel = buttons.First(x => x.name == "OpenModel");
             m_openMotion = buttons.First(x => x.name == "OpenMotion");
             m_pastePose = buttons.First(x => x.name == "PastePose");
 
+#if UNITY_2022_3_OR_NEWER
             var toggles = GameObject.FindObjectsByType<Toggle>(FindObjectsSortMode.InstanceID);
+#else
+            var toggles = GameObject.FindObjectsOfType<Toggle>();
+#endif
             m_showBoxMan = toggles.First(x => x.name == "ShowBoxMan");
             m_enableLipSync = toggles.First(x => x.name == "EnableLipSync");
             m_enableAutoBlink = toggles.First(x => x.name == "EnableAutoBlink");
             m_enableAutoExpression = toggles.First(x => x.name == "EnableAutoExpression");
             m_useUrpMaterial = toggles.First(x => x.name == "UseUrpMaterial");
             m_useAsync = toggles.First(x => x.name == "UseAsync");
 
+#if UNITY_2022_3_OR_NEWER
             var texts = GameObject.FindObjectsByType<Text>(FindObjectsSortMode.InstanceID);
+#else
+            var texts = GameObject.FindObjectsOfType<Text>();
+#endif
             m_version = texts.First(x => x.name == "VrmVersion");
 
             m_texts.Reset();
             m_ui.Reset();
 
+#if UNITY_2022_3_OR_NEWER
             m_target = GameObject.FindFirstObjectByType<VRM10TargetMover>().gameObject;
+#else
+            m_target = GameObject.FindObjectOfType<VRM10TargetMover>().gameObject;
+#endif
         }
 
         Loaded m_loaded;

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

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