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

Merge pull request #1792 from ousttrue/version/v0_103_1

Browse Source 
UniVRM-0.103.1
This commit is contained in:
ousttrue 2022-09-13 14:42:21 +09:00 committed by GitHub
commit 05854863f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ namespace UniGLTF
{
public const int MAJOR = 2;
public const int MINOR = 39;
public const int PATCH = 0;
public const string VERSION = "2.39.0";
public const int PATCH = 1;
public const string VERSION = "2.39.1";
}
}

4
Assets/UniGLTF/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
"version": "0.103.0",
"version": "0.103.1",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2019.4",
@ -11,7 +11,7 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.103.0",
"com.vrmc.vrmshaders": "0.103.1",
"com.unity.modules.animation": "1.0.0"
}
}

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

@ -5,7 +5,7 @@ namespace VRM
{
public const int MAJOR = 0;
public const int MINOR = 103;
public const int PATCH = 0;
public const string VERSION = "0.103.0";
public const int PATCH = 1;
public const string VERSION = "0.103.1";
}
}

1
Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef
View File

@ -1,5 +1,6 @@
{
"name": "VRM.Samples.SimpleViewer",
"rootNamespace": "",
"references": [
"GUID:da3e51d19d51a544fa14d43fee843098",
"GUID:b7aa47b240b57de44a4b2021c143c9bf",

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

@ -327,7 +327,7 @@ namespace VRM.SimpleViewer
string[] cmds = System.Environment.GetCommandLineArgs();
if (cmds.Length > 1)
{
LoadModelAsync(cmds[1]);
LoadPathAsync(cmds[1]);
}
m_texts.Start();
@ -391,10 +391,20 @@ namespace VRM.SimpleViewer
return;
}
LoadModelAsync(path);
LoadPathAsync(path);
}
async void LoadModelAsync(string path, byte[] bytes = null)
async void LoadPathAsync(string path)
{
if (!File.Exists(path))
{
Debug.LogWarning($"{path} not exists");
return;
}
LoadModelAsync(path, File.ReadAllBytes(path));
}
async void LoadModelAsync(string path, byte[] bytes)
{
var size = bytes != null ? bytes.Length : 0;
Debug.Log($"LoadModelAsync: {path}: {size}bytes");
@ -406,9 +416,10 @@ namespace VRM.SimpleViewer
case ".glb":
case ".zip":
{
var instance = await GltfUtility.LoadBytesAsync(path, bytes,
var instance = await GltfUtility.LoadAsync(path,
GetIAwaitCaller(m_useAsync.isOn),
GetGltfMaterialGenerator(m_useUrpMaterial.isOn));
SetModel(instance);
break;
}

6
Assets/VRM/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
"version": "0.103.0",
"version": "0.103.1",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2019.4",
@ -14,8 +14,8 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.103.0",
"com.vrmc.gltf": "0.103.0",
"com.vrmc.vrmshaders": "0.103.1",
"com.vrmc.gltf": "0.103.1",
"com.unity.ugui": "1.0.0"
},
"samples": [

4
Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef
View File

@ -1,10 +1,12 @@
{
"name": "VRM10.Samples.VRM10Viewer",
"rootNamespace": "",
"references": [
"GUID:b7aa47b240b57de44a4b2021c143c9bf",
"GUID:da3e51d19d51a544fa14d43fee843098",
"GUID:8d76e605759c3f64a957d63ef96ada7c",
"GUID:e47c917724578cc43b5506c17a27e9a0"
"GUID:e47c917724578cc43b5506c17a27e9a0",
"GUID:1cd941934d098654fa21a13f28346412"
],
"includePlatforms": [],
"excludePlatforms": [],

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

@ -3,6 +3,7 @@ using System.IO;
using System.Linq;
using System.Threading;
using UniGLTF;
using UniGLTF.Utils;
using UniHumanoid;
using UnityEngine;
using UnityEngine.UI;
@ -276,7 +277,7 @@ namespace UniVRM10.VRM10Viewer
{
var controlRig = m_controller.Runtime.ControlRig;
foreach (HumanBodyBones bone in Enum.GetValues(typeof(HumanBodyBones)))
foreach (HumanBodyBones bone in CachedEnum.GetValues<HumanBodyBones>())
{
if (bone == HumanBodyBones.LastBone)
{
@ -300,7 +301,7 @@ namespace UniVRM10.VRM10Viewer
if (bone == HumanBodyBones.Hips)
{
controlRigBone.position = bvhBone.position * controlRig.InitialHipsHeight;
controlRigBone.localPosition = bvhBone.localPosition * controlRig.InitialHipsHeight;
}
}
else

6
Assets/VRM10/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrm",
"version": "0.103.0",
"version": "0.103.1",
"displayName": "VRM-1.0β",
"description": "VRM-1.0β importer",
"unity": "2019.4",
@ -14,8 +14,8 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.103.0",
"com.vrmc.gltf": "0.103.0"
"com.vrmc.vrmshaders": "0.103.1",
"com.vrmc.gltf": "0.103.1"
},
"samples": [
{

2
Assets/VRMShaders/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrmshaders",
"version": "0.103.0",
"version": "0.103.1",
"displayName": "VRM Shaders",
"description": "VRM Shaders",
"unity": "2019.4",