Merge pull request FAR-Lab#16 from FAR-Lab/ImmersiveDriving

Immersive driving
danjustice2 · Feb 6, 2022 · 2e13a31 · 2e13a31
2 parents 8a466d5 + 8a78c37
commit 2e13a31
Show file tree

Hide file tree

Showing 514 changed files with 69,215 additions and 709 deletions.
diff --git a/.idea/.idea.ImmersiveDriving/.idea/indexLayout.xml b/.idea/.idea.ImmersiveDriving/.idea/indexLayout.xml
diff --git a/.idea/.idea.ImmersiveDriving/.idea/projectSettingsUpdater.xml b/.idea/.idea.ImmersiveDriving/.idea/projectSettingsUpdater.xml
diff --git a/.idea/.idea.ImmersiveDriving/.idea/vcs.xml b/.idea/.idea.ImmersiveDriving/.idea/vcs.xml
diff --git a/.idea/.idea.ImmersiveDriving/.idea/workspace.xml b/.idea/.idea.ImmersiveDriving/.idea/workspace.xml
diff --git a/Assets/ConnectionAndSpawing.cs b/Assets/ConnectionAndSpawing.cs
@@ -14,7 +14,7 @@ public class ConnectionAndSpawing : MonoBehaviour {
     public GameObject PlayerPrefab;
     public GameObject CarPrefab;
     public GameObject VRUIStartPrefab;
-
+    private GameObject[] TrafficLights;
 
     public List<SceneField> IncludedScenes = new List<SceneField>();
     public string WaitingRoomSceneName;
@@ -43,7 +43,7 @@ public class ConnectionAndSpawing : MonoBehaviour {
     enum ParticipantObjectSpawnType {
         MAIN,
         CAR,
-        PEDESTRIAN
+        PEDESTRIAN,
     }
 
 
@@ -268,6 +268,8 @@ private bool _prepareSpawing(ulong clientID, out Pose? tempPose) {
         return success;
     }
 
+
+
     private bool SpawnACar(ulong clientID) {
         ParticipantOrder temp = GetOrder(clientID);
         if (temp == ParticipantOrder.None) return false;
@@ -619,55 +621,100 @@ void Update() {
     }
 
 
-    void OnGUI() {
+    void OnGUI()
+    {
         if (NetworkManager.Singleton == null && !ClientListInitDone) return;
-        if (NetworkManager.Singleton.IsHost || NetworkManager.Singleton.IsServer) {
+        if (NetworkManager.Singleton.IsHost || NetworkManager.Singleton.IsServer)
+        {
             GUI.Label(new Rect(5, 5, 150, 50), "Server: " + ParticipantOrder + " " +
                                                NetworkManager.Singleton.ConnectedClients.Count + " " +
                                                GetParticipantCount() + "  " +
                                                ServerState + "  " + Time.timeScale);
-            if (ServerState == ActionState.WAITINGROOM) {
+            if (ServerState == ActionState.WAITINGROOM)
+            {
                 int y = 50;
-                foreach (SceneField f in IncludedScenes) {
-                    if (GUI.Button(new Rect(5, 5 + y, 150, 25), f.SceneName)) { SwitchToLoading(f.SceneName); }
+                foreach (SceneField f in IncludedScenes)
+                {
+                    if (GUI.Button(new Rect(5, 5 + y, 150, 25), f.SceneName))
+                    {
+                        SwitchToLoading(f.SceneName);
+                    }
 
                     y += 27;
                 }
 
                 y = 50;
                 if (_OrderToClient == null) return;
-                foreach (var p in _OrderToClient.Keys) {
-
-                    if (GUI.Button(new Rect(200, 200 + y, 100, 25), "Calibrate " + p)) {
+                foreach (var p in _OrderToClient.Keys)
+                {
+
+                    if (GUI.Button(new Rect(200, 200 + y, 100, 25), "Calibrate " + p))
+                    {
                         ulong clientID = _OrderToClient[p];
-                        ClientRpcParams clientRpcParams = new ClientRpcParams {
-                            Send = new ClientRpcSendParams {
+                        ClientRpcParams clientRpcParams = new ClientRpcParams
+                        {
+                            Send = new ClientRpcSendParams
+                            {
                                 TargetClientIds = new ulong[] {clientID}
                             }
                         };
-                      
+
                         ClientObjects[clientID][ParticipantObjectSpawnType.MAIN].GetComponent<ParticipantInputCapture>()
                             .CalibrateClientRPC(clientRpcParams);
                     }
+
                     y += 50;
                 }
             }
 
-            else if (ServerState == ActionState.QUESTIONS) {
+            else if (ServerState == ActionState.QUESTIONS)
+            {
                 int y = 50;
-                foreach (ParticipantOrder f in QNFinished.Keys) {
+                foreach (ParticipantOrder f in QNFinished.Keys)
+                {
                     GUI.Label(new Rect(5, 5 + y, 150, 25), f + "  " + QNFinished[f].ToString());
                     y += 27;
                 }
             }
-        }
-        else if (NetworkManager.Singleton.IsClient && !NetworkManager.Singleton.IsHost) {
-            GUI.Label(new Rect(5, 5, 150, 100), "Client: " +
-                                                ParticipantOrder + " " +
-                                                NetworkManager.Singleton.IsConnectedClient);
+            else if (ServerState == ActionState.READY)
+            {
+
+                if (GUI.Button(new Rect(20, 50, 80, 20), "TL to Green"))
+                {
+                    SetTrafficLightsGreen(true);
+                }
+                if (GUI.Button(new Rect(20, 75, 80, 20), "TL to Red"))
+                {
+                    SetTrafficLightsGreen(false);
+                }
+                else if (NetworkManager.Singleton.IsClient && !NetworkManager.Singleton.IsHost)
+                {
+                    GUI.Label(new Rect(5, 5, 150, 100), "Client: " +
+                                                        ParticipantOrder + " " +
+                                                        NetworkManager.Singleton.IsConnectedClient);
+                }
+            }
         }
     }
 
+    private void SetTrafficLightsGreen(bool toGreen)
+    {
+        TrafficLights = GameObject.FindGameObjectsWithTag("TrafficLight");
+
+        foreach (GameObject oneLight in TrafficLights)
+        {
+            if (toGreen)
+            {
+                Debug.Log(oneLight.name + "Go Green");
+                oneLight.GetComponent<TrafficLightGreen>().StartGreenCoroutineClientRpc();
+            }
+            else
+            {
+                Debug.Log(oneLight.name + "Go Red");
+                oneLight.GetComponent<TrafficLightGreen>().StartRedCoroutineClientRpc();
+            }
+        }
+    }
     private Dictionary<ParticipantOrder, bool> QNFinished;
     private bool ClientListInitDone = false;
 
@@ -676,6 +723,7 @@ public void FinishedQuestionair(ulong clientID) {
         QNFinished[po] = true;
     }
 
+
     #region GPSUpdate
 
     private void SetStartingGPSDirections() {

diff --git a/Assets/Logitech SDK/LogitechGArxControlEnginesWrapper.dll.meta b/Assets/Logitech SDK/LogitechGArxControlEnginesWrapper.dll.meta
diff --git a/Assets/Materials/CarMaterials/CarMats/backLeftLamp.mat b/Assets/Materials/CarMaterials/CarMats/backLeftLamp.mat
@@ -73,6 +73,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.15686275, g: 0, b: 0, a: 0.75}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Color: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
diff --git a/Assets/Materials/CarMaterials/CarMats/backRightLamp.mat b/Assets/Materials/CarMaterials/CarMats/backRightLamp.mat
@@ -73,6 +73,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.15686275, g: 0, b: 0, a: 0.75}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Color: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []