Merge pull request #9644 from keveleigh/diagnostics-mrc

Fix some diagnostics panel bugs

Author: keveleigh

Assets/MRTK/Services/DiagnosticsSystem/MixedRealityToolkitVisualProfiler.cs

@@ -16,17 +16,16 @@
 namespace Microsoft.MixedReality.Toolkit.Diagnostics
 {
     /// <summary>
-    /// 
-    /// ABOUT: The VisualProfiler provides a drop in, single file, solution for viewing 
+    /// The VisualProfiler provides a drop in, single file, solution for viewing 
     /// your Windows Mixed Reality Unity application's frame rate and memory usage. Missed 
     /// frames are displayed over time to visually find problem areas. Memory is reported 
     /// as current, peak and max usage in a bar graph. 
-    /// 
-    /// USAGE: To use this profiler simply add this script as a component of any GameObject in 
-    /// your Unity scene. The profiler is initially enabled (toggle-able via the initiallyActive 
-    /// property), but can be toggled via the enabled/disable voice commands keywords.
-    /// 
     /// </summary>
+    /// <remarks>
+    /// <para>To use this profiler simply add this script as a component of any GameObject in 
+    /// your Unity scene. The profiler is initially enabled (toggle-able via the initiallyActive 
+    /// property), but can be toggled via the enabled/disable voice commands keywords.</para>
+    /// </remarks>
     [AddComponentMenu("Scripts/MRTK/Services/MixedRealityToolkitVisualProfiler")]
     public class MixedRealityToolkitVisualProfiler : MonoBehaviour
     {
@@ -58,7 +57,7 @@ public bool IsVisible
 
         private bool ShouldShowProfiler =>
 #if WINDOWS_UWP
-            (appCapture == null || !appCapture.IsCapturingVideo || showProfilerDuringMRC) &&
+            (!appCaptureIsCapturingVideo || showProfilerDuringMRC) &&
 #endif // WINDOWS_UWP
             isVisible;
 
@@ -217,6 +216,7 @@ private struct FrameRateColor
         private Mesh quadMesh;
 
 #if WINDOWS_UWP
+        private bool appCaptureIsCapturingVideo = false;
         private AppCapture appCapture;
 #endif // WINDOWS_UWP
 
@@ -289,11 +289,23 @@ private void Start()
 
 #if WINDOWS_UWP
             appCapture = AppCapture.GetForCurrentView();
+            if (appCapture != null)
+            {
+                appCaptureIsCapturingVideo = appCapture.IsCapturingVideo;
+                appCapture.CapturingChanged += AppCapture_CapturingChanged;
+            }
 #endif // WINDOWS_UWP
         }
 
         private void OnDestroy()
         {
+#if WINDOWS_UWP
+            if (appCapture != null)
+            {
+                appCapture.CapturingChanged -= AppCapture_CapturingChanged;
+            }
+#endif // WINDOWS_UWP
+
             if (window != null)
             {
                 Destroy(window.gameObject);
@@ -437,18 +449,36 @@ private void LateUpdate()
                 }
 
                 // Update visibility state.
-                window.gameObject.SetActive(ShouldShowProfiler);
-                memoryStats.gameObject.SetActive(memoryStatsVisible);
+                if (window.gameObject.activeSelf != ShouldShowProfiler)
+                {
+                    window.gameObject.SetActive(ShouldShowProfiler);
+                }
+
+                if (memoryStats.gameObject.activeSelf != memoryStatsVisible)
+                {
+                    memoryStats.gameObject.SetActive(memoryStatsVisible);
+                }
             }
         }
 
+#if WINDOWS_UWP
+        private void AppCapture_CapturingChanged(AppCapture sender, object args) => appCaptureIsCapturingVideo = sender.IsCapturingVideo;
+        private float previousFieldOfView = -1.0f;
+#endif // WINDOWS_UWP
+
         private static readonly ProfilerMarker CalculateWindowPositionPerfMarker = new ProfilerMarker("[MRTK] MixedRealityToolkitVisualProfiler.CalculateWindowPosition");
 
         private Vector3 CalculateWindowPosition(Transform cameraTransform)
         {
             using (CalculateWindowPositionPerfMarker.Auto())
             {
-                float windowDistance = Mathf.Max(16.0f / CameraCache.Main.fieldOfView, CameraCache.Main.nearClipPlane + 0.25f);
+                float windowDistance =
+#if WINDOWS_UWP
+                    Mathf.Max(16.0f / (appCaptureIsCapturingVideo ? previousFieldOfView : previousFieldOfView = CameraCache.Main.fieldOfView), Mathf.Max(CameraCache.Main.nearClipPlane, 0.5f));
+#else
+                    Mathf.Max(16.0f / CameraCache.Main.fieldOfView, Mathf.Max(CameraCache.Main.nearClipPlane, 0.5f));
+#endif // WINDOWS_UWP
+
                 Vector3 position = cameraTransform.position + (cameraTransform.forward * windowDistance);
                 Vector3 horizontalOffset = cameraTransform.right * windowOffset.x;
                 Vector3 verticalOffset = cameraTransform.up * windowOffset.y;
@@ -632,8 +662,15 @@ private void BuildWindow()
                 }
             }
 
-            window.gameObject.SetActive(ShouldShowProfiler);
-            memoryStats.gameObject.SetActive(memoryStatsVisible);
+            if (window.gameObject.activeSelf != ShouldShowProfiler)
+            {
+                window.gameObject.SetActive(ShouldShowProfiler);
+            }
+
+            if (memoryStats.gameObject.activeSelf != memoryStatsVisible)
+            {
+                memoryStats.gameObject.SetActive(memoryStatsVisible);
+            }
         }
 
         private void BuildFrameRateStrings()