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

Merge pull request #1943 from ousttrue/version/v0_108_0

Browse Source 
UniVRM-0.108.0
This commit is contained in:
ousttrue
2022-12-05 20:35:37 +09:00
committed by GitHub
parent 4c0db08360 92caf36471
commit e16dd2f8c0
10 changed files with 56 additions and 23 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 = 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";
}
}

2
Assets/UniGLTF/Samples~/GltfViewer/OpenFileDialog/OpenFileDialog.cs
View File

@@ -7,7 +7,7 @@ namespace UniGLTF.GltfViewer
#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
}

4
Assets/UniGLTF/package.json
View File

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

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

8
Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
View File

@@ -332,11 +332,11 @@ namespace VRM.SimpleViewer
{
if (useUrp)
{
return new GltfUrpMaterialDescriptorGenerator();
return new UrpGltfMaterialDescriptorGenerator();
}
else
{
return new GltfMaterialDescriptorGenerator();
return new BuiltInGltfMaterialDescriptorGenerator();
}
}
@@ -344,11 +344,11 @@ namespace VRM.SimpleViewer
{
if (useUrp)
{
return new VRM.VRMUrpMaterialDescriptorGenerator(vrm);
return new VRM.UrpVrmMaterialDescriptorGenerator(vrm);
}
else
{
return new VRM.VRMMaterialDescriptorGenerator(vrm);
return new VRM.BuiltInVrmMaterialDescriptorGenerator(vrm);
}
}

6
Assets/VRM/package.json
View File

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

35
Assets/VRM10/Samples~/VRM10Viewer/VRM10Loaded.cs
View File

@@ -126,7 +126,6 @@ namespace UniVRM10.VRM10Viewer
/// <summary>
/// from v0.104
/// </summary>
/// <param name="src"></param>
public void UpdateControlRigImplicit(Animator src)
{
var dst = m_controller.GetComponent<Animator>();
@@ -159,6 +158,40 @@ namespace UniVRM10.VRM10Viewer
}
}
/// <summary>
/// from v0.108
/// </summary>
public void UpdateControlRigImplicit(UniHumanoid.Humanoid src)
{
var dst = m_controller.GetComponent<Animator>();
foreach (HumanBodyBones bone in CachedEnum.GetValues<HumanBodyBones>())
{
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;

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

@@ -297,11 +297,11 @@ namespace UniVRM10.VRM10Viewer
{
if (useUrp)
{
return new Vrm10UrpMaterialDescriptorGenerator();
return new UrpVrm10MaterialDescriptorGenerator();
}
else
{
return new Vrm10MaterialDescriptorGenerator();
return new BuiltInVrm10MaterialDescriptorGenerator();
}
}
@@ -309,11 +309,11 @@ namespace UniVRM10.VRM10Viewer
{
if (useUrp)
{
return new GltfUrpMaterialDescriptorGenerator();
return new UrpGltfMaterialDescriptorGenerator();
}
else
{
return new GltfMaterialDescriptorGenerator();
return new BuiltInGltfMaterialDescriptorGenerator();
}
}

6
Assets/VRM10/package.json
View File

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

2
Assets/VRMShaders/package.json
View File

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