From 251c3d77069d74b4062b2b1e92ac93eef196aa1d Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 13 Oct 2021 17:37:45 +0900 Subject: [PATCH] =?UTF-8?q?Samples=20=E3=82=92=20Samples~=20=E3=81=AB?= =?UTF-8?q?=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 以降、Unity でコンパイルが通っていることを保証できない。つらい --- Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs | 4 ++-- Assets/UniGLTF/package.json | 4 ++-- Assets/VRM/Editor/Format/VRMVersionMenu.cs | 12 ++++++------ Assets/VRM/Runtime/Format/VRMVersion.cs | 4 ++-- Assets/VRM/Samples.meta | 8 -------- .../AnimationBridgeSample.meta | 0 .../AnimationBridgeSample/AnimationBridge.cs | 0 .../AnimationBridgeSample/AnimationBridge.cs.meta | 0 .../AnimationBridgeSample.anim | 0 .../AnimationBridgeSample.anim.meta | 0 .../VRM.Samples.AnimationBridgeSample.asmdef | 0 .../VRM.Samples.AnimationBridgeSample.asmdef.meta | 0 .../{Samples => Samples~}/FirstPersonSample.meta | 0 .../FirstPersonSample/CanvasManager.cs | 0 .../FirstPersonSample/CanvasManager.cs.meta | 0 .../FirstPersonSample/FileDialogForWindows.cs | 0 .../FirstPersonSample/FileDialogForWindows.cs.meta | 0 .../FirstPersonSample/FirstPersonSample.unity | 0 .../FirstPersonSample/FirstPersonSample.unity.meta | 0 .../VRM.Samples.FirstPersonSample.asmdef | 0 .../VRM.Samples.FirstPersonSample.asmdef.meta | 0 .../FirstPersonSample/VRMRuntimeLoader.cs | 0 .../FirstPersonSample/VRMRuntimeLoader.cs.meta | 0 .../RuntimeExporterSample.meta | 0 .../RuntimeExporterSample/FileDialogForWindows.cs | 0 .../FileDialogForWindows.cs.meta | 0 .../RuntimeExporterSample.unity | 0 .../RuntimeExporterSample.unity.meta | 0 .../VRM.Samples.RuntimeExporterSample.asmdef | 0 .../VRM.Samples.RuntimeExporterSample.asmdef.meta | 0 .../RuntimeExporterSample/VRMRuntimeExporter.cs | 0 .../VRMRuntimeExporter.cs.meta | 0 Assets/VRM/{Samples => Samples~}/SimpleViewer.meta | 0 .../{Samples => Samples~}/SimpleViewer/AIUEO.cs | 0 .../SimpleViewer/AIUEO.cs.meta | 0 .../SimpleViewer/FileDialogForWindows.cs | 0 .../SimpleViewer/FileDialogForWindows.cs.meta | 0 .../SimpleViewer/RokuroCamera.cs | 0 .../SimpleViewer/RokuroCamera.cs.meta | 0 .../SimpleViewer/SimpleViewer.unity | 0 .../SimpleViewer/SimpleViewer.unity.meta | 0 .../SimpleViewer/TargetMover.cs | 0 .../SimpleViewer/TargetMover.cs.meta | 0 .../SimpleViewer/VRM.Samples.SimpleViewer.asmdef | 0 .../VRM.Samples.SimpleViewer.asmdef.meta | 0 .../{Samples => Samples~}/SimpleViewer/ViewerUI.cs | 0 .../SimpleViewer/ViewerUI.cs.meta | 0 Assets/VRM/{Samples => Samples~}/SpringBone.meta | 0 Assets/VRM/package.json | 14 +++++++------- Assets/VRM10/Samples.meta | 8 -------- .../VRM10FirstPersonSample.meta | 0 .../VRM10.Samples.VRM10FirstPersonSample.asmdef | 0 ...RM10.Samples.VRM10FirstPersonSample.asmdef.meta | 0 .../VRM10FirstPersonSample/VRM10CanvasManager.cs | 0 .../VRM10CanvasManager.cs.meta | 0 .../VRM10FileDialogForWindows.cs | 0 .../VRM10FileDialogForWindows.cs.meta | 0 .../VRM10FirstPersonSample.unity | 0 .../VRM10FirstPersonSample.unity.meta | 0 .../VRM10FirstPersonSample/VRM10LookTarget.cs | 0 .../VRM10FirstPersonSample/VRM10LookTarget.cs.meta | 0 .../VRM10OffsetOnTransform.cs | 0 .../VRM10OffsetOnTransform.cs.meta | 0 .../VRM10FirstPersonSample/VRM10RuntimeLoader.cs | 0 .../VRM10RuntimeLoader.cs.meta | 0 .../VRM10/{Samples => Samples~}/VRM10Viewer.meta | 0 .../VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef | 0 .../VRM10.Samples.VRM10Viewer.asmdef.meta | 0 .../VRM10Viewer/VRM10AIUEO.cs | 0 .../VRM10Viewer/VRM10AIUEO.cs.meta | 0 .../VRM10Viewer/VRM10AutoExpression.cs | 0 .../VRM10Viewer/VRM10AutoExpression.cs.meta | 0 .../VRM10Viewer/VRM10Blinker.cs | 0 .../VRM10Viewer/VRM10Blinker.cs.meta | 0 .../VRM10Viewer/VRM10FileDialogForWindows.cs | 0 .../VRM10Viewer/VRM10FileDialogForWindows.cs.meta | 0 .../VRM10Viewer/VRM10RokuroCamera.cs | 0 .../VRM10Viewer/VRM10RokuroCamera.cs.meta | 0 .../VRM10Viewer/VRM10TargetMover.cs | 0 .../VRM10Viewer/VRM10TargetMover.cs.meta | 0 .../VRM10Viewer/VRM10Viewer.unity | 0 .../VRM10Viewer/VRM10Viewer.unity.meta | 0 .../VRM10Viewer/VRM10ViewerUI.cs | 0 .../VRM10Viewer/VRM10ViewerUI.cs.meta | 0 Assets/VRM10/package.json | 10 +++++----- Assets/VRMShaders/package.json | 2 +- 86 files changed, 25 insertions(+), 41 deletions(-) delete mode 100644 Assets/VRM/Samples.meta rename Assets/VRM/{Samples => Samples~}/AnimationBridgeSample.meta (100%) rename Assets/VRM/{Samples => Samples~}/AnimationBridgeSample/AnimationBridge.cs (100%) rename Assets/VRM/{Samples => Samples~}/AnimationBridgeSample/AnimationBridge.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/AnimationBridgeSample/AnimationBridgeSample.anim (100%) rename Assets/VRM/{Samples => Samples~}/AnimationBridgeSample/AnimationBridgeSample.anim.meta (100%) rename Assets/VRM/{Samples => Samples~}/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef (100%) rename Assets/VRM/{Samples => Samples~}/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef.meta (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample.meta (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/CanvasManager.cs (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/CanvasManager.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/FileDialogForWindows.cs (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/FileDialogForWindows.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/FirstPersonSample.unity (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/FirstPersonSample.unity.meta (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef.meta (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/VRMRuntimeLoader.cs (100%) rename Assets/VRM/{Samples => Samples~}/FirstPersonSample/VRMRuntimeLoader.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/RuntimeExporterSample.meta (100%) rename Assets/VRM/{Samples => Samples~}/RuntimeExporterSample/FileDialogForWindows.cs (100%) rename Assets/VRM/{Samples => Samples~}/RuntimeExporterSample/FileDialogForWindows.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/RuntimeExporterSample/RuntimeExporterSample.unity (100%) rename Assets/VRM/{Samples => Samples~}/RuntimeExporterSample/RuntimeExporterSample.unity.meta (100%) rename Assets/VRM/{Samples => Samples~}/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef (100%) rename Assets/VRM/{Samples => Samples~}/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef.meta (100%) rename Assets/VRM/{Samples => Samples~}/RuntimeExporterSample/VRMRuntimeExporter.cs (100%) rename Assets/VRM/{Samples => Samples~}/RuntimeExporterSample/VRMRuntimeExporter.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer.meta (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/AIUEO.cs (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/AIUEO.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/FileDialogForWindows.cs (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/FileDialogForWindows.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/RokuroCamera.cs (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/RokuroCamera.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/SimpleViewer.unity (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/SimpleViewer.unity.meta (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/TargetMover.cs (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/TargetMover.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/VRM.Samples.SimpleViewer.asmdef (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/VRM.Samples.SimpleViewer.asmdef.meta (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/ViewerUI.cs (100%) rename Assets/VRM/{Samples => Samples~}/SimpleViewer/ViewerUI.cs.meta (100%) rename Assets/VRM/{Samples => Samples~}/SpringBone.meta (100%) delete mode 100644 Assets/VRM10/Samples.meta rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10CanvasManager.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10CanvasManager.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10FirstPersonSample.unity (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10FirstPersonSample.unity.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10LookTarget.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10LookTarget.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10RuntimeLoader.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10FirstPersonSample/VRM10RuntimeLoader.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10AIUEO.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10AIUEO.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10AutoExpression.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10AutoExpression.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10Blinker.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10Blinker.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10FileDialogForWindows.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10FileDialogForWindows.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10RokuroCamera.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10RokuroCamera.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10TargetMover.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10TargetMover.cs.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10Viewer.unity (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10Viewer.unity.meta (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10ViewerUI.cs (100%) rename Assets/VRM10/{Samples => Samples~}/VRM10Viewer/VRM10ViewerUI.cs.meta (100%) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index 8731f4582..7ceb28d38 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs @@ -5,7 +5,7 @@ namespace UniGLTF { public const int MAJOR = 2; public const int MINOR = 22; - public const int PATCH = 0; - public const string VERSION = "2.22.0"; + public const int PATCH = 1; + public const string VERSION = "2.22.1"; } } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index 846f6cc32..7027f7383 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.gltf", - "version": "0.86.0", + "version": "0.86.1", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2019.4", @@ -11,6 +11,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.86.0" + "com.vrmc.vrmshaders": "0.86.1" } } \ No newline at end of file diff --git a/Assets/VRM/Editor/Format/VRMVersionMenu.cs b/Assets/VRM/Editor/Format/VRMVersionMenu.cs index f8933a577..5ee595f6e 100644 --- a/Assets/VRM/Editor/Format/VRMVersionMenu.cs +++ b/Assets/VRM/Editor/Format/VRMVersionMenu.cs @@ -108,22 +108,22 @@ namespace VRM {{ ""displayName"": ""SimpleViewer"", ""description"": ""VRM runtime loader sample"", - ""path"": ""Samples/SimpleViewer"" + ""path"": ""Samples~/SimpleViewer"" }}, {{ ""displayName"": ""FirstPersonSample"", ""description"": ""First Person layer sample with multi camera"", - ""path"": ""Samples/FirstPersonSample"" + ""path"": ""Samples~/FirstPersonSample"" }}, {{ ""displayName"": ""RuntimeExporterSample"", ""description"": ""VRM runtime exporter sample"", - ""path"": ""Samples/RuntimeExporterSample"" + ""path"": ""Samples~/RuntimeExporterSample"" }}, {{ ""displayName"": ""AnimationBridgeSample"", ""description"": ""BlendShape animation clip sample"", - ""path"": ""Samples/AnimationBridgeSample"" + ""path"": ""Samples~/AnimationBridgeSample"" }} ] }} @@ -153,12 +153,12 @@ namespace VRM {{ ""displayName"": ""VRM10Viewer"", ""description"": ""VRM10 runtime loader sample"", - ""path"": ""Samples/VRM10Viewer"" + ""path"": ""Samples~/VRM10Viewer"" }}, {{ ""displayName"": ""VRM10FirstPersonSample"", ""description"": ""First Person layer sample with multi camera"", - ""path"": ""Samples/VRM10FirstPersonSample"" + ""path"": ""Samples~/VRM10FirstPersonSample"" }} ] }} diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs index 5406ff258..b4c26c07f 100644 --- a/Assets/VRM/Runtime/Format/VRMVersion.cs +++ b/Assets/VRM/Runtime/Format/VRMVersion.cs @@ -5,7 +5,7 @@ namespace VRM { public const int MAJOR = 0; public const int MINOR = 86; - public const int PATCH = 0; - public const string VERSION = "0.86.0"; + public const int PATCH = 1; + public const string VERSION = "0.86.1"; } } diff --git a/Assets/VRM/Samples.meta b/Assets/VRM/Samples.meta deleted file mode 100644 index 12702a4d8..000000000 --- a/Assets/VRM/Samples.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 20ae97a2cd4bae04cbce95721fa3d788 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM/Samples/AnimationBridgeSample.meta b/Assets/VRM/Samples~/AnimationBridgeSample.meta similarity index 100% rename from Assets/VRM/Samples/AnimationBridgeSample.meta rename to Assets/VRM/Samples~/AnimationBridgeSample.meta diff --git a/Assets/VRM/Samples/AnimationBridgeSample/AnimationBridge.cs b/Assets/VRM/Samples~/AnimationBridgeSample/AnimationBridge.cs similarity index 100% rename from Assets/VRM/Samples/AnimationBridgeSample/AnimationBridge.cs rename to Assets/VRM/Samples~/AnimationBridgeSample/AnimationBridge.cs diff --git a/Assets/VRM/Samples/AnimationBridgeSample/AnimationBridge.cs.meta b/Assets/VRM/Samples~/AnimationBridgeSample/AnimationBridge.cs.meta similarity index 100% rename from Assets/VRM/Samples/AnimationBridgeSample/AnimationBridge.cs.meta rename to Assets/VRM/Samples~/AnimationBridgeSample/AnimationBridge.cs.meta diff --git a/Assets/VRM/Samples/AnimationBridgeSample/AnimationBridgeSample.anim b/Assets/VRM/Samples~/AnimationBridgeSample/AnimationBridgeSample.anim similarity index 100% rename from Assets/VRM/Samples/AnimationBridgeSample/AnimationBridgeSample.anim rename to Assets/VRM/Samples~/AnimationBridgeSample/AnimationBridgeSample.anim diff --git a/Assets/VRM/Samples/AnimationBridgeSample/AnimationBridgeSample.anim.meta b/Assets/VRM/Samples~/AnimationBridgeSample/AnimationBridgeSample.anim.meta similarity index 100% rename from Assets/VRM/Samples/AnimationBridgeSample/AnimationBridgeSample.anim.meta rename to Assets/VRM/Samples~/AnimationBridgeSample/AnimationBridgeSample.anim.meta diff --git a/Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef b/Assets/VRM/Samples~/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef similarity index 100% rename from Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef rename to Assets/VRM/Samples~/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef diff --git a/Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef.meta b/Assets/VRM/Samples~/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef.meta similarity index 100% rename from Assets/VRM/Samples/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef.meta rename to Assets/VRM/Samples~/AnimationBridgeSample/VRM.Samples.AnimationBridgeSample.asmdef.meta diff --git a/Assets/VRM/Samples/FirstPersonSample.meta b/Assets/VRM/Samples~/FirstPersonSample.meta similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample.meta rename to Assets/VRM/Samples~/FirstPersonSample.meta diff --git a/Assets/VRM/Samples/FirstPersonSample/CanvasManager.cs b/Assets/VRM/Samples~/FirstPersonSample/CanvasManager.cs similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/CanvasManager.cs rename to Assets/VRM/Samples~/FirstPersonSample/CanvasManager.cs diff --git a/Assets/VRM/Samples/FirstPersonSample/CanvasManager.cs.meta b/Assets/VRM/Samples~/FirstPersonSample/CanvasManager.cs.meta similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/CanvasManager.cs.meta rename to Assets/VRM/Samples~/FirstPersonSample/CanvasManager.cs.meta diff --git a/Assets/VRM/Samples/FirstPersonSample/FileDialogForWindows.cs b/Assets/VRM/Samples~/FirstPersonSample/FileDialogForWindows.cs similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/FileDialogForWindows.cs rename to Assets/VRM/Samples~/FirstPersonSample/FileDialogForWindows.cs diff --git a/Assets/VRM/Samples/FirstPersonSample/FileDialogForWindows.cs.meta b/Assets/VRM/Samples~/FirstPersonSample/FileDialogForWindows.cs.meta similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/FileDialogForWindows.cs.meta rename to Assets/VRM/Samples~/FirstPersonSample/FileDialogForWindows.cs.meta diff --git a/Assets/VRM/Samples/FirstPersonSample/FirstPersonSample.unity b/Assets/VRM/Samples~/FirstPersonSample/FirstPersonSample.unity similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/FirstPersonSample.unity rename to Assets/VRM/Samples~/FirstPersonSample/FirstPersonSample.unity diff --git a/Assets/VRM/Samples/FirstPersonSample/FirstPersonSample.unity.meta b/Assets/VRM/Samples~/FirstPersonSample/FirstPersonSample.unity.meta similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/FirstPersonSample.unity.meta rename to Assets/VRM/Samples~/FirstPersonSample/FirstPersonSample.unity.meta diff --git a/Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef b/Assets/VRM/Samples~/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef rename to Assets/VRM/Samples~/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef diff --git a/Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef.meta b/Assets/VRM/Samples~/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef.meta similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef.meta rename to Assets/VRM/Samples~/FirstPersonSample/VRM.Samples.FirstPersonSample.asmdef.meta diff --git a/Assets/VRM/Samples/FirstPersonSample/VRMRuntimeLoader.cs b/Assets/VRM/Samples~/FirstPersonSample/VRMRuntimeLoader.cs similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/VRMRuntimeLoader.cs rename to Assets/VRM/Samples~/FirstPersonSample/VRMRuntimeLoader.cs diff --git a/Assets/VRM/Samples/FirstPersonSample/VRMRuntimeLoader.cs.meta b/Assets/VRM/Samples~/FirstPersonSample/VRMRuntimeLoader.cs.meta similarity index 100% rename from Assets/VRM/Samples/FirstPersonSample/VRMRuntimeLoader.cs.meta rename to Assets/VRM/Samples~/FirstPersonSample/VRMRuntimeLoader.cs.meta diff --git a/Assets/VRM/Samples/RuntimeExporterSample.meta b/Assets/VRM/Samples~/RuntimeExporterSample.meta similarity index 100% rename from Assets/VRM/Samples/RuntimeExporterSample.meta rename to Assets/VRM/Samples~/RuntimeExporterSample.meta diff --git a/Assets/VRM/Samples/RuntimeExporterSample/FileDialogForWindows.cs b/Assets/VRM/Samples~/RuntimeExporterSample/FileDialogForWindows.cs similarity index 100% rename from Assets/VRM/Samples/RuntimeExporterSample/FileDialogForWindows.cs rename to Assets/VRM/Samples~/RuntimeExporterSample/FileDialogForWindows.cs diff --git a/Assets/VRM/Samples/RuntimeExporterSample/FileDialogForWindows.cs.meta b/Assets/VRM/Samples~/RuntimeExporterSample/FileDialogForWindows.cs.meta similarity index 100% rename from Assets/VRM/Samples/RuntimeExporterSample/FileDialogForWindows.cs.meta rename to Assets/VRM/Samples~/RuntimeExporterSample/FileDialogForWindows.cs.meta diff --git a/Assets/VRM/Samples/RuntimeExporterSample/RuntimeExporterSample.unity b/Assets/VRM/Samples~/RuntimeExporterSample/RuntimeExporterSample.unity similarity index 100% rename from Assets/VRM/Samples/RuntimeExporterSample/RuntimeExporterSample.unity rename to Assets/VRM/Samples~/RuntimeExporterSample/RuntimeExporterSample.unity diff --git a/Assets/VRM/Samples/RuntimeExporterSample/RuntimeExporterSample.unity.meta b/Assets/VRM/Samples~/RuntimeExporterSample/RuntimeExporterSample.unity.meta similarity index 100% rename from Assets/VRM/Samples/RuntimeExporterSample/RuntimeExporterSample.unity.meta rename to Assets/VRM/Samples~/RuntimeExporterSample/RuntimeExporterSample.unity.meta diff --git a/Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef b/Assets/VRM/Samples~/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef similarity index 100% rename from Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef rename to Assets/VRM/Samples~/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef diff --git a/Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef.meta b/Assets/VRM/Samples~/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef.meta similarity index 100% rename from Assets/VRM/Samples/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef.meta rename to Assets/VRM/Samples~/RuntimeExporterSample/VRM.Samples.RuntimeExporterSample.asmdef.meta diff --git a/Assets/VRM/Samples/RuntimeExporterSample/VRMRuntimeExporter.cs b/Assets/VRM/Samples~/RuntimeExporterSample/VRMRuntimeExporter.cs similarity index 100% rename from Assets/VRM/Samples/RuntimeExporterSample/VRMRuntimeExporter.cs rename to Assets/VRM/Samples~/RuntimeExporterSample/VRMRuntimeExporter.cs diff --git a/Assets/VRM/Samples/RuntimeExporterSample/VRMRuntimeExporter.cs.meta b/Assets/VRM/Samples~/RuntimeExporterSample/VRMRuntimeExporter.cs.meta similarity index 100% rename from Assets/VRM/Samples/RuntimeExporterSample/VRMRuntimeExporter.cs.meta rename to Assets/VRM/Samples~/RuntimeExporterSample/VRMRuntimeExporter.cs.meta diff --git a/Assets/VRM/Samples/SimpleViewer.meta b/Assets/VRM/Samples~/SimpleViewer.meta similarity index 100% rename from Assets/VRM/Samples/SimpleViewer.meta rename to Assets/VRM/Samples~/SimpleViewer.meta diff --git a/Assets/VRM/Samples/SimpleViewer/AIUEO.cs b/Assets/VRM/Samples~/SimpleViewer/AIUEO.cs similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/AIUEO.cs rename to Assets/VRM/Samples~/SimpleViewer/AIUEO.cs diff --git a/Assets/VRM/Samples/SimpleViewer/AIUEO.cs.meta b/Assets/VRM/Samples~/SimpleViewer/AIUEO.cs.meta similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/AIUEO.cs.meta rename to Assets/VRM/Samples~/SimpleViewer/AIUEO.cs.meta diff --git a/Assets/VRM/Samples/SimpleViewer/FileDialogForWindows.cs b/Assets/VRM/Samples~/SimpleViewer/FileDialogForWindows.cs similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/FileDialogForWindows.cs rename to Assets/VRM/Samples~/SimpleViewer/FileDialogForWindows.cs diff --git a/Assets/VRM/Samples/SimpleViewer/FileDialogForWindows.cs.meta b/Assets/VRM/Samples~/SimpleViewer/FileDialogForWindows.cs.meta similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/FileDialogForWindows.cs.meta rename to Assets/VRM/Samples~/SimpleViewer/FileDialogForWindows.cs.meta diff --git a/Assets/VRM/Samples/SimpleViewer/RokuroCamera.cs b/Assets/VRM/Samples~/SimpleViewer/RokuroCamera.cs similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/RokuroCamera.cs rename to Assets/VRM/Samples~/SimpleViewer/RokuroCamera.cs diff --git a/Assets/VRM/Samples/SimpleViewer/RokuroCamera.cs.meta b/Assets/VRM/Samples~/SimpleViewer/RokuroCamera.cs.meta similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/RokuroCamera.cs.meta rename to Assets/VRM/Samples~/SimpleViewer/RokuroCamera.cs.meta diff --git a/Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity b/Assets/VRM/Samples~/SimpleViewer/SimpleViewer.unity similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity rename to Assets/VRM/Samples~/SimpleViewer/SimpleViewer.unity diff --git a/Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity.meta b/Assets/VRM/Samples~/SimpleViewer/SimpleViewer.unity.meta similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity.meta rename to Assets/VRM/Samples~/SimpleViewer/SimpleViewer.unity.meta diff --git a/Assets/VRM/Samples/SimpleViewer/TargetMover.cs b/Assets/VRM/Samples~/SimpleViewer/TargetMover.cs similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/TargetMover.cs rename to Assets/VRM/Samples~/SimpleViewer/TargetMover.cs diff --git a/Assets/VRM/Samples/SimpleViewer/TargetMover.cs.meta b/Assets/VRM/Samples~/SimpleViewer/TargetMover.cs.meta similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/TargetMover.cs.meta rename to Assets/VRM/Samples~/SimpleViewer/TargetMover.cs.meta diff --git a/Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef b/Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef rename to Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef diff --git a/Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef.meta b/Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef.meta similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/VRM.Samples.SimpleViewer.asmdef.meta rename to Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef.meta diff --git a/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs b/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/ViewerUI.cs rename to Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs diff --git a/Assets/VRM/Samples/SimpleViewer/ViewerUI.cs.meta b/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs.meta similarity index 100% rename from Assets/VRM/Samples/SimpleViewer/ViewerUI.cs.meta rename to Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs.meta diff --git a/Assets/VRM/Samples/SpringBone.meta b/Assets/VRM/Samples~/SpringBone.meta similarity index 100% rename from Assets/VRM/Samples/SpringBone.meta rename to Assets/VRM/Samples~/SpringBone.meta diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index ef54615ce..5b2a0eb7a 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.86.0", + "version": "0.86.1", "displayName": "VRM", "description": "VRM importer", "unity": "2019.4", @@ -14,29 +14,29 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.86.0", - "com.vrmc.gltf": "0.86.0" + "com.vrmc.vrmshaders": "0.86.1", + "com.vrmc.gltf": "0.86.1" }, "samples": [ { "displayName": "SimpleViewer", "description": "VRM runtime loader sample", - "path": "Samples/SimpleViewer" + "path": "Samples~/SimpleViewer" }, { "displayName": "FirstPersonSample", "description": "First Person layer sample with multi camera", - "path": "Samples/FirstPersonSample" + "path": "Samples~/FirstPersonSample" }, { "displayName": "RuntimeExporterSample", "description": "VRM runtime exporter sample", - "path": "Samples/RuntimeExporterSample" + "path": "Samples~/RuntimeExporterSample" }, { "displayName": "AnimationBridgeSample", "description": "BlendShape animation clip sample", - "path": "Samples/AnimationBridgeSample" + "path": "Samples~/AnimationBridgeSample" } ] } diff --git a/Assets/VRM10/Samples.meta b/Assets/VRM10/Samples.meta deleted file mode 100644 index d046d8335..000000000 --- a/Assets/VRM10/Samples.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c5c0de34a00d309409bfc1d534e2610a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample.meta b/Assets/VRM10/Samples~/VRM10FirstPersonSample.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample.meta rename to Assets/VRM10/Samples~/VRM10FirstPersonSample.meta diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef.meta b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef.meta rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10.Samples.VRM10FirstPersonSample.asmdef.meta diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10CanvasManager.cs b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10CanvasManager.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10CanvasManager.cs rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10CanvasManager.cs diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10CanvasManager.cs.meta b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10CanvasManager.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10CanvasManager.cs.meta rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10CanvasManager.cs.meta diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs.meta b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs.meta rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10FileDialogForWindows.cs.meta diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10FirstPersonSample.unity b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10FirstPersonSample.unity similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10FirstPersonSample.unity rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10FirstPersonSample.unity diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10FirstPersonSample.unity.meta b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10FirstPersonSample.unity.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10FirstPersonSample.unity.meta rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10FirstPersonSample.unity.meta diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10LookTarget.cs b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10LookTarget.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10LookTarget.cs rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10LookTarget.cs diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10LookTarget.cs.meta b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10LookTarget.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10LookTarget.cs.meta rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10LookTarget.cs.meta diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs.meta b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs.meta rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10OffsetOnTransform.cs.meta diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10RuntimeLoader.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10RuntimeLoader.cs diff --git a/Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs.meta b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10RuntimeLoader.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs.meta rename to Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10RuntimeLoader.cs.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer.meta b/Assets/VRM10/Samples~/VRM10Viewer.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer.meta rename to Assets/VRM10/Samples~/VRM10Viewer.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef b/Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef.meta b/Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef.meta rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10AIUEO.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10AIUEO.cs rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10AIUEO.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10AIUEO.cs.meta rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10AutoExpression.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10AutoExpression.cs rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10AutoExpression.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10AutoExpression.cs.meta rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10Blinker.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10Blinker.cs rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10Blinker.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10Blinker.cs.meta rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10FileDialogForWindows.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10FileDialogForWindows.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10FileDialogForWindows.cs rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10FileDialogForWindows.cs diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10FileDialogForWindows.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/VRM10FileDialogForWindows.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10FileDialogForWindows.cs.meta rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10FileDialogForWindows.cs.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10RokuroCamera.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10RokuroCamera.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10RokuroCamera.cs rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10RokuroCamera.cs diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10RokuroCamera.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/VRM10RokuroCamera.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10RokuroCamera.cs.meta rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10RokuroCamera.cs.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10TargetMover.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10TargetMover.cs rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10TargetMover.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10TargetMover.cs.meta rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10TargetMover.cs.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity.meta b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity.meta rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity.meta diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10ViewerUI.cs rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10ViewerUI.cs.meta b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs.meta similarity index 100% rename from Assets/VRM10/Samples/VRM10Viewer/VRM10ViewerUI.cs.meta rename to Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs.meta diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index 89af58945..b7fa960d2 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrm", - "version": "0.86.0", + "version": "0.86.1", "displayName": "VRM-1.0β", "description": "VRM-1.0β importer", "unity": "2019.4", @@ -14,19 +14,19 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.86.0", - "com.vrmc.gltf": "0.86.0" + "com.vrmc.vrmshaders": "0.86.1", + "com.vrmc.gltf": "0.86.1" }, "samples": [ { "displayName": "VRM10Viewer", "description": "VRM10 runtime loader sample", - "path": "Samples/VRM10Viewer" + "path": "Samples~/VRM10Viewer" }, { "displayName": "VRM10FirstPersonSample", "description": "First Person layer sample with multi camera", - "path": "Samples/VRM10FirstPersonSample" + "path": "Samples~/VRM10FirstPersonSample" } ] } diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json index c1bd151d3..12ad5e7ef 100644 --- a/Assets/VRMShaders/package.json +++ b/Assets/VRMShaders/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrmshaders", - "version": "0.86.0", + "version": "0.86.1", "displayName": "VRM Shaders", "description": "VRM Shaders", "unity": "2019.4",