Merge pull request #94 from SideQuestVR/dev

2.6.0

Runtime/Scripts/BanterLink/BanterLink.cs

@@ -158,6 +158,18 @@ void ParseRequest(string msg, int id, string full)
             {
                 scene.StopTTS(GetMsgData(msg, APICommands.STOP_TTS), id);
             }
+            else if (msg.StartsWith(APICommands.AI_IMAGE))
+            {
+                scene.AiImage(GetMsgData(msg, APICommands.AI_IMAGE), id);
+            }
+            else if (msg.StartsWith(APICommands.AI_MODEL))
+            {
+                scene.AiModel(GetMsgData(msg, APICommands.AI_MODEL), id);
+            }
+            else if (msg.StartsWith(APICommands.BASE_64_TO_CDN))
+            {
+                scene.Base64ToCDN(GetMsgData(msg, APICommands.BASE_64_TO_CDN), id);
+            }
             else if (msg.StartsWith(APICommands.GRAVITY))
             {
                 scene.Gravity(GetMsgData(msg, APICommands.GRAVITY), id);
@@ -521,9 +533,32 @@ public void OnVoiceStarted()
         {
             Send(APICommands.EVENT + APICommands.VOICE_STARTED + MessageDelimiters.PRIMARY);
         }
-
+        public void OnAiModel(string glb)
+        {
+#if BANTER_VISUAL_SCRIPTING
+            EventBus.Trigger("OnAiModel", new CustomEventArgs("", new object[] { glb }));
+#endif
+            Send(APICommands.EVENT + APICommands.AI_IMAGE_RECV + MessageDelimiters.PRIMARY + glb);
+        }
+        public void OnAiImage(string image)
+        {
+#if BANTER_VISUAL_SCRIPTING
+            EventBus.Trigger("OnAiImage", new CustomEventArgs("", new object[] { image }));
+#endif
+            Send(APICommands.EVENT + APICommands.AI_MODEL_RECV + MessageDelimiters.PRIMARY + image);
+        }
+        public void OnBase64ToCDN(long image)
+        {
+#if BANTER_VISUAL_SCRIPTING
+            EventBus.Trigger("OnBase64CDNLink", new CustomEventArgs("", new object[] { image }));
+#endif
+            Send(APICommands.EVENT + APICommands.BASE_64_TO_CDN_RECV + MessageDelimiters.PRIMARY + image);
+        }
         public void OnTranscription(string message, string id)
         {
+#if BANTER_VISUAL_SCRIPTING
+            EventBus.Trigger("OnSTT", new CustomEventArgs(id, new object[] { message }));
+#endif
             Send(APICommands.EVENT + APICommands.SEND_TRANSCRIPTION + MessageDelimiters.PRIMARY + id + MessageDelimiters.SECONDARY + message);
         }
 
@@ -544,6 +579,9 @@ public void OnUserStateChanged(string data)
 
         public void OnOneShot(string data, string fromId, bool fromAdmin)
         {
+#if BANTER_VISUAL_SCRIPTING
+            EventBus.Trigger("OnOneShot", new CustomEventArgs(fromId, new object[] { data }));
+#endif
             Send(APICommands.EVENT + APICommands.ONE_SHOT_RECIEVED + MessageDelimiters.PRIMARY + fromId + MessageDelimiters.SECONDARY + (fromAdmin ? "1" : "0") + MessageDelimiters.SECONDARY + data);
         }
 

Runtime/Scripts/Models/APICommands.cs

@@ -41,6 +41,9 @@ public class APICommands
     public const string OPEN_PAGE = "!op!";
     public const string START_TTS = "!stts!";
     public const string STOP_TTS = "!otts!";
+    public const string AI_IMAGE = "!aiimg!";
+    public const string AI_MODEL = "!aiglb!";
+    public const string BASE_64_TO_CDN = "!b64cdn!";
     public const string GRAVITY = "!gv!";
     public const string TIME_SCALE = "!ts!";
     public const string PLAYER_SPEED = "!ps!";
@@ -80,6 +83,9 @@ public class APICommands
     public const string MENU_BROWSER_MESSAGE = "mbm!";
     public const string BROWSER_MESSAGE = "bm!";
     public const string SEND_TRANSCRIPTION = "st!";
+    public const string AI_IMAGE_RECV = "aiimg!";
+    public const string AI_MODEL_RECV = "aiglb!";
+    public const string BASE_64_TO_CDN_RECV = "b64cdn!";
     public const string BANTER_VERSION = "bv!";
     public const string SEND_USER = "su!";
     public const string FULL_SPACE_STATE = "fss!";

Runtime/Scripts/Scene/BanterScene.cs

@@ -322,6 +322,22 @@ public void StopTTS(string msg, int reqId)
             UnityMainThreadTaskScheduler.Default.Enqueue(() => events.OnTTsStoped.Invoke(msg));
             link.Send(APICommands.REQUEST_ID + MessageDelimiters.REQUEST_ID + reqId + MessageDelimiters.PRIMARY + APICommands.STOP_TTS);
         }
+        public void AiImage(string msg, int reqId)
+        {
+            UnityMainThreadTaskScheduler.Default.Enqueue(() => events.OnAiImage.Invoke(msg));
+            link.Send(APICommands.REQUEST_ID + MessageDelimiters.REQUEST_ID + reqId + MessageDelimiters.PRIMARY + APICommands.AI_IMAGE);
+        }
+        public void AiModel(string msg, int reqId)
+        {
+            UnityMainThreadTaskScheduler.Default.Enqueue(() => events.OnAiImage.Invoke(msg));
+            link.Send(APICommands.REQUEST_ID + MessageDelimiters.REQUEST_ID + reqId + MessageDelimiters.PRIMARY + APICommands.AI_MODEL);
+        }
+        public void Base64ToCDN(string msg, int reqId)
+        {
+            var parts = msg.Split(MessageDelimiters.PRIMARY);
+            UnityMainThreadTaskScheduler.Default.Enqueue(() => events.OnBase64ToCDN.Invoke(parts[0], parts[1]));
+            link.Send(APICommands.REQUEST_ID + MessageDelimiters.REQUEST_ID + reqId + MessageDelimiters.PRIMARY + APICommands.BASE_64_TO_CDN);
+        }
         public void Gravity(string msg, int reqId)
         {
             var parts = msg.Split(MessageDelimiters.PRIMARY);

Runtime/Scripts/Scene/BanterSceneEvents.cs

@@ -41,6 +41,9 @@ public class BanterSceneEvents
     public UnityEvent<string, string> OnDeepLink = new UnityEvent<string, string>();
     public UnityEvent<bool> OnTTsStarted = new UnityEvent<bool>();
     public UnityEvent<string> OnTTsStoped = new UnityEvent<string>();
+    public UnityEvent<string> OnAiImage = new UnityEvent<string>();
+    public UnityEvent<string> OnAiModel = new UnityEvent<string>();
+    public UnityEvent<string, string> OnBase64ToCDN = new UnityEvent<string, string>();
     public UnityEvent<bool> OnPlayerSpeedChanged = new UnityEvent<bool>();
     public UnityEvent<string> OnMenuBrowserMessage = new UnityEvent<string>();
     public UnityEvent OnSceneReset = new UnityEvent();
@@ -98,6 +101,10 @@ public void RemoveAllListeners()
         OnDeepLink.RemoveAllListeners();
         OnTTsStarted.RemoveAllListeners();
         OnTTsStoped.RemoveAllListeners();
+        OnOneShot.RemoveAllListeners();
+        OnAiImage.RemoveAllListeners();
+        OnAiModel.RemoveAllListeners();
+        OnBase64ToCDN.RemoveAllListeners();
         OnPlayerSpeedChanged.RemoveAllListeners();
         OnMenuBrowserMessage.RemoveAllListeners();
         OnSceneReset.RemoveAllListeners();

Runtime/Scripts/Scene/Components/BanterGLTF.cs

@@ -144,18 +144,21 @@ async void SetupGLTF()
                             }
                         }
                         SetLoadedIfNot();
+                        loadStarted = false;
                     }
                     catch (Exception e)
                     {
                         SetLoadedIfNot(false, e.Message + " - " + url);
                         Destroy(go);
+                        loadStarted = false;
                     }
                 });
             }
             catch (Exception e)
             {
                 Debug.LogError(e + " " + url);
                 SetLoadedIfNot(false, e.Message);
+                loadStarted = false;
             }
         }
         public override void DestroyStuff() { }