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

Merge pull request #1917 from ousttrue/version/v0_107_0

Browse Source 
UniVRM-0.107.0
This commit is contained in:
ousttrue 2022-11-09 16:34:38 +09:00 committed by GitHub
commit 802d0f67aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 8325 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

@ -4,8 +4,8 @@ namespace UniGLTF
public static partial class UniGLTFVersion
{
public const int MAJOR = 2;
public const int MINOR = 42;
public const int MINOR = 43;
public const int PATCH = 0;
public const string VERSION = "2.42.0";
public const string VERSION = "2.43.0";
}
}

4
Assets/UniGLTF/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
"version": "0.106.0",
"version": "0.107.0",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2019.4",
@ -11,7 +11,7 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.106.0",
"com.vrmc.vrmshaders": "0.107.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 = 106;
public const int MINOR = 107;
public const int PATCH = 0;
public const string VERSION = "0.106.0";
public const string VERSION = "0.107.0";
}
}

8
Assets/VRM/Samples~/SimpleViewer/Motions.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 79cea8265d53aaf47b16fff91ee9a5d6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4136
Assets/VRM/Samples~/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/VRM/Samples~/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7d2617171adc40b41ac50228f101e178
timeCreated: 1546851178
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

6
Assets/VRM/package.json
View File

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

8
Assets/VRM10/Samples~/VRM10Viewer/Motions.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b092f2ba86c6ec247afd37d38108bf03
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4136
Assets/VRM10/Samples~/VRM10Viewer/Motions/vrm10viewer_test_motion.txt Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/VRM10/Samples~/VRM10Viewer/Motions/vrm10viewer_test_motion.txt.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 08df5151e71aed748b13547492fb8b9a
timeCreated: 1546851178
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

3
Assets/VRM10/Samples~/VRM10Viewer/VRM10Viewer.unity
View File

@ -5572,7 +5572,7 @@ MonoBehaviour:
m_src: {fileID: 0}
m_target: {fileID: 802105000}
Root: {fileID: 0}
m_motion: {fileID: 4900000, guid: 7d2617171adc40b41ac50228f101e178, type: 3}
m_motion: {fileID: 4900000, guid: 08df5151e71aed748b13547492fb8b9a, type: 3}
m_texts:
m_textModelTitle: {fileID: 1111491925}
m_textModelVersion: {fileID: 1045380263}
@ -5591,7 +5591,6 @@ MonoBehaviour:
ToggleMotionTPose: {fileID: 1791103380}
ToggleMotionBVH: {fileID: 1311520910}
ToggleMotion: {fileID: 224350194}
m_pose: {fileID: 11400000, guid: 879e332f84a378c4da3b87af13da3e85, type: 2}
--- !u!1 &1791103378
GameObject:
m_ObjectHideFlags: 0

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

@ -168,9 +168,6 @@ namespace UniVRM10.VRM10Viewer
[SerializeField]
UIFields m_ui = default;
[SerializeField]
HumanPoseClip m_pose = default;
private void Reset()
{
var buttons = GameObject.FindObjectsOfType<Button>();
@ -204,9 +201,12 @@ namespace UniVRM10.VRM10Viewer
}
string[] cmds = System.Environment.GetCommandLineArgs();
if (cmds.Length > 1)
for (int i = 1; i < cmds.Length; ++i)
{
LoadModel(cmds[1]);
if (File.Exists(cmds[i]))
{
LoadModel(cmds[i]);
}
}
m_texts.Start();
@ -224,6 +224,8 @@ namespace UniVRM10.VRM10Viewer
context.Load();
m_src = context.Root.GetComponent<Animator>();
m_ui.IsBvhEnabled = true;
// hide box man
context.Root.GetComponent<SkinnedMeshRenderer>().enabled = false;
}
private void Update()

6
Assets/VRM10/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrm",
"version": "0.106.0",
"version": "0.107.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.106.0",
"com.vrmc.gltf": "0.106.0"
"com.vrmc.vrmshaders": "0.107.0",
"com.vrmc.gltf": "0.107.0"
},
"samples": [
{

2
Assets/VRMShaders/package.json
View File

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