Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-24 23:18:04 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1262 from ousttrue/fix/unity_version

Browse Source 
Fix/unity version
This commit is contained in:
PoChang007 2021-09-29 17:38:02 +09:00 committed by GitHub
commit 6e3715b8bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 192 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef Normal file
View File

@ -0,0 +1,15 @@
{
"name": "UniGLTF.Samples.ScreenSpace",
"references": [
"GUID:8d76e605759c3f64a957d63ef96ada7c"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

7
Assets/UniGLTF/Samples/ScreenSpace/UniGLTF.Samples.ScreenSpace.asmdef.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b7fdb0325c3f0a9449a1b286964a4e0f
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

15
Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef Normal file
View File

@ -0,0 +1,15 @@
{
"name": "VRM.Samples.AnimationBridgeSample",
"references": [
"GUID:05dd262a0c0a2f841b8252c8c3815582"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

7
Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6b040b1abc5395c4982c9a4d5c3dd916
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef Normal file
View File

@ -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
}

7
Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 48e0f44c1c000a94084ebda1628046d0
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

17
Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef Normal file
View File

@ -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
}

7
Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1309c81c467ec1c479b3f19a8b0f7ad4
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef Normal file
View File

@ -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
}

7
Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 42e9a7b6394cf484fb209ac80e611df2
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

11
Assets/VRM10/Editor/EditorTool/VRM10BoneSelectorEditorTool.cs
View File

@ -3,6 +3,11 @@ using UnityEditor;
using UnityEditor.EditorTools;
using UniGLTF;
#if UNITY_2021_OR_NEWER
#else
using ToolManager = UnityEditor.EditorTools.EditorTools;
#endif
namespace UniVRM10
{
/// <summary>
@ -27,7 +32,7 @@ namespace UniVRM10
BoneSelector _impl;
void OnEnable()
{
EditorTools.activeToolChanged += ActiveToolDidChange;
ToolManager.activeToolChanged += ActiveToolDidChange;
if (SceneView.lastActiveSceneView?.camera)
{
}
@ -35,7 +40,7 @@ namespace UniVRM10
void OnDisable()
{
EditorTools.activeToolChanged -= ActiveToolDidChange;
ToolManager.activeToolChanged -= ActiveToolDidChange;
if (_impl != null)
{
_impl.Dispose();
@ -45,7 +50,7 @@ namespace UniVRM10
void ActiveToolDidChange()
{
if (EditorTools.IsActiveTool(this))
if (ToolManager.IsActiveTool(this))
{
}
else

11
Assets/VRM10/Editor/EditorTool/VRM10ExpressionEditorTool.cs
View File

@ -4,6 +4,11 @@ using UnityEditor;
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 @@ namespace UniVRM10
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;
}

11
Assets/VRM10/Editor/EditorTool/VRM10LookAtEditorTool.cs
View File

@ -2,6 +2,11 @@ using UnityEngine;
using UnityEditor;
using UnityEditor.EditorTools;
#if UNITY_2021_OR_NEWER
#else
using ToolManager = UnityEditor.EditorTools.EditorTools;
#endif
namespace UniVRM10
{
@ -23,17 +28,17 @@ namespace UniVRM10
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;
}

18
Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef Normal file
View File

@ -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
}

7
Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c408845854bb97b438c53ae441fbdead
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef Normal file
View File

@ -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
}

7
Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2d70a88b57fd51e47885e80f0ad2f884
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: