Merge pull request #18 from OSVR/sceneSwitchBugFix

Updated to OSVR-Unity v0.6.9, fixes bug with scene switching in direc…

Assets/OSVRUnity/src/DisplayController.cs

@@ -121,8 +121,9 @@ void SetupRenderManager()
                     _renderManager = GameObject.FindObjectOfType<OsvrRenderManager>();
                     if (_renderManager == null)
                     {
+                        GameObject renderManagerGameObject = new GameObject("RenderManager");
                         //add a RenderManager component
-                        _renderManager = gameObject.AddComponent<OsvrRenderManager>();
+                        _renderManager = renderManagerGameObject.AddComponent<OsvrRenderManager>();
                     }
 
                     //check to make sure Unity version and Graphics API are supported

Assets/OSVRUnity/src/InterfaceGameObjectBase.cs

@@ -43,7 +43,7 @@ private class PathHolder : MonoBehaviour
             [HideInInspector]
             public string path;
 
-            PathHolder()
+            void Awake()
             {
                 hideFlags = HideFlags.HideAndDontSave;
             }
@@ -108,12 +108,7 @@ protected virtual void Stop()
         }
         #endregion
 
-        #region Event Methods
-        void Awake()
-        {
-            AdvertisePath();
-        }
-
+        #region Event Methods        
         void OnDestroy()
         {
             Stop();

Assets/OSVRUnity/src/OsvrRenderManager.cs

@@ -113,6 +113,56 @@ public struct OSVR_ProjectionMatrix
 
             private bool _linkDebug = false; //causes crash on exit if true, only enable for debugging
 
+            //persistent singleton
+            private static OsvrRenderManager _instance;
+
+            /// <summary>
+            /// Use to access the single instance of this object/script in your game.
+            /// </summary>
+            /// <returns>The instance, or null in case of error</returns>
+            public static OsvrRenderManager instance
+            {
+                get
+                {
+                    if (_instance == null)
+                    {
+                        _instance = GameObject.FindObjectOfType<OsvrRenderManager>();
+                        if (_instance == null)
+                        {
+                            Debug.LogError("[OSVR-Unity] RenderManager not found.");
+                        }
+                        else
+                        {
+                            DontDestroyOnLoad(_instance.gameObject);
+                        }
+                    }
+                    return _instance;
+                }
+            }
+
+            void Awake()
+            {
+                //if an instance of this singleton does not exist, set the instance to this object and make it persist
+                if (_instance == null)
+                {
+                    _instance = this;
+                    DontDestroyOnLoad(this);
+                }
+                else
+                {
+                    //if an instance of this singleton already exists, destroy this one
+                    if (_instance != this)
+                    {
+                        Destroy(this.gameObject);
+                    }
+                }
+            }
+
+            void OnDisable()
+            {
+                ExitRenderManager();
+            }
+
             //Initialize use of RenderManager via CreateRenderManager call
             public int InitRenderManager()
             {

Assets/OSVRUnity/src/VRViewer.cs

@@ -96,10 +96,7 @@ void OnDisable()
 				if (DisplayController != null)
 				{
 					StopCoroutine(_endOfFrameCoroutine);
-					if (DisplayController.UseRenderManager && DisplayController.RenderManager != null)
-					{
-						DisplayController.ExitRenderManager();
-					}
+                    //@todo any cleanup of RenderTextures necessary here?
 				}
             }
 

Assets/Plugins/x86/rendermanager-ver.txt

@@ -1 +1 @@
-v00_06_43-81-gefe48a5
+v00_06_43-93-g3a45de8