diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
index beaf9d7e28..f37f9c48c4 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 = 43;
+ public const int MINOR = 44;
public const int PATCH = 0;
- public const string VERSION = "2.43.0";
+ public const string VERSION = "2.44.0";
}
}
diff --git a/Assets/UniGLTF/Samples~/GltfViewer/OpenFileDialog/OpenFileDialog.cs b/Assets/UniGLTF/Samples~/GltfViewer/OpenFileDialog/OpenFileDialog.cs
index b8cabcaad0..2da319a5bd 100644
--- a/Assets/UniGLTF/Samples~/GltfViewer/OpenFileDialog/OpenFileDialog.cs
+++ b/Assets/UniGLTF/Samples~/GltfViewer/OpenFileDialog/OpenFileDialog.cs
@@ -7,7 +7,7 @@ public static VRMShaders.PathObject Show(string title, params string[] extension
#if UNITY_STANDALONE_WIN
return VRMShaders.PathObject.FromFullPath(FileDialogForWindows.FileDialog(title, extensions));
#else
- Debug.LogWarning("Non-Windows runtime file dialogs are not yet implemented.");
+ UnityEngine.Debug.LogWarning("Non-Windows runtime file dialogs are not yet implemented.");
return default;
#endif
}
diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json
index 208ba49f40..483fa83b0f 100644
--- a/Assets/UniGLTF/package.json
+++ b/Assets/UniGLTF/package.json
@@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
- "version": "0.107.0",
+ "version": "0.108.0",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2019.4",
@@ -11,7 +11,7 @@
"name": "VRM Consortium"
},
"dependencies": {
- "com.vrmc.vrmshaders": "0.107.0",
+ "com.vrmc.vrmshaders": "0.108.0",
"com.unity.modules.animation": "1.0.0"
},
"samples": [
diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs
index 7f92771ce4..46672f0e73 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 = 107;
+ public const int MINOR = 108;
public const int PATCH = 0;
- public const string VERSION = "0.107.0";
+ public const string VERSION = "0.108.0";
}
}
diff --git a/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs b/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
index 2b6bea54cf..893d31ead6 100644
--- a/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
+++ b/Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
@@ -332,11 +332,11 @@ static IMaterialDescriptorGenerator GetGltfMaterialGenerator(bool useUrp)
{
if (useUrp)
{
- return new GltfUrpMaterialDescriptorGenerator();
+ return new UrpGltfMaterialDescriptorGenerator();
}
else
{
- return new GltfMaterialDescriptorGenerator();
+ return new BuiltInGltfMaterialDescriptorGenerator();
}
}
@@ -344,11 +344,11 @@ static IMaterialDescriptorGenerator GetVrmMaterialGenerator(bool useUrp, VRM.glT
{
if (useUrp)
{
- return new VRM.VRMUrpMaterialDescriptorGenerator(vrm);
+ return new VRM.UrpVrmMaterialDescriptorGenerator(vrm);
}
else
{
- return new VRM.VRMMaterialDescriptorGenerator(vrm);
+ return new VRM.BuiltInVrmMaterialDescriptorGenerator(vrm);
}
}
diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json
index 54c55bc2d4..8b64249e7b 100644
--- a/Assets/VRM/package.json
+++ b/Assets/VRM/package.json
@@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
- "version": "0.107.0",
+ "version": "0.108.0",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2019.4",
@@ -14,8 +14,8 @@
"name": "VRM Consortium"
},
"dependencies": {
- "com.vrmc.vrmshaders": "0.107.0",
- "com.vrmc.gltf": "0.107.0",
+ "com.vrmc.vrmshaders": "0.108.0",
+ "com.vrmc.gltf": "0.108.0",
"com.unity.ugui": "1.0.0"
},
"samples": [
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Loaded.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Loaded.cs
index 05824727fd..861c2e783f 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10Loaded.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10Loaded.cs
@@ -126,7 +126,6 @@ public void UpdateControlRigExplicit(Animator src)
///
/// from v0.104
///
- ///
public void UpdateControlRigImplicit(Animator src)
{
var dst = m_controller.GetComponent();
@@ -159,6 +158,40 @@ public void UpdateControlRigImplicit(Animator src)
}
}
+ ///
+ /// from v0.108
+ ///
+ public void UpdateControlRigImplicit(UniHumanoid.Humanoid src)
+ {
+ var dst = m_controller.GetComponent();
+
+ foreach (HumanBodyBones bone in CachedEnum.GetValues())
+ {
+ if (bone == HumanBodyBones.LastBone)
+ {
+ continue;
+ }
+
+ var boneTransform = dst.GetBoneTransform(bone);
+ if (boneTransform == null)
+ {
+ continue;
+ }
+
+ var bvhBone = src.GetBoneTransform(bone);
+ if (bvhBone != null)
+ {
+ // set normalized pose
+ boneTransform.localRotation = bvhBone.localRotation;
+ if (bone == HumanBodyBones.Hips)
+ {
+ // TODO: hips position scaling ?
+ boneTransform.localPosition = bvhBone.localPosition;
+ }
+ }
+ }
+ }
+
public void TPoseControlRig()
{
var controlRig = m_controller.Runtime.ControlRig;
diff --git a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
index 806270b771..4d8a5d34a4 100644
--- a/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
+++ b/Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
@@ -297,11 +297,11 @@ static IMaterialDescriptorGenerator GetVrmMaterialDescriptorGenerator(bool useUr
{
if (useUrp)
{
- return new Vrm10UrpMaterialDescriptorGenerator();
+ return new UrpVrm10MaterialDescriptorGenerator();
}
else
{
- return new Vrm10MaterialDescriptorGenerator();
+ return new BuiltInVrm10MaterialDescriptorGenerator();
}
}
@@ -309,11 +309,11 @@ static IMaterialDescriptorGenerator GetMaterialDescriptorGenerator(bool useUrp)
{
if (useUrp)
{
- return new GltfUrpMaterialDescriptorGenerator();
+ return new UrpGltfMaterialDescriptorGenerator();
}
else
{
- return new GltfMaterialDescriptorGenerator();
+ return new BuiltInGltfMaterialDescriptorGenerator();
}
}
diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json
index cd7bdd2922..360d5ac0de 100644
--- a/Assets/VRM10/package.json
+++ b/Assets/VRM10/package.json
@@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrm",
- "version": "0.107.0",
+ "version": "0.108.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.107.0",
- "com.vrmc.gltf": "0.107.0"
+ "com.vrmc.vrmshaders": "0.108.0",
+ "com.vrmc.gltf": "0.108.0"
},
"samples": [
{
diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json
index fd898b1153..bcaa46dd57 100644
--- a/Assets/VRMShaders/package.json
+++ b/Assets/VRMShaders/package.json
@@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrmshaders",
- "version": "0.107.0",
+ "version": "0.108.0",
"displayName": "VRM Shaders",
"description": "VRM Shaders",
"unity": "2019.4",