Move Assets/VRM.Samples/Resource/Models to Assets/StreamingAssets/VRM.Samples. Add motion data to StreamAssets. Fix pathes for models/motions in VRM.Samples

This commit is contained in:
yutopp
2019-01-07 18:29:58 +09:00
parent 26ebf0083c
commit f74252d83c
12 changed files with 4180 additions and 22 deletions

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: f28857d350eb1b64a807cc2467b75325
guid: b760254d6b095724eb58cfa89bb941ba
folderAsset: yes
timeCreated: 1546848586
timeCreated: 1546852824
licenseType: Pro
DefaultImporter:
userData:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2dd416856c6299848b4b742b3f545ff0
guid: 18f74688af00f3940b9d9d1e04ebd549
folderAsset: yes
timeCreated: 1546848673
licenseType: Pro

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0973e63dcef234243a5236b99ef74124
guid: cbd031af038827a419ee07a7d999598d
timeCreated: 1546848673
licenseType: Pro
DefaultImporter:

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -23,9 +23,9 @@ namespace VRM
[Test]
public void ImportExportTest()
{
var path = UniGLTF.UnityPath.FromUnityPath("Assets/VRM.Samples/Resources/Models/Alicia_vrm-0.40/AliciaSolid_vrm-0.40.vrm");
var path = Application.streamingAssetsPath + "/VRM.Samples/Models/Alicia_vrm-0.40/AliciaSolid_vrm-0.40.vrm";
var context = new VRMImporterContext();
context.ParseGlb(File.ReadAllBytes(path.FullPath));
context.ParseGlb(File.ReadAllBytes(path));
context.Load();
context.ShowMeshes();
context.EnableUpdateWhenOffscreen();
@@ -88,9 +88,9 @@ namespace VRM
[Test]
public void MeshCopyTest()
{
var path = UniGLTF.UnityPath.FromUnityPath("Assets/VRM.Samples/Resources/Models/Alicia_vrm-0.40/AliciaSolid_vrm-0.40.vrm");
var path = Application.streamingAssetsPath + "/VRM.Samples/Models/Alicia_vrm-0.40/AliciaSolid_vrm-0.40.vrm";
var context = new VRMImporterContext();
context.ParseGlb(File.ReadAllBytes(path.FullPath));
context.ParseGlb(File.ReadAllBytes(path));
context.Load();
context.ShowMeshes();
context.EnableUpdateWhenOffscreen();

View File

@@ -1,13 +0,0 @@
#
# This folder contains only VRM files
#
*.BlendShapes
*.BlendShapes.meta
*.Materials
*.Materials.meta
*.Meshes
*.Meshes.meta
*.Textures
*.Textures.meta
*.prefab
*.prefab.meta

View File

@@ -205,7 +205,7 @@ namespace VRM
m_open.onClick.AddListener(OnOpenClicked);
// load initial bvh
LoadMotion(Application.streamingAssetsPath + "/test.txt");
LoadMotion(Application.streamingAssetsPath + "/VRM.Samples/Motions/test.txt");
string[] cmds = System.Environment.GetCommandLineArgs();
if (cmds.Length > 1)