From cb5a30d683a1ce6ea02187aced51bce2aa510dac Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 18 Aug 2021 18:04:18 +0900 Subject: [PATCH] update VersionMenu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * vrm-1 の更新忘れてた * samples 追加 --- .../UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs | 4 +- Assets/UniGLTF/package.json | 6 +-- Assets/VRM/Editor/Format/VRMVersionMenu.cs | 52 +++++++++++++++++-- Assets/VRM/Runtime/Format/VRMVersion.cs | 4 +- Assets/VRM/package.json | 15 ++++-- Assets/VRM10/package.json | 31 +++++++---- Assets/VRMShaders/package.json | 4 +- 7 files changed, 88 insertions(+), 28 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index 69f4401db..60c7ce283 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 = 16; - public const int PATCH = 0; - public const string VERSION = "2.16.0"; + public const int PATCH = 1; + public const string VERSION = "2.16.1"; } } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index c240c2bb7..c173e86cf 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,9 +1,9 @@ { "name": "com.vrmc.unigltf", - "version": "2.16.0", + "version": "2.16.1", "displayName": "UniGLTF", "description": "GLTF importer and exporter", - "unity": "2018.4", + "unity": "2019.4", "keywords": [ "gltf" ], @@ -11,6 +11,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.80.0" + "com.vrmc.vrmshaders": "0.80.1" } } \ No newline at end of file diff --git a/Assets/VRM/Editor/Format/VRMVersionMenu.cs b/Assets/VRM/Editor/Format/VRMVersionMenu.cs index 99b36469b..aa37254fd 100644 --- a/Assets/VRM/Editor/Format/VRMVersionMenu.cs +++ b/Assets/VRM/Editor/Format/VRMVersionMenu.cs @@ -76,7 +76,7 @@ namespace VRM ""version"": ""{1}"", ""displayName"": ""VRM Shaders"", ""description"": ""VRM Shaders"", - ""unity"": ""2018.4"", + ""unity"": ""2019.4"", ""keywords"": [ ""vrm"", ""shader"" @@ -92,7 +92,52 @@ namespace VRM ""version"": ""{1}"", ""displayName"": ""VRM"", ""description"": ""VRM importer"", - ""unity"": ""2018.4"", + ""unity"": ""2019.4"", + ""keywords"": [ + ""vrm"", + ""importer"", + ""avatar"", + ""vr"" + ], + ""author"": {{ + ""name"": ""VRM Consortium"" + }}, + ""dependencies"": {{ + ""com.vrmc.vrmshaders"": ""{1}"", + ""com.vrmc.unigltf"": ""{0}"" + }}, + ""samples"": [ + {{ + ""displayName"": ""SimpleViewer"", + ""description"": ""VRM runtime loader sample"", + ""path"": ""Samples/SimpleViewer"" + }}, + {{ + ""displayName"": ""FirstPersonSample"", + ""description"": ""First Person layer sample with multi camera"", + ""path"": ""Samples/FirstPersonSample"" + }}, + {{ + ""displayName"": ""RuntimeExporterSample"", + ""description"": ""VRM runtime exporter sample"", + ""path"": ""Samples/RuntimeExporterSample"" + }}, + {{ + ""displayName"": ""AnimationBridgeSample"", + ""description"": ""BlendShape animation clip sample"", + ""path"": ""Samples/AnimationBridgeSample"" + }} + ] +}} +"), + + new UpmPackage("VRM1", "Assets/VRM10/package.json", +@"{{ + ""name"": ""com.vrmc.univrm1"", + ""version"": ""{1}"", + ""displayName"": ""VRM-1.0β"", + ""description"": ""VRM-1.0β importer"", + ""unity"": ""2019.4"", ""keywords"": [ ""vrm"", ""importer"", @@ -108,6 +153,7 @@ namespace VRM }} }} "), + }; UpmPackage UniGLTFPackage = new UpmPackage("UniGLTF", "Assets/UniGLTF/package.json", @@ -116,7 +162,7 @@ namespace VRM ""version"": ""{0}"", ""displayName"": ""UniGLTF"", ""description"": ""GLTF importer and exporter"", - ""unity"": ""2018.4"", + ""unity"": ""2019.4"", ""keywords"": [ ""gltf"" ], diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs index f7528e407..138b5f7e9 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 = 80; - public const int PATCH = 0; - public const string VERSION = "0.80.0"; + public const int PATCH = 1; + public const string VERSION = "0.80.1"; } } diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index a7fd4867b..e7a375010 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,9 +1,9 @@ { "name": "com.vrmc.univrm", - "version": "0.80.0", + "version": "0.80.1", "displayName": "VRM", "description": "VRM importer", - "unity": "2018.4", + "unity": "2019.4", "keywords": [ "vrm", "importer", @@ -14,8 +14,8 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.80.0", - "com.vrmc.unigltf": "2.16.0" + "com.vrmc.vrmshaders": "0.80.1", + "com.vrmc.unigltf": "2.16.1" }, "samples": [ { @@ -32,6 +32,11 @@ "displayName": "RuntimeExporterSample", "description": "VRM runtime exporter sample", "path": "Samples/RuntimeExporterSample" + }, + { + "displayName": "AnimationBridgeSample", + "description": "BlendShape animation clip sample", + "path": "Samples/AnimationBridgeSample" } ] -} \ No newline at end of file +} diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index 328a01036..cc91d7a6e 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,11 +1,20 @@ -{ - "name": "com.vrmc.univrm1", - "displayName": "VRM-1.0", - "version": "0.64.0", - "unity": "2019.4", - "description": "vrm unity utility", - "dependencies": { - "com.vrmc.vrmshaders": "0.64.0", - "com.vrmc.unigltf": "2.0.1" - } -} +{ + "name": "com.vrmc.univrm1", + "version": "0.80.1", + "displayName": "VRM-1.0β", + "description": "VRM-1.0β importer", + "unity": "2019.4", + "keywords": [ + "vrm", + "importer", + "avatar", + "vr" + ], + "author": { + "name": "VRM Consortium" + }, + "dependencies": { + "com.vrmc.vrmshaders": "0.80.1", + "com.vrmc.unigltf": "2.16.1" + } +} diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json index 33df161e4..fa34f112c 100644 --- a/Assets/VRMShaders/package.json +++ b/Assets/VRMShaders/package.json @@ -1,9 +1,9 @@ { "name": "com.vrmc.vrmshaders", - "version": "0.80.0", + "version": "0.80.1", "displayName": "VRM Shaders", "description": "VRM Shaders", - "unity": "2018.4", + "unity": "2019.4", "keywords": [ "vrm", "shader"