From 3a754d7114905bbcacbfb9ac69143dc4ec6a88ea Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Fri, 7 Jun 2024 17:07:10 +0900
Subject: [PATCH] =?UTF-8?q?UniVRM-0.123.0=20Sample=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E3=81=82=E3=82=8A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UniGLTF/Runtime/UniGLTF/PackageVersion.cs |  4 +--
 .../UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs |  4 +--
 Assets/UniGLTF/package.json                   |  4 +--
 .../FirstPersonSample/CanvasManager.cs        |  5 +++
 Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs  | 18 +++++++++++
 Assets/VRM/package.json                       |  6 ++--
 .../VRM10CanvasManager.cs                     |  5 +++
 .../Samples~/VRM10Viewer/VRM10ViewerUI.cs     | 32 +++++++++++++++++++
 Assets/VRM10/package.json                     |  6 ++--
 Assets/VRMShaders/package.json                |  2 +-
 10 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
index 10bfb445f..6abbdf9d5 100644
--- 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
index 943446b14..48b58488a 100644
--- 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
index bedce5f47..63657e6f8 100644
--- 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
index 5647b532c..1fb548223 100644
--- a/Assets/VRM/Samples~/FirstPersonSample/CanvasManager.cs
+++ b/Assets/VRM/Samples~/FirstPersonSample/CanvasManager.cs
@@ -15,8 +15,13 @@ namespace VRM.FirstPersonSample
 
         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
index c28bedbdc..d227bf369 100644
--- a/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
+++ b/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
@@ -175,22 +175,40 @@ namespace VRM.SimpleViewer
 
         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
index cbc3d59f1..471095c77 100644
--- 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
index 6e01fd11e..09fae2b50 100644
--- a/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10CanvasManager.cs
+++ b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10CanvasManager.cs
@@ -15,8 +15,13 @@ namespace UniVRM10.FirstPersonSample
 
         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
index 185fc6530..f4ecd3445 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
@@ -106,7 +106,11 @@ namespace UniVRM10.VRM10Viewer
 
             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 @@ namespace UniVRM10.VRM10Viewer
                 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 @@ namespace UniVRM10.VRM10Viewer
 
             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,12 +244,20 @@ namespace UniVRM10.VRM10Viewer
 
         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");
@@ -241,13 +265,21 @@ namespace UniVRM10.VRM10Viewer
             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
index 72e477067..1dc42a1d1 100644
--- 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
index aef8f5f88..8c58cf1dd 100644
--- 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",