Merge pull request #1782 from ousttrue/fix/SimpleViewer_null

add LoadPathAsync
vrm-c · Sep 8, 2022 · faa1dcf · faa1dcf
2 parents b3a0cb3 + 3d13037
commit faa1dcf
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs b/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs
@@ -327,7 +327,7 @@ private void Start()
             string[] cmds = System.Environment.GetCommandLineArgs();
             if (cmds.Length > 1)
             {
-                LoadModelAsync(cmds[1]);
+                LoadPathAsync(cmds[1]);
             }
 
             m_texts.Start();
@@ -391,10 +391,20 @@ void OnOpenClicked()
                 return;
             }
 
-            LoadModelAsync(path);
+            LoadPathAsync(path);
         }
 
-        async void LoadModelAsync(string path, byte[] bytes = null)
+        async void LoadPathAsync(string path)
+        {
+            if (!File.Exists(path))
+            {
+                Debug.LogWarning($"{path} not exists");
+                return;
+            }
+            LoadModelAsync(path, File.ReadAllBytes(path));
+        }
+
+        async void LoadModelAsync(string path, byte[] bytes)
         {
             var size = bytes != null ? bytes.Length : 0;
             Debug.Log($"LoadModelAsync: {path}: {size}bytes");