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

mv VRM10.Samples to VRM10/Samples

Browse Source 
* StreamingAssets 移動
* BVH load 調整
This commit is contained in:
ousttrue
2021-08-18 18:19:14 +09:00
parent cb5a30d683
commit 54d2e967e5
32 changed files with 60 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/StreamingAssets.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 92d2f8e057b4e3f4cb8448a6e1a4c56c
folderAsset: yes
timeCreated: 1546852824
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/StreamingAssets/VRM.Samples.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: e7247936c242c654090a19ff084bcb4d
folderAsset: yes
timeCreated: 1546852824
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/StreamingAssets/VRM.Samples/Motions.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: f1931c9232fa49b47a158ad718088088
folderAsset: yes
timeCreated: 1546852824
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

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

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

9
Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs
View File

@@ -12,7 +12,7 @@ using UnityEditor;
namespace UniHumanoid
{
[Obsolete("use BvhImporterContext")]
public class ImporterContext: BvhImporterContext
public class ImporterContext : BvhImporterContext
{
}
@@ -51,9 +51,14 @@ namespace UniHumanoid
}
public void Parse(string path)
{
Parse(path, File.ReadAllText(Path, Encoding.UTF8));
}
public void Parse(string path, string source)
{
Path = path;
Source = File.ReadAllText(Path, Encoding.UTF8);
Source = source;
Bvh = Bvh.Parse(Source);
}

4
Assets/UniGLTF/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.unigltf",
"version": "2.16.1",
"version": "2.16.0",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2019.4",
@@ -11,6 +11,6 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.80.1"
"com.vrmc.vrmshaders": "0.80.0"
}
}

9
Assets/VRM/Editor/Format/VRMVersionMenu.cs
View File

@@ -150,7 +150,14 @@ namespace VRM
""dependencies"": {{
""com.vrmc.vrmshaders"": ""{1}"",
""com.vrmc.unigltf"": ""{0}""
}}
}},
""samples"": [
{{
""displayName"": ""VRM10Viewer"",
""description"": ""VRM10 runtime loader sample"",
""path"": ""Samples/VRM10Viewer""
}}
]
}}
"),

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

@@ -5,7 +5,7 @@ namespace VRM
{
public const int MAJOR = 0;
public const int MINOR = 80;
public const int PATCH = 1;
public const string VERSION = "0.80.1";
public const int PATCH = 0;
public const string VERSION = "0.80.0";
}
}

1
Assets/VRM/Samples/SimpleViewer/SimpleViewer.unity
View File

@@ -4671,6 +4671,7 @@ MonoBehaviour:
m_target: {fileID: 802105000}
Root: {fileID: 124675793}
m_reset: {fileID: 1923377808}
m_motion: {fileID: 4900000, guid: 7d2617171adc40b41ac50228f101e178, type: 3}
m_texts:
m_textModelTitle: {fileID: 1111491925}
m_textModelVersion: {fileID: 1045380263}

12
Assets/VRM/Samples/SimpleViewer/ViewerUI.cs
View File

@@ -41,6 +41,9 @@ namespace VRM.SimpleViewer
[SerializeField]
Button m_reset = default;
[SerializeField]
TextAsset m_motion;
[Serializable]
class TextFields
{
@@ -219,7 +222,10 @@ namespace VRM.SimpleViewer
m_reset.onClick.AddListener(OnResetClicked);
// load initial bvh
LoadMotion(Application.streamingAssetsPath + "/VRM.Samples/Motions/test.txt");
if (m_motion != null)
{
LoadMotion(m_motion.text);
}
string[] cmds = System.Environment.GetCommandLineArgs();
if (cmds.Length > 1)
@@ -230,10 +236,10 @@ namespace VRM.SimpleViewer
m_texts.Start();
}
private void LoadMotion(string path)
private void LoadMotion(string source)
{
var context = new UniHumanoid.BvhImporterContext();
context.Parse(path);
context.Parse("tmp.bvh", source);
context.Load();
SetMotion(context.Root.GetComponent<HumanPoseTransfer>());
}

0
Assets/StreamingAssets/VRM.Samples/Motions/test.txt → Assets/VRM/Samples/SimpleViewer/test_motion.txt
View File

0
Assets/StreamingAssets/VRM.Samples/Motions/test.txt.meta → Assets/VRM/Samples/SimpleViewer/test_motion.txt.meta
View File

6
Assets/VRM/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
"version": "0.80.1",
"version": "0.80.0",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2019.4",
@@ -14,8 +14,8 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.80.1",
"com.vrmc.unigltf": "2.16.1"
"com.vrmc.vrmshaders": "0.80.0",
"com.vrmc.unigltf": "2.16.0"
},
"samples": [
{

18
Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef
View File

@@ -1,18 +0,0 @@
{
"name": "VRM10.Samples.Runtime",
"references": [
"GUID:8d76e605759c3f64a957d63ef96ada7c",
"GUID:da3e51d19d51a544fa14d43fee843098",
"GUID:e47c917724578cc43b5506c17a27e9a0",
"GUID:b7aa47b240b57de44a4b2021c143c9bf"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": false,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

7
Assets/VRM10.Samples/Runtime/VRM10.Samples.Runtime.asmdef.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 25cb04f3bb4e1844d871da234c1dcc93
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/VRM10.Samples/Scenes.meta
View File

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

0
Assets/VRM10.Samples.meta → Assets/VRM10/Samples.meta
View File

0
Assets/VRM10.Samples/Runtime.meta → Assets/VRM10/Samples/VRM10Viewer.meta
View File

2
Assets/VRM10.Samples/Runtime/AIUEO.cs → Assets/VRM10/Samples/VRM10Viewer/AIUEO.cs
View File

@@ -2,7 +2,7 @@
using UnityEngine;
namespace UniVRM10.Samples
namespace UniVRM10.VRM10Viewer
{
public class AIUEO : MonoBehaviour
{

0
Assets/VRM10.Samples/Runtime/AIUEO.cs.meta → Assets/VRM10/Samples/VRM10Viewer/AIUEO.cs.meta
View File

2
Assets/VRM10.Samples/Runtime/Blinker.cs → Assets/VRM10/Samples/VRM10Viewer/Blinker.cs
View File

@@ -2,7 +2,7 @@
using UnityEngine;
using UnityEngine.Serialization;
namespace UniVRM10.Samples
namespace UniVRM10.VRM10Viewer
{
/// <summary>
/// VRMBlendShapeProxy によるランダムに瞬きするサンプル。

0
Assets/VRM10.Samples/Runtime/Blinker.cs.meta → Assets/VRM10/Samples/VRM10Viewer/Blinker.cs.meta
View File

2
Assets/VRM10.Samples/Runtime/FileDialogForWindows.cs → Assets/VRM10/Samples/VRM10Viewer/FileDialogForWindows.cs
View File

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
#endif
namespace UniVRM10.Samples
namespace UniVRM10.VRM10Viewer
{
public static class FileDialogForWindows
{

0
Assets/VRM10.Samples/Runtime/FileDialogForWindows.cs.meta → Assets/VRM10/Samples/VRM10Viewer/FileDialogForWindows.cs.meta
View File

2
Assets/VRM10.Samples/Runtime/TargetMover.cs → Assets/VRM10/Samples/VRM10Viewer/TargetMover.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
namespace UniVRM10.Samples
namespace UniVRM10.VRM10Viewer
{
public class TargetMover : MonoBehaviour
{

0
Assets/VRM10.Samples/Runtime/TargetMover.cs.meta → Assets/VRM10/Samples/VRM10Viewer/TargetMover.cs.meta
View File

0
Assets/VRM10.Samples/Scenes/VRM10Viewer.unity → Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity
View File

0
Assets/VRM10.Samples/Scenes/VRM10Viewer.unity.meta → Assets/VRM10/Samples/VRM10Viewer/VRM10Viewer.unity.meta
View File

14
Assets/VRM10.Samples/Runtime/ViewerUI.cs → Assets/VRM10/Samples/VRM10Viewer/ViewerUI.cs
View File

@@ -7,7 +7,7 @@ using UnityEngine;
using UnityEngine.UI;
namespace UniVRM10.Samples
namespace UniVRM10.VRM10Viewer
{
public class ViewerUI : MonoBehaviour
{
@@ -34,6 +34,9 @@ namespace UniVRM10.Samples
[SerializeField]
GameObject Root = default;
[SerializeField]
TextAsset m_motion;
[Serializable]
class TextFields
{
@@ -212,7 +215,10 @@ namespace UniVRM10.Samples
m_open.onClick.AddListener(OnOpenClicked);
// load initial bvh
LoadMotion(Application.streamingAssetsPath + "/VRM.Samples/Motions/test.txt");
if (m_motion != null)
{
LoadMotion(m_motion.text);
}
string[] cmds = System.Environment.GetCommandLineArgs();
if (cmds.Length > 1)
@@ -223,10 +229,10 @@ namespace UniVRM10.Samples
m_texts.Start();
}
private void LoadMotion(string path)
private void LoadMotion(string source)
{
var context = new UniHumanoid.BvhImporterContext();
context.Parse(path);
context.Parse("tmp.bvh", source);
context.Load();
SetMotion(context.Root.GetComponent<HumanPoseTransfer>());
}

0
Assets/VRM10.Samples/Runtime/ViewerUI.cs.meta → Assets/VRM10/Samples/VRM10Viewer/ViewerUI.cs.meta
View File

15
Assets/VRM10/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm1",
"version": "0.80.1",
"version": "0.80.0",
"displayName": "VRM-1.0β",
"description": "VRM-1.0β importer",
"unity": "2019.4",
@@ -14,7 +14,14 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.80.1",
"com.vrmc.unigltf": "2.16.1"
}
"com.vrmc.vrmshaders": "0.80.0",
"com.vrmc.unigltf": "2.16.0"
},
"samples": [
{
"displayName": "VRM10Viewer",
"description": "VRM10 runtime loader sample",
"path": "Samples/VRM10Viewer"
}
]
}

2
Assets/VRMShaders/package.json
View File

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