Merge pull request #1262 from ousttrue/fix/unity_version

Fix/unity version
vrm-c · Sep 29, 2021 · 6e3715b · 6e3715b
2 parents 3ebced6 + 38727a9
commit 6e3715b
Show file tree

Hide file tree

Showing 17 changed files with 192 additions and 9 deletions.
diff --git a/Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef b/Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef
@@ -0,0 +1,15 @@
+{
+    "name": "UniGLTF.Samples.ScreenSpace",
+    "references": [
+        "GUID:8d76e605759c3f64a957d63ef96ada7c"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef.meta b/Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef.meta
diff --git a/Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef b/Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef
@@ -0,0 +1,15 @@
+{
+    "name": "VRM.Samples.AnimationBridgeSample",
+    "references": [
+        "GUID:05dd262a0c0a2f841b8252c8c3815582"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef.meta b/Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef.meta
diff --git a/Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef b/Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "VRM.Samples.FirstPersonSample",
+    "references": [
+        "GUID:da3e51d19d51a544fa14d43fee843098",
+        "GUID:b7aa47b240b57de44a4b2021c143c9bf",
+        "GUID:8d76e605759c3f64a957d63ef96ada7c",
+        "GUID:05dd262a0c0a2f841b8252c8c3815582"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef.meta b/Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef.meta
diff --git a/Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef b/Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef
@@ -0,0 +1,17 @@
+{
+    "name": "VRM.Samples.RuntimeExporterSample",
+    "references": [
+        "GUID:da3e51d19d51a544fa14d43fee843098",
+        "GUID:8d76e605759c3f64a957d63ef96ada7c",
+        "GUID:05dd262a0c0a2f841b8252c8c3815582"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef.meta b/Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef.meta
diff --git a/Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef b/Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "VRM.Samples.SimpleViewer",
+    "references": [
+        "GUID:da3e51d19d51a544fa14d43fee843098",
+        "GUID:b7aa47b240b57de44a4b2021c143c9bf",
+        "GUID:8d76e605759c3f64a957d63ef96ada7c",
+        "GUID:05dd262a0c0a2f841b8252c8c3815582"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef.meta b/Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef.meta
diff --git a/Assets/VRM10/Editor/EditorTool/VRM10BoneSelectorEditorTool.cs b/Assets/VRM10/Editor/EditorTool/VRM10BoneSelectorEditorTool.cs
@@ -3,6 +3,11 @@
 using UnityEditor.EditorTools;
 using UniGLTF;
 
+#if UNITY_2021_OR_NEWER
+#else
+using ToolManager = UnityEditor.EditorTools.EditorTools;
+#endif
+
 namespace UniVRM10
 {
     /// <summary>
@@ -27,15 +32,15 @@ public override GUIContent toolbarIcon
         BoneSelector _impl;
         void OnEnable()
         {
-            EditorTools.activeToolChanged += ActiveToolDidChange;
+            ToolManager.activeToolChanged += ActiveToolDidChange;
             if (SceneView.lastActiveSceneView?.camera)
             {
             }
         }
 
         void OnDisable()
         {
-            EditorTools.activeToolChanged -= ActiveToolDidChange;
+            ToolManager.activeToolChanged -= ActiveToolDidChange;
             if (_impl != null)
             {
                 _impl.Dispose();
@@ -45,7 +50,7 @@ void OnDisable()
 
         void ActiveToolDidChange()
         {
-            if (EditorTools.IsActiveTool(this))
+            if (ToolManager.IsActiveTool(this))
             {
             }
             else

diff --git a/Assets/VRM10/Editor/EditorTool/VRM10ExpressionEditorTool.cs b/Assets/VRM10/Editor/EditorTool/VRM10ExpressionEditorTool.cs
@@ -4,6 +4,11 @@
 using UnityEditor.EditorTools;
 using UnityEngine;
 
+#if UNITY_2021_OR_NEWER
+#else
+using ToolManager = UnityEditor.EditorTools.EditorTools;
+#endif
+
 namespace UniVRM10
 {
     [EditorTool("vrm-1.0/Expression", typeof(UniVRM10.Vrm10Instance))]
@@ -24,17 +29,17 @@ public override GUIContent toolbarIcon
 
         void OnEnable()
         {
-            EditorTools.activeToolChanged += ActiveToolDidChange;
+            ToolManager.activeToolChanged += ActiveToolDidChange;
         }
 
         void OnDisable()
         {
-            EditorTools.activeToolChanged -= ActiveToolDidChange;
+            ToolManager.activeToolChanged -= ActiveToolDidChange;
         }
 
         void ActiveToolDidChange()
         {
-            if (!EditorTools.IsActiveTool(this))
+            if (!ToolManager.IsActiveTool(this))
             {
                 return;
             }

diff --git a/Assets/VRM10/Editor/EditorTool/VRM10LookAtEditorTool.cs b/Assets/VRM10/Editor/EditorTool/VRM10LookAtEditorTool.cs
@@ -2,6 +2,11 @@
 using UnityEditor;
 using UnityEditor.EditorTools;
 
+#if UNITY_2021_OR_NEWER
+#else
+using ToolManager = UnityEditor.EditorTools.EditorTools;
+#endif
+
 
 namespace UniVRM10
 {
@@ -23,17 +28,17 @@ public override GUIContent toolbarIcon
 
         void OnEnable()
         {
-            EditorTools.activeToolChanged += ActiveToolDidChange;
+            ToolManager.activeToolChanged += ActiveToolDidChange;
         }
 
         void OnDisable()
         {
-            EditorTools.activeToolChanged -= ActiveToolDidChange;
+            ToolManager.activeToolChanged -= ActiveToolDidChange;
         }
 
         void ActiveToolDidChange()
         {
-            if (!EditorTools.IsActiveTool(this))
+            if (!ToolManager.IsActiveTool(this))
             {
                 return;
             }

diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef b/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "VRM10.Samples.VRM10FirstPersonSample",
+    "references": [
+        "GUID:da3e51d19d51a544fa14d43fee843098",
+        "GUID:b7aa47b240b57de44a4b2021c143c9bf",
+        "GUID:8d76e605759c3f64a957d63ef96ada7c",
+        "GUID:e47c917724578cc43b5506c17a27e9a0"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef.meta b/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef.meta
diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef b/Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "VRM10.Samples.VRM10Viewer",
+    "references": [
+        "GUID:b7aa47b240b57de44a4b2021c143c9bf",
+        "GUID:da3e51d19d51a544fa14d43fee843098",
+        "GUID:8d76e605759c3f64a957d63ef96ada7c",
+        "GUID:e47c917724578cc43b5506c17a27e9a0"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef.meta b/Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef.meta