Fixes for ED

Other games too probably. Hopefully this doesn't break anything.
Hotrian · Jul 23, 2016 · 7425dbc · 7425dbc
1 parent 4a3a598
commit 7425dbc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/Assets/HOTK/Example Content/HOTK_TwitchDemoScene.unity b/Assets/HOTK/Example Content/HOTK_TwitchDemoScene.unity
diff --git a/Assets/HOTK/Twitch/TwitchChatTester.cs b/Assets/HOTK/Twitch/TwitchChatTester.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Linq;
 using UnityEngine.UI;
+using Valve.VR;
 using Debug = UnityEngine.Debug;
 
 [RequireComponent(typeof(TwitchIRC), typeof(TextMesh))]
@@ -77,6 +78,7 @@ public void Awake()
     public void Start()
     {
         ClearViewerCountAndChannelName("Disconnected");
+        StartCoroutine("SyncWithSteamVR");
     }
 
     public void ToggleConnect()
@@ -111,9 +113,11 @@ public void ToggleConnect()
                         knownFollowers.Clear();
                         StopCoroutine("UpdateViews");
                         StopCoroutine("UpdateFollowers");
+                        StopCoroutine("SyncWithSteamVR");
                         gettingInitialFollowers = true;
                         StartCoroutine("UpdateViews");
                         StartCoroutine("UpdateFollowers");
+                        StartCoroutine("SyncWithSteamVR");
                     }
                     else AddSystemNotice("Unable to Connect: Enter a Valid Channel Name!", TwitchIRC.NoticeColor.Red);
                 }
@@ -139,6 +143,19 @@ public void ToggleConnect()
         }
     }
 
+    IEnumerator SyncWithSteamVR()
+    {
+        while (Application.isPlaying)
+        {
+            var compositor = OpenVR.Compositor;
+            if (compositor != null)
+            {
+                var trackingSpace = compositor.GetTrackingSpace();
+                SteamVR_Render.instance.trackingSpace = trackingSpace;
+            }
+            yield return new WaitForSeconds(10f);
+        }
+    }
 
     private Dictionary<uint, FollowsData> knownFollowers = new Dictionary<uint, FollowsData>();
     private bool gettingInitialFollowers;

diff --git a/Assets/SteamVR/Scripts/SteamVR_Render.cs b/Assets/SteamVR/Scripts/SteamVR_Render.cs
@@ -165,7 +165,8 @@ private IEnumerator RenderLoop()
 				if (!compositor.CanRenderScene())
 					continue;
 
-				compositor.SetTrackingSpace(trackingSpace);
+                trackingSpace = compositor.GetTrackingSpace();
+                compositor.SetTrackingSpace(trackingSpace);
 
 #if (UNITY_5_3 || UNITY_5_2 || UNITY_5_1 || UNITY_5_0)
                 if (cameras.Length == 0) continue;