From 25feb2ed4f6b6f359158ff9b6f11d1ce3eec5ab1 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 19 Apr 2022 14:36:25 +0900 Subject: [PATCH] UniVRM-0.98.0 --- Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs | 4 ++-- Assets/UniGLTF/package.json | 5 ++--- Assets/VRM/Runtime/Format/VRMVersion.cs | 4 ++-- Assets/VRM/package.json | 7 +++---- Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs | 8 ++++---- Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs | 8 ++++---- Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs | 8 ++++---- Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs | 3 +++ Assets/VRM10/package.json | 6 +++--- Assets/VRMShaders/package.json | 5 +---- 10 files changed, 28 insertions(+), 30 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index 42e7df43e..c55689984 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 = 33; + public const int MINOR = 34; public const int PATCH = 0; - public const string VERSION = "2.33.0"; + public const string VERSION = "2.34.0"; } } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index 4a4e98223..a8cac3a31 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.gltf", - "version": "0.97.0", + "version": "0.98.0", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2019.4", @@ -11,7 +11,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.97.0", - "com.unity.modules.animation": "1.0.0" + "com.vrmc.vrmshaders": "0.98.0" } } \ No newline at end of file diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs index d2e397d15..a0170a665 100644 --- a/Assets/VRM/Runtime/Format/VRMVersion.cs +++ b/Assets/VRM/Runtime/Format/VRMVersion.cs @@ -4,8 +4,8 @@ namespace VRM public static partial class VRMVersion { public const int MAJOR = 0; - public const int MINOR = 97; + public const int MINOR = 98; public const int PATCH = 0; - public const string VERSION = "0.97.0"; + public const string VERSION = "0.98.0"; } } diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index 8ae8c6a7a..26bd114b6 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.97.0", + "version": "0.98.0", "displayName": "VRM", "description": "VRM importer", "unity": "2019.4", @@ -14,9 +14,8 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.97.0", - "com.vrmc.gltf": "0.97.0", - "com.unity.ugui": "1.0.0" + "com.vrmc.vrmshaders": "0.98.0", + "com.vrmc.gltf": "0.98.0" }, "samples": [ { diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs index b4739145d..95f003ef3 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs @@ -30,17 +30,17 @@ namespace UniVRM10.VRM10Viewer { for (var value = 0.0f; value <= 1.0f; value += velocity) { - Controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), value); + Controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), value); yield return null; } - Controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), 1.0f); + Controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), 1.0f); yield return new WaitForSeconds(wait); for (var value = 1.0f; value >= 0; value -= velocity) { - Controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), value); + Controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), value); yield return null; } - Controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), 0); + Controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), 0); yield return new WaitForSeconds(wait * 2); } diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs index 7a70f4f6c..c798d7d13 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs @@ -33,17 +33,17 @@ namespace UniVRM10.VRM10Viewer { for (var value = 0.0f; value <= 1.0f; value += velocity) { - Controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), value); + Controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), value); yield return null; } - Controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), 1.0f); + Controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), 1.0f); yield return new WaitForSeconds(wait); for (var value = 1.0f; value >= 0; value -= velocity) { - Controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), value); + Controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), value); yield return null; } - Controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), 0); + Controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(preset), 0); yield return new WaitForSeconds(wait * 2); } diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs index b1f51b32d..6e36913ac 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs @@ -72,10 +72,10 @@ namespace UniVRM10.VRM10Viewer break; } - m_controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(ExpressionPreset.blink), value); + m_controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(ExpressionPreset.blink), value); yield return null; } - m_controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(ExpressionPreset.blink), 1.0f); + m_controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(ExpressionPreset.blink), 1.0f); // wait... yield return new WaitForSeconds(ClosingTime); @@ -91,10 +91,10 @@ namespace UniVRM10.VRM10Viewer break; } - m_controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(ExpressionPreset.blink), value); + m_controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(ExpressionPreset.blink), value); yield return null; } - m_controller.Vrm.Expression.SetWeight(ExpressionKey.CreateFromPreset(ExpressionPreset.blink), 0); + m_controller.Runtime.Expression.SetWeight(ExpressionKey.CreateFromPreset(ExpressionPreset.blink), 0); } } diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs index 8a8ca682a..7b56b4676 100644 --- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs +++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs @@ -450,6 +450,9 @@ namespace UniVRM10.VRM10Viewer ct: cancellationToken); if (vrm10Instance != null) { + // test. error にならなければよい + vrm10Instance.Runtime.Expression.SetWeight(ExpressionKey.Aa, 0); + if (cancellationToken.IsCancellationRequested) { UnityObjectDestoyer.DestroyRuntimeOrEditor(vrm10Instance.gameObject); diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index 205dc3953..ea3e9c8ca 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrm", - "version": "0.97.0", + "version": "0.98.0", "displayName": "VRM-1.0β", "description": "VRM-1.0β importer", "unity": "2019.4", @@ -14,8 +14,8 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.97.0", - "com.vrmc.gltf": "0.97.0" + "com.vrmc.vrmshaders": "0.98.0", + "com.vrmc.gltf": "0.98.0" }, "samples": [ { diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json index 53ae9c41f..8e0319c76 100644 --- a/Assets/VRMShaders/package.json +++ b/Assets/VRMShaders/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrmshaders", - "version": "0.97.0", + "version": "0.98.0", "displayName": "VRM Shaders", "description": "VRM Shaders", "unity": "2019.4", @@ -10,8 +10,5 @@ ], "author": { "name": "VRM Consortium" - }, - "dependencies": { - "com.unity.modules.imageconversion": "1.0.0" } }