Merge pull request #3458 from davidkline-ms/diagsUpdate

Replace beta 1 diagnostics visualization with a modified VisualProfiler-Unity fork

Author: David Kline

Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scenes/DiagnosticsDemo.unity

@@ -19,40 +19,24 @@ private async void Start()
 
             await new WaitUntil(() => MixedRealityToolkit.DiagnosticsSystem != null);
 
-            // Turn on the diagnostics for this demo.
-            MixedRealityToolkit.DiagnosticsSystem.Visible = true;
+            // Turn on the diagnotic visualizations for this demo.
+            MixedRealityToolkit.DiagnosticsSystem.ShowDiagnostics = true;
         }
 
         /// <summary>
-        /// Shows or hides the diagnostics information display.
+        /// Shows or hides all enabled diagnostics.
         /// </summary>
         public void OnToggleDiagnostics()
         {
-            MixedRealityToolkit.DiagnosticsSystem.Visible = !MixedRealityToolkit.DiagnosticsSystem.Visible;
+            MixedRealityToolkit.DiagnosticsSystem.ShowDiagnostics = !MixedRealityToolkit.DiagnosticsSystem.ShowDiagnostics;
         }
 
         /// <summary>
-        /// Shows or hides the frame rate display.
+        /// Shows or hides the profiler display.
         /// </summary>
-        public void OnToggleFrameRate()
+        public void OnToggleProfiler()
         {
-            MixedRealityToolkit.DiagnosticsSystem.ShowFps = !MixedRealityToolkit.DiagnosticsSystem.ShowFps;
-        }
-
-        /// <summary>
-        /// Shows or hides the memory usage display.
-        /// </summary>
-        public void OnToggleMemory()
-        {
-            MixedRealityToolkit.DiagnosticsSystem.ShowMemory = !MixedRealityToolkit.DiagnosticsSystem.ShowMemory;
-        }
-
-        /// <summary>
-        /// Shows or hides the processor usage display.
-        /// </summary>
-        public void OnToggleProcessor()
-        {
-            MixedRealityToolkit.DiagnosticsSystem.ShowCpu = !MixedRealityToolkit.DiagnosticsSystem.ShowCpu;
+            MixedRealityToolkit.DiagnosticsSystem.ShowProfiler = !MixedRealityToolkit.DiagnosticsSystem.ShowProfiler;
         }
     }
 }

Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scripts/DiagnosticsDemoControls.cs

@@ -4,21 +4,14 @@
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 8c2d00f2d26cc124caed106ffbfe3f06, type: 3}
   m_Name: DefaultMixedRealityDiagnosticsProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
-  visible: 0
-  showCpu: 1
-  handlerType:
-    reference: Microsoft.MixedReality.Toolkit.SDK.DiagnosticsSystem.DiagnosticsHandler,
-      Microsoft.MixedReality.Toolkit.SDK
-  cpuBuffer: 20
-  showFps: 1
-  fpsBuffer: 10
-  showMemory: 1
-  memoryBuffer: 10
+  showDiagnostics: 0
+  showProfiler: 1

Assets/MixedRealityToolkit.SDK/Features/Diagnostics.meta

@@ -3,8 +3,9 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -27,22 +28,9 @@ MonoBehaviour:
       id: 1
       description: Toggle Diagnostics
       axisConstraint: 0
-  - keyword: Toggle Frame Rate
-    keyCode: 102
-    action:
-      id: 2
-      description: Toggle Frame Rate
-      axisConstraint: 0
-  - keyword: Toggle Processor
+  - keyword: Toggle Profiler
     keyCode: 112
     action:
-      id: 3
-      description: Toggle Processsor
-      axisConstraint: 0
-  - keyword: Toggle Memory
-    keyCode: 109
-    action:
-      id: 4
-      description: Toggle Memory
-      axisConstraint: 0
-
+      id: 7
+      description: Grip Press
+      axisConstraint: 3