Merge pull request #17 from benotter/Bug-Fixes

Hopefully lowered CPU user in while idling
Otter-Co · Jul 30, 2017 · deccd88 · deccd88
2 parents 7d0d7c2 + 63c0260
commit deccd88
Show file tree

Hide file tree

Showing 5 changed files with 703 additions and 636 deletions.
diff --git a/Assets/OVRLay/Scripts/OpenVR/OVR_Handler/OVR_Handler.cs b/Assets/OVRLay/Scripts/OpenVR/OVR_Handler/OVR_Handler.cs
@@ -23,7 +23,10 @@ public bool StartupOpenVR()
         bool result = !ErrorCheck(error);
 
         if(result)
+        {
             GetOpenVRExistingInterfaces();
+            onOpenVRChange.Invoke(true);
+        }
         else
             ShutDownOpenVR(); // GetOpenVRInterfaces();
 

diff --git a/Assets/OVRLay/Scripts/OpenVR/OVR_Handler/OVR_Handler_Events.cs b/Assets/OVRLay/Scripts/OpenVR/OVR_Handler/OVR_Handler_Events.cs
@@ -29,7 +29,9 @@ private void DigestEvent(VREvent_t pEvent)
         EVREventType type = (EVREventType) pEvent.eventType;
         switch(type)
         {
-            case EVREventType.VREvent_QuitAcknowledged:
+            case EVREventType.VREvent_Quit:
+
+                onOpenVRChange(false);
             break;
 
             case EVREventType.VREvent_DashboardActivated:

diff --git a/Assets/OVRLay/Scripts/Unity_SteamVR_Handler.cs b/Assets/OVRLay/Scripts/Unity_SteamVR_Handler.cs
@@ -32,6 +32,17 @@ void Start()
 	{
 		// Will always do a check on start first, then use timer for polling
 		lastSteamVRPollTime = steamVRPollTime + 1f;
+		ovrHandler.onOpenVRChange += OnOpenVRChange;
+	}
+
+	void OnOpenVRChange(bool connected) 
+	{
+		if(!connected)
+		{
+			onSteamVRDisconnect.Invoke();
+			ovrHandler.ShutDownOpenVR();
+		}
+
 	}
 
 	void Update()