Merge pull request #3482 from Microsoft/beta2-stabilization

Beta2 stabilization -> mrtk development

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

@@ -12,7 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.OpenVR
     [MixedRealityController(
         SupportedControllerType.OculusRemote,
         new[] { Handedness.None },
-        "Resources/Textures/OculusRemoteController")]
+        "StandardAssets/Textures/OculusRemoteController")]
     public class OculusRemoteController : GenericOpenVRController
     {
         /// <summary>

Assets/MixedRealityToolkit.Providers/OpenVR/OculusRemoteController.cs

@@ -13,7 +13,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.OpenVR
     [MixedRealityController(
         SupportedControllerType.OculusTouch,
         new[] { Handedness.Left, Handedness.Right },
-        "Resources/Textures/OculusControllersTouch")]
+        "StandardAssets/Textures/OculusControllersTouch")]
     public class OculusTouchController : GenericOpenVRController
     {
         /// <summary>

Assets/MixedRealityToolkit.Providers/OpenVR/OculusTouchController.cs

@@ -13,7 +13,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.OpenVR
     [MixedRealityController(
         SupportedControllerType.ViveWand,
         new[] { Handedness.Left, Handedness.Right },
-        "Resources/Textures/ViveWandController")]
+        "StandardAssets/Textures/ViveWandController")]
     public class ViveWandController : GenericOpenVRController
     {
         /// <summary>

Assets/MixedRealityToolkit.Providers/OpenVR/ViveWandController.cs

@@ -16,7 +16,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.OpenVR
     [MixedRealityController(
         SupportedControllerType.WindowsMixedReality,
         new[] { Handedness.Left, Handedness.Right },
-        "Resources/Textures/MotionController")]
+        "StandardAssets/Textures/MotionController")]
     public class WindowsMixedRealityOpenVRMotionController : GenericOpenVRController
     {
         /// <summary>

Assets/MixedRealityToolkit.Providers/OpenVR/WindowsMixedRealityOpenVRMotionController.cs

@@ -22,7 +22,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality
     [MixedRealityController(
         SupportedControllerType.WindowsMixedReality,
         new[] { Handedness.Left, Handedness.Right, Handedness.None },
-        "Resources/Textures/MotionController")]
+        "StandardAssets/Textures/MotionController")]
     public class WindowsMixedRealityController : BaseController
     {
         /// <summary>