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

Merge pull request #1616 from ousttrue/version/v0_98_0

Browse Source 
UniVRM-0.98.0
This commit is contained in:
ousttrue
2022-04-19 14:50:22 +09:00
committed by GitHub
parent 87c3bff866 25feb2ed4f
commit 45aab79930
10 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
View File

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

5
Assets/UniGLTF/package.json
View File

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

4
Assets/VRM/Runtime/Format/VRMVersion.cs
View File

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

7
Assets/VRM/package.json
View File

@@ -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": [
{

8
Assets/VRM10/Samples~/VRM10Viewer/VRM10AIUEO.cs
View File

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

8
Assets/VRM10/Samples~/VRM10Viewer/VRM10AutoExpression.cs
View File

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

8
Assets/VRM10/Samples~/VRM10Viewer/VRM10Blinker.cs
View File

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

3
Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
View File

@@ -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);

6
Assets/VRM10/package.json
View File

@@ -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": [
{

5
Assets/VRMShaders/package.json
View File

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