Fix issue if scene camera clear flags are set to Nothing;

mtschoen-unity · mtschoen-unity · commit 668367d67ba2 · 2017-12-07T19:27:53.000-08:00
Fix issue where camera settings copy doesn't happen the first time you launch EXR after a domain reload
diff --git a/Editor/EditingContextManagerEditor.cs b/Editor/EditingContextManagerEditor.cs
@@ -21,7 +21,13 @@ void Awake()
         public override void OnInspectorGUI()
         {
             GUILayout.Label("Available Contexts");
-            EditingContextManager.DoGUI(m_ContextNames, ref m_SelectedContextIndex, () => { m_Settings.defaultContextName = m_ContextNames[m_SelectedContextIndex]; });
+
+            m_SelectedContextIndex = EditorGUILayout.Popup(string.Empty, m_SelectedContextIndex, m_ContextNames);
+            if (GUI.changed)
+            {
+                m_Settings.defaultContextName = m_ContextNames[m_SelectedContextIndex];
+                GUIUtility.ExitGUI();
+            }
 
             EditorGUILayout.Space();
 
diff --git a/Models/Vive/Materials/ViveController.mat b/Models/Vive/Materials/ViveController.mat
@@ -75,7 +75,7 @@ Material:
     - _SpecularHighlights: 1
     - _SrcBlend: 5
     - _UVSec: 0
-    - _ZWrite: 0
+    - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Scripts/Core/Contexts/EditingContextManager.cs b/Scripts/Core/Contexts/EditingContextManager.cs
@@ -22,28 +22,32 @@ sealed class EditingContextManager : MonoBehaviour
 
         const string k_LaunchOnExitPlaymode = "EditingContextManager.LaunchOnExitPlaymode";
 
+        IEditingContext m_CurrentContext;
+
         internal static EditingContextManager s_Instance;
         static InputManager s_InputManager;
         static List<IEditingContext> s_AvailableContexts;
         static EditingContextManagerSettings s_Settings;
         static UnityObject s_DefaultContext;
-        static IEditingContext s_CurrentContext;
 
         string[] m_ContextNames;
         int m_SelectedContextIndex;
 
+        Rect m_EditingContextPopupRect = new Rect(0, 0, 150, 20); // Y and X position will be set based on window size
+
         readonly List<IEditingContext> m_PreviousContexts = new List<IEditingContext>();
 
         internal static IEditingContext defaultContext
         {
             get
             {
-                var context = s_AvailableContexts.Find(c => c.Equals(s_DefaultContext)) ?? s_AvailableContexts.First();
+                var availableContexts = GetAvailableEditingContexts();
+                var context = availableContexts.Find(c => c.Equals(s_DefaultContext)) ?? availableContexts.First();
 
-                var defaultContextName = s_Settings.defaultContextName;
+                var defaultContextName = settings.defaultContextName;
                 if (!string.IsNullOrEmpty(defaultContextName))
                 {
-                    var foundContext = s_AvailableContexts.Find(c => c.name == defaultContextName);
+                    var foundContext = availableContexts.Find(c => c.name == defaultContextName);
                     if (foundContext != null)
                         context = foundContext;
                 }
@@ -52,20 +56,30 @@ internal static IEditingContext defaultContext
             }
             set
             {
-                s_Settings.defaultContextName = value.name;
+                settings.defaultContextName = value.name;
             }
         }
 
         internal IEditingContext currentContext
         {
-            get { return s_CurrentContext; }
+            get { return m_CurrentContext; }
+        }
+
+        static EditingContextManagerSettings settings
+        {
+            get
+            {
+                if (!s_Settings)
+                    s_Settings = LoadUserSettings();
+
+                return s_Settings;
+            }
         }
 
         static EditingContextManager()
         {
             VRView.viewEnabled += OnVRViewEnabled;
             VRView.viewDisabled += OnVRViewDisabled;
-            VRView.cameraSetupStarted += OnCameraSetupStarted;
 
             EditorApplication.update += ReopenOnExitPlaymode;
         }
@@ -82,11 +96,6 @@ static void OnVRViewDisabled()
             ObjectUtils.Destroy(s_InputManager.gameObject);
         }
 
-        public static IEditingContext OnCameraSetupStarted()
-        {
-            return s_CurrentContext;
-        }
-
         [MenuItem("Window/EditorXR %e", false)]
         internal static void ShowEditorVR()
         {
@@ -138,33 +147,31 @@ static void OnPlayModeStateChanged(PlayModeStateChange stateChange)
         void Awake()
         {
             s_DefaultContext = m_DefaultContext;
-        }
-
-        void OnEnable()
-        {
-            s_Settings = LoadUserSettings();
-
-            ISetEditingContextMethods.getAvailableEditingContexts = GetAvailableEditingContexts;
-            ISetEditingContextMethods.getPreviousEditingContexts = GetPreviousEditingContexts;
-            ISetEditingContextMethods.setEditingContext = SetEditingContext;
-            ISetEditingContextMethods.restorePreviousEditingContext = RestorePreviousContext;
 
             var availableContexts = GetAvailableEditingContexts();
             m_ContextNames = availableContexts.Select(c => c.name).ToArray();
 
             if (s_AvailableContexts.Count == 0)
                 throw new Exception("You can't start EditorXR without at least one context. Try re-importing the package or use version control to restore the default context asset");
 
-            SetEditingContext(defaultContext);
-
             if (s_AvailableContexts.Count > 1)
                 VRView.afterOnGUI += OnVRViewGUI;
+        }
+
+        void OnEnable()
+        {
+            ISetEditingContextMethods.getAvailableEditingContexts = GetAvailableEditingContexts;
+            ISetEditingContextMethods.getPreviousEditingContexts = GetPreviousEditingContexts;
+            ISetEditingContextMethods.setEditingContext = SetEditingContext;
+            ISetEditingContextMethods.restorePreviousEditingContext = RestorePreviousContext;
 
             // Force the window to repaint every tick, since we need live updating
             // This also allows scripts with [ExecuteInEditMode] to run
             EditorApplication.update += EditorApplication.QueuePlayerLoopUpdate;
 
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+
+            SetEditingContext(defaultContext);
         }
 
         void OnDisable()
@@ -175,46 +182,35 @@ void OnDisable()
 
             VRView.afterOnGUI -= OnVRViewGUI;
 
-            if (s_CurrentContext != null)
+            if (m_CurrentContext != null)
             {
-                defaultContext = s_CurrentContext;
-                s_CurrentContext.Dispose();
+                defaultContext = m_CurrentContext;
+                m_CurrentContext.Dispose();
             }
 
             s_AvailableContexts = null;
 
+            SetEditingContext(null);
+
             ISetEditingContextMethods.getAvailableEditingContexts = null;
             ISetEditingContextMethods.getPreviousEditingContexts = null;
             ISetEditingContextMethods.setEditingContext = null;
             ISetEditingContextMethods.restorePreviousEditingContext = null;
 
-            SaveUserSettings(s_Settings);
+            SaveUserSettings(settings);
         }
 #endif
 
-        void OnVRViewGUI(EditorWindow window)
+        void OnVRViewGUI(VRView view)
         {
-            var view = (VRView)window;
-            GUILayout.BeginArea(view.guiRect);
-            {
-                GUILayout.FlexibleSpace();
-                GUILayout.BeginHorizontal();
-                {
-                    DoGUI(m_ContextNames, ref m_SelectedContextIndex, () => SetEditingContext(s_AvailableContexts[m_SelectedContextIndex]));
-                    GUILayout.FlexibleSpace();
-                }
-                GUILayout.EndHorizontal();
-            }
-            GUILayout.EndArea();
-        }
+            var position = view.position;
+            m_EditingContextPopupRect.y = position.height - m_EditingContextPopupRect.height;
+            m_EditingContextPopupRect.x = position.width - m_EditingContextPopupRect.width;
 
-        internal static void DoGUI(string[] contextNames, ref int selectedContextIndex, Action callback = null)
-        {
-            selectedContextIndex = EditorGUILayout.Popup(string.Empty, selectedContextIndex, contextNames);
+            m_SelectedContextIndex = EditorGUI.Popup(m_EditingContextPopupRect, string.Empty, m_SelectedContextIndex, m_ContextNames);
             if (GUI.changed)
             {
-                if (callback != null)
-                    callback();
+                SetEditingContext(s_AvailableContexts[m_SelectedContextIndex]);
                 GUIUtility.ExitGUI();
             }
         }
@@ -224,16 +220,16 @@ internal void SetEditingContext(IEditingContext context)
             if (context == null)
                 return;
 
-            if (s_CurrentContext != null)
+            if (m_CurrentContext != null)
             {
-                m_PreviousContexts.Insert(0, s_CurrentContext);
+                m_PreviousContexts.Insert(0, m_CurrentContext);
 
-                if (s_CurrentContext.instanceExists)
-                    s_CurrentContext.Dispose();
+                if (m_CurrentContext.instanceExists)
+                    m_CurrentContext.Dispose();
             }
 
             context.Setup();
-            s_CurrentContext = context;
+            m_CurrentContext = context;
 
             m_SelectedContextIndex = s_AvailableContexts.IndexOf(context);
         }
diff --git a/Scripts/Core/Contexts/EditorVRContext.cs b/Scripts/Core/Contexts/EditorVRContext.cs
@@ -14,14 +14,14 @@ class EditorVRContext : ScriptableObject, IEditingContext
         float m_RenderScale = 1f;
 
         [SerializeField]
-        bool m_CopySceneCameraSettings = true;
+        bool m_CopyExistingCameraSettings = true;
 
         [SerializeField]
         internal List<MonoScript> m_DefaultToolStack;
 
         EditorVR m_Instance;
 
-        public bool copySceneCameraSettings { get { return m_CopySceneCameraSettings; } }
+        public bool copyExistingCameraSettings { get { return m_CopyExistingCameraSettings; } }
 
         public bool instanceExists { get { return m_Instance != null; } }
 
diff --git a/Scripts/Core/VRView.cs b/Scripts/Core/VRView.cs
@@ -59,7 +59,7 @@ public static Camera customPreviewCamera
         bool m_UseCustomPreviewCamera;
 
         Rect m_ToggleDeviceViewRect = new Rect(0, 0, 0, 20); // Width will be set based on window size
-        Rect m_PresentationCameraRect = new Rect(0, 0, 0, 20); // Y position and width will be set based on window size
+        Rect m_PresentationCameraRect = new Rect(0, 0, 160, 20); // Y position and width will be set based on window size
 
         public static Transform cameraRig
         {
@@ -116,10 +116,9 @@ public static Vector3 headCenteredOrigin
 
         public static event Action viewEnabled;
         public static event Action viewDisabled;
-        public static event Action<EditorWindow> beforeOnGUI;
-        public static event Action<EditorWindow> afterOnGUI;
+        public static event Action<VRView> beforeOnGUI;
+        public static event Action<VRView> afterOnGUI;
         public static event Action<bool> hmdStatusChange;
-        public static event Func<IEditingContext> cameraSetupStarted;
 
         public Rect guiRect { get; private set; }
 
@@ -143,9 +142,9 @@ public void OnEnable()
             const float nearClipPlane = 0.01f;
             const float farClipPlane = 1000f;
 
-            var currentEditingContext = cameraSetupStarted != null ? cameraSetupStarted() : null;
             s_ExistingSceneMainCamera = Camera.main;
-            if (currentEditingContext != null && currentEditingContext.copySceneCameraSettings && s_ExistingSceneMainCamera && s_ExistingSceneMainCamera.enabled)
+            // TODO: Copy camera settings when changing contexts
+            if (EditingContextManager.defaultContext.copyExistingCameraSettings && s_ExistingSceneMainCamera && s_ExistingSceneMainCamera.enabled)
             {
                 GameObject cameraGO = EditorUtility.CreateGameObjectWithHideFlags(k_CameraName, HideFlags.HideAndDontSave);
                 m_Camera = ObjectUtils.CopyComponent(s_ExistingSceneMainCamera, cameraGO);
@@ -157,6 +156,9 @@ public void OnEnable()
 
                     m_Camera.nearClipPlane = nearClipPlane;
                 }
+
+                if (m_Camera.clearFlags == CameraClearFlags.Nothing)
+                    m_Camera.clearFlags = CameraClearFlags.SolidColor;
             }
             else
             {
@@ -315,7 +317,6 @@ void OnGUI()
 
             m_ToggleDeviceViewRect.width = width;
             m_PresentationCameraRect.y = height - m_PresentationCameraRect.height;
-            m_PresentationCameraRect.width = width;
 
             if (GUI.Button(m_ToggleDeviceViewRect, "Toggle Device View", EditorStyles.toolbarButton))
                 m_ShowDeviceView = !m_ShowDeviceView;
diff --git a/Scripts/Interfaces/Entity/IEditingContext.cs b/Scripts/Interfaces/Entity/IEditingContext.cs
@@ -17,7 +17,7 @@ public interface IEditingContext
         /// <summary>
         /// Bool denotes that the scene camera's (component) values should be cloned on the XR runtime camera
         /// </summary>
-        bool copySceneCameraSettings { get; }
+        bool copyExistingCameraSettings { get; }
 
         /// <summary>
         /// Bool denotes that the EditorVR instance exists, having already been created in Setup()
