Merge branch 'development/mediascape' into deployment/mediascape

cwi-dis · Oct 19, 2023 · 303961f · 303961f
2 parents a8c786d + 420c2a2
commit 303961f
Show file tree

Hide file tree

Showing 73 changed files with 2,331 additions and 1,270 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,8 @@ dlls/
 Testbed.sln
 Assembly-CSharp.csproj
 cameraconfig.xml
+cameraconfig.json
+config-user.json
 .collabignore
 *.csproj
 *.sln

diff --git a/Assets/ExternalAssets/VR2G-nativeLibraries b/Assets/ExternalAssets/VR2G-nativeLibraries
diff --git a/Assets/Orchestrator/API/OrchestratorWSManagement/OrchestratorWSManager.cs b/Assets/Orchestrator/API/OrchestratorWSManagement/OrchestratorWSManager.cs
@@ -27,6 +27,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using VRT.Orchestrator.Wrapping;
+using UnityEngine;
 
 /** NOTES:
  * NOTE 1 CommandId:
@@ -94,6 +95,7 @@ public OrchestratorWSManager(string orchestratorUrl, IOrchestratorConnectionList
             this.connectionListener = connectionListener;
             this.messagesListener = messagesListener;
         }
+
         public OrchestratorWSManager(string orchestratorUrl, IOrchestratorConnectionListener connectionListener) : this(orchestratorUrl, connectionListener, null)
         {
         }
@@ -131,6 +133,7 @@ public void SocketConnect(List<OrchestratorMessageReceiver> messagesToManage)
         // Socket.io disconnection
         public void SocketDisconnect()
         {
+            UnityEngine.Debug.Log("OrchestratorWSManager: xxxjack SocketDisconnect()");
             Manager.Close();
         }