Merge pull request #98 from SideQuestVR/dev

2.7.0

.gitignore

@@ -71,3 +71,5 @@ crashlytics-build.properties
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
 /[Aa]ssets/[Ss]treamingAssets/aa/*
 
+# Samples.meta is auto created if Samples~ becomes Samples
+Samples.meta

Runtime/Scripts/Legacy/WorldCanvas.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WorldCanvas : MonoBehaviour
+{
+    void Start()
+    {
+        var canvas = GetComponent<Canvas>();
+        if (canvas != null)
+        {
+            canvas.renderMode = RenderMode.WorldSpace;
+            canvas.worldCamera = Camera.main;
+        }
+    }
+
+}

Runtime/Scripts/Scene/Components/BanterGLTF.cs

@@ -52,6 +52,8 @@ public class BanterGLTF : BanterComponentBase
         [See(initial = "false")] public bool legacyRotate;
         bool loadStarted;
 
+        public bool ModelLoaded { get; private set; }
+
         public override void StartStuff()
         {
             LogLine.Do("Warning: Using BanterGLTF is not recommended for production use. It is slow and not optimized.");
@@ -64,6 +66,7 @@ async void SetupGLTF()
                 return;
             }
             loadStarted = true;
+            ModelLoaded = false;
             try
             {
                 Importer.ImportGLBAsync(await Get.Bytes(url), new ImportSettings(), (go, animations) =>
@@ -144,12 +147,14 @@ async void SetupGLTF()
                             }
                         }
                         SetLoadedIfNot();
+                        ModelLoaded = true;
                         loadStarted = false;
                     }
                     catch (Exception e)
                     {
                         SetLoadedIfNot(false, e.Message + " - " + url);
                         Destroy(go);
+                        ModelLoaded = false;
                         loadStarted = false;
                     }
                 });
@@ -158,6 +163,7 @@ async void SetupGLTF()
             {
                 Debug.LogError(e + " " + url);
                 SetLoadedIfNot(false, e.Message);
+                ModelLoaded = false;
                 loadStarted = false;
             }
         }