Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-26 12:50:40 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1260 from ousttrue/fix/simple_viewer

Browse Source 
Vrm と　それ以外の glb の処理分岐方法を変更
This commit is contained in:
ousttrue
2021-09-29 14:36:58 +09:00
committed by GitHub
parent 41252a14b3 ccb1e61f5e
commit cbcf574cbb
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
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,17 +425,30 @@ 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)))
try
{
await m_texts.UpdateMetaAsync(loader);
var instance = await loader.LoadAsync();
SetModel(instance);
var vrm = new VRMData(data);
using (var loader = new VRMImporterContext(vrm, materialGenerator: GetVrmMaterialGenerator(m_useUrpMaterial.isOn, vrm.VrmExtension)))
{
await m_texts.UpdateMetaAsync(loader);
var instance = await loader.LoadAsync();
SetModel(instance);
}
}
catch (NotVrm0Exception)
{
// retry
Debug.LogWarning("file extension is vrm. but not vrm ?");
using (var loader = new UniGLTF.ImporterContext(data, materialGenerator: GetGltfMaterialGenerator(m_useUrpMaterial.isOn)))
{
var instance = await loader.LoadAsync();
SetModel(instance);
}
}
}
catch (NotVrm0Exception)
else
{
using (var loader = new UniGLTF.ImporterContext(data, materialGenerator: GetGltfMaterialGenerator(m_useUrpMaterial.isOn)))
{