Merge pull request #2866 from StephenHodgson/vNEXT-Diagnostics

Updated diagnostics

Author: David Kline

Assets/MixedRealityToolkit-SDK/Features/Diagnostics/MixedRealityDiagnosticsManager.cs

@@ -8,7 +8,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.SDK.DiagnosticsSystem
 {
-    public class MixedRealityDiagnosticsManager : MixedRealityEventManager, IMixedRealityDiagnosticsManager
+    public class MixedRealityDiagnosticsManager : MixedRealityEventManager, IMixedRealityDiagnosticsSystem
     {
         #region IMixedRealityManager
         private DiagnosticsEventData eventData;

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityDiagnosticsProfile.asset

@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8c2d00f2d26cc124caed106ffbfe3f06, type: 3}
   m_Name: DefaultMixedRealityDiagnosticsProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   showFps: 1
   showCpu: 1
   showMemory: 1

Assets/MixedRealityToolkit/_Core/Definitions/Diagnostics/MixedRealityDiagnosticsProfile.cs

@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.Diagnostics
     /// Configuration profile settings for setting up diagnostics.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Diagnostics Profile", fileName = "MixedRealityDiagnosticsProfile", order = (int)CreateProfileMenuItemIndices.Diagnostics)]
-    public class MixedRealityDiagnosticsProfile : ScriptableObject
+    public class MixedRealityDiagnosticsProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         [Tooltip("Should show fps?")]

Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs

@@ -217,7 +217,7 @@ public bool IsDiagnosticsSystemEnabled
 
         [SerializeField]
         [Tooltip("Diagnostics System Class to instantiate at runtime.")]
-        [Implements(typeof(IMixedRealityDiagnosticsManager), TypeGrouping.ByNamespaceFlat)]
+        [Implements(typeof(IMixedRealityDiagnosticsSystem), TypeGrouping.ByNamespaceFlat)]
         private SystemType diagnosticsSystemType;
 
         /// <summary>

Assets/MixedRealityToolkit/_Core/EventDatum/Diagnostics/DiagnosticsEventData.cs

@@ -17,7 +17,7 @@ public class DiagnosticsEventData : GenericBaseEventData
         public DiagnosticsEventData(EventSystem eventSystem) : base(eventSystem) { }
 
         public void Initialize(
-            IMixedRealityDiagnosticsManager diagnosticsSystem,
+            IMixedRealityDiagnosticsSystem diagnosticsSystem,
             bool visible,
             bool showCpu,
             bool showFps,

…stics/IMixedRealityDiagnosticsManager.cs …ostics/IMixedRealityDiagnosticsSystem.csAssets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsManager.cs renamed to Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsSystem.cs Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsManager.cs renamed to Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsSystem.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Microsoft.MixedReality.Toolkit.Core.Definitions.Diagnostics;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Events;
 using UnityEngine;
 
@@ -10,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Diagnostics
     /// <summary>
     /// 
     /// </summary>
-    public interface IMixedRealityDiagnosticsManager : IMixedRealityEventSystem, IMixedRealityEventSource
+    public interface IMixedRealityDiagnosticsSystem : IMixedRealityEventSystem, IMixedRealityEventSource
     {
         /// <summary>
         /// Enable / disable the diagnostic display
@@ -25,7 +24,7 @@ public interface IMixedRealityDiagnosticsManager : IMixedRealityEventSystem, IMi
         /// <summary>
         /// Enable / disable fps profiling when the diagnostic panel is visible. 
         /// </summary>
-        bool ShowFps { get; } 
+        bool ShowFps { get; }
 
         /// <summary>
         /// Enable / disable memory profiling when the diagnostic panel is visible. 

…/IMixedRealityDiagnosticsManager.cs.meta …s/IMixedRealityDiagnosticsSystem.cs.metaAssets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsManager.cs.meta renamed to Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsSystem.cs.meta Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsManager.cs.meta renamed to Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsSystem.cs.meta

@@ -208,7 +208,7 @@ private void Initialize()
 
             if (ActiveProfile.IsDiagnosticsSystemEnabled)
             {
-                AddManager(typeof(IMixedRealityDiagnosticsManager), Activator.CreateInstance(ActiveProfile.DiagnosticsSystemSystemType) as IMixedRealityDiagnosticsManager);
+                AddManager(typeof(IMixedRealityDiagnosticsSystem), Activator.CreateInstance(ActiveProfile.DiagnosticsSystemSystemType) as IMixedRealityDiagnosticsSystem);
 
                 if (DiagnosticsSystem == null)
                 {
@@ -914,7 +914,7 @@ private bool IsCoreManagerType(Type type)
             return type == typeof(IMixedRealityInputSystem) ||
                    type == typeof(IMixedRealityTeleportSystem) ||
                    type == typeof(IMixedRealityBoundarySystem) ||
-                   type == typeof(IMixedRealityDiagnosticsManager);
+                   type == typeof(IMixedRealityDiagnosticsSystem);
         }
 
         /// <summary>
@@ -1031,12 +1031,12 @@ private static bool CheckComponentMatch(Type type, string managerName, Tuple<Typ
         /// </summary>
         public static IMixedRealityTeleportSystem TeleportSystem => teleportSystem ?? (teleportSystem = Instance.GetManager<IMixedRealityTeleportSystem>());
 
-        private static IMixedRealityDiagnosticsManager diagnosticsSystem = null;
+        private static IMixedRealityDiagnosticsSystem diagnosticsSystem = null;
 
         /// <summary>
         /// The current Diagnostics System registered with the Mixed Reality Manager.
         /// </summary>
-        public static IMixedRealityDiagnosticsManager DiagnosticsSystem => diagnosticsSystem ?? (diagnosticsSystem = Instance.GetManager<IMixedRealityDiagnosticsManager>());
+        public static IMixedRealityDiagnosticsSystem DiagnosticsSystem => diagnosticsSystem ?? (diagnosticsSystem = Instance.GetManager<IMixedRealityDiagnosticsSystem>());
 
         #endregion Manager Accessors
     }