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

Merge pull request #1723 from ousttrue/version/v0_101_0

Browse Source 
UniVRM-0.101.0
This commit is contained in:
ousttrue
2022-06-29 13:38:05 +09:00
committed by GitHub
parent efdbef51d7 6aa92e8898
commit af989036f8
8 changed files with 489 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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 = 36;
public const int PATCH = 1;
public const string VERSION = "2.36.1";
public const int MINOR = 37;
public const int PATCH = 0;
public const string VERSION = "2.37.0";
}
}

4
Assets/UniGLTF/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
"version": "0.100.1",
"version": "0.101.0",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2019.4",
@@ -11,6 +11,6 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.100.1"
"com.vrmc.vrmshaders": "0.101.0"
}
}

6
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 = 100;
public const int PATCH = 1;
public const string VERSION = "0.100.1";
public const int MINOR = 101;
public const int PATCH = 0;
public const string VERSION = "0.101.0";
}
}

476
Assets/VRM/Samples~/SimpleViewer/SimpleViewer.unity
View File

File diff suppressed because it is too large Load Diff

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

@@ -34,6 +34,9 @@ namespace VRM.SimpleViewer
[SerializeField]
Toggle m_useAsync = default;
[SerializeField]
Toggle m_loadAnimation = default;
[SerializeField]
Toggle m_useFastSpringBone = default;
#endregion
@@ -386,7 +389,7 @@ namespace VRM.SimpleViewer
{
VrmUtility.MaterialGeneratorCallback materialCallback = (VRM.glTF_VRM_extensions vrm) => GetVrmMaterialGenerator(m_useUrpMaterial.isOn, vrm);
VrmUtility.MetaCallback metaCallback = m_texts.UpdateMeta;
var instance = await VrmUtility.LoadAsync(path, GetIAwaitCaller(m_useAsync.isOn), materialCallback, metaCallback);
var instance = await VrmUtility.LoadAsync(path, GetIAwaitCaller(m_useAsync.isOn), materialCallback, metaCallback, loadAnimation: m_loadAnimation.isOn);
SetModel(instance);
break;
}

6
Assets/VRM/package.json
View File

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

6
Assets/VRM10/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrm",
"version": "0.100.1",
"version": "0.101.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.100.1",
"com.vrmc.gltf": "0.100.1"
"com.vrmc.vrmshaders": "0.101.0",
"com.vrmc.gltf": "0.101.0"
},
"samples": [
{

2
Assets/VRMShaders/package.json
View File

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