Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-31 23:42:28 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Vrm と　それ以外の glb の処理分岐方法を変更

Browse Source
This commit is contained in:
ousttrue 2021-09-29 13:47:04 +09:00
parent 586e279296
commit 33e730009c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,7 +312,7 @@ namespace VRM.SimpleViewer
string[] cmds = System.Environment.GetCommandLineArgs();
if (cmds.Length > 1)
{
LoadModelAsync(cmds[1]);
LoadModel(cmds[1]);
}
m_texts.Start();
@ -357,14 +357,22 @@ namespace VRM.SimpleViewer
return;
}
LoadModel(path);
}
void LoadModel(string path)
{
var ext = Path.GetExtension(path).ToLower();
switch (ext)
{
case ".gltf":
case ".glb":
case ".vrm":
case ".zip":
LoadModelAsync(path);
LoadModelAsync(path, false);
break;
case ".vrm":
LoadModelAsync(path, true);
break;
case ".bvh":
@ -397,7 +405,7 @@ namespace VRM.SimpleViewer
}
}
async void LoadModelAsync(string path)
async void LoadModelAsync(string path, bool isVrm)
{
if (!File.Exists(path))
{
@ -417,7 +425,7 @@ namespace VRM.SimpleViewer
return;
}
try
if (isVrm)
{
var vrm = new VRMData(data);
using (var loader = new VRMImporterContext(vrm, materialGenerator: GetVrmMaterialGenerator(m_useUrpMaterial.isOn, vrm.VrmExtension)))
@ -427,7 +435,7 @@ namespace VRM.SimpleViewer
SetModel(instance);
}
}
catch (NotVrm0Exception)
else
{
using (var loader = new UniGLTF.ImporterContext(data, materialGenerator: GetGltfMaterialGenerator(m_useUrpMaterial.isOn)))
{