Read the default profile and default platforms from the ExtensionServiceAttribute (#3506)

* Allow ability to specify a default profile for extension services

* Improve reliability of path name loading

* Add ability to auto-select the supported platforms when adding a service

* Remove a duplicate cast

* Combine method calls to reduce Linq/reflection calls

Author: keveleigh

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs

@@ -21,7 +21,8 @@ namespace Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality
 {
     [MixedRealityDataProvider(
         typeof(IMixedRealitySpatialAwarenessSystem),
-        SupportedPlatforms.WindowsUniversal)]
+        SupportedPlatforms.WindowsUniversal,
+        "Profiles/DefaultMixedRealitySpatialAwarenessMeshObserverProfile.asset", "MixedRealityToolkit.SDK")]
     public class WindowsMixedRealitySpatialMeshObserver : BaseSpatialObserver, IMixedRealitySpatialAwarenessMeshObserver
     {
         /// <summary>

Assets/MixedRealityToolkit/Attributes/MixedRealityExtensionServiceAttribute.cs

@@ -4,6 +4,7 @@
 using Microsoft.MixedReality.Toolkit.Core.Definitions;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
 using System;
+using System.Linq;
 using UnityEngine;
 
 #if UNITY_EDITOR
@@ -16,7 +17,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Attributes
     /// <summary>
     /// Attribute that defines the properties of a Mixed Reality Toolkit extension service.
     /// </summary>
-    [AttributeUsage(System.AttributeTargets.Class, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
     public class MixedRealityExtensionServiceAttribute : Attribute
     {
         /// <summary>
@@ -27,25 +28,25 @@ public class MixedRealityExtensionServiceAttribute : Attribute
         /// <summary>
         /// The file path to the default profile asset relative to the package folder.
         /// </summary>
-        public virtual string ProfilePath { get; }
+        public virtual string DefaultProfilePath { get; }
 
         /// <summary>
-        /// The package where the asset resides.
+        /// The package where the default profile asset resides.
         /// </summary>
         public virtual string PackageFolder { get; }
 
         /// <summary>
         /// The default profile.
         /// </summary>
-        public virtual BaseMixedRealityProfile Profile
+        public virtual BaseMixedRealityProfile DefaultProfile
         {
             get
             {
 #if UNITY_EDITOR
                 string path;
                 if (EditorProjectUtilities.FindRelativeDirectory(PackageFolder, out path))
                 {
-                    return AssetDatabase.LoadAssetAtPath<BaseMixedRealityProfile>(System.IO.Path.Combine(path, ProfilePath));
+                    return AssetDatabase.LoadAssetAtPath<BaseMixedRealityProfile>(System.IO.Path.Combine(path, DefaultProfilePath));
                 }
 
                 Debug.LogError("Unable to find or load the profile.");
@@ -58,16 +59,24 @@ public virtual BaseMixedRealityProfile Profile
         /// Constructor
         /// </summary>
         /// <param name="runtimePlatforms">The platforms on which the extension service is supported.</param>
-        /// <param name="profilePath">The relative path to the profile asset.</param>
-        /// <param name="packageFolder">The folder to which the path is relative.</param>
+        /// <param name="profilePath">The relative path to the default profile asset.</param>
+        /// <param name="packageFolder">The package folder to which the path is relative.</param>
         public MixedRealityExtensionServiceAttribute(
             SupportedPlatforms runtimePlatforms,
-            string profilePath = "", 
+            string defaultProfilePath = "",
             string packageFolder = "MixedRealityToolkit")
         {
             RuntimePlatforms = runtimePlatforms;
-            ProfilePath = profilePath;
+            DefaultProfilePath = defaultProfilePath;
             PackageFolder = packageFolder;
         }
+
+        /// <summary>
+        /// Convenience function for retrieving the attribute given a certain class type.
+        /// </summary>
+        public static MixedRealityExtensionServiceAttribute Find(Type type)
+        {
+            return type.GetCustomAttributes(typeof(MixedRealityExtensionServiceAttribute), true).FirstOrDefault() as MixedRealityExtensionServiceAttribute;
+        }
     }
 }

Assets/MixedRealityToolkit/Inspectors/Profiles/BaseMixedRealityProfileInspector.cs

@@ -102,7 +102,7 @@ private static bool RenderProfileInternal(SerializedProperty property, GUIConten
                     if (GUILayout.Button(new GUIContent("</>", "Replace with a copy of the default profile."), EditorStyles.miniButton, GUILayout.Width(32f)))
                     {
                         profileToCopy = renderedProfile;
-                        var profileTypeName = property.type.Replace("PPtr<$", string.Empty).Replace(">", string.Empty);
+                        var profileTypeName = property.objectReferenceValue.GetType().Name;
                         Debug.Assert(profileTypeName != null, "No Type Found");
 
                         ScriptableObject instance = CreateInstance(profileTypeName);

Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealityRegisteredServiceProviderProfileInspector.cs

@@ -1,7 +1,9 @@
 // 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.Attributes;
 using Microsoft.MixedReality.Toolkit.Core.Definitions;
+using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.Inspectors.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.Services;
 using UnityEditor;
@@ -95,6 +97,8 @@ private void RenderList(SerializedProperty list)
             GUILayout.EndHorizontal();
             EditorGUILayout.Space();
 
+            bool changed = false;
+
             for (int i = 0; i < list.arraySize; i++)
             {
                 SerializedProperty managerConfig = list.GetArrayElementAtIndex(i);
@@ -113,9 +117,9 @@ private void RenderList(SerializedProperty list)
                 {
                     list.DeleteArrayElementAtIndex(i);
                     serializedObject.ApplyModifiedProperties();
-                    MixedRealityToolkit.Instance.ResetConfiguration(MixedRealityToolkit.Instance.ActiveProfile);
                     EditorGUILayout.EndHorizontal();
                     GUILayout.EndVertical();
+                    changed = true;
                     break;
                 }
 
@@ -124,21 +128,35 @@ private void RenderList(SerializedProperty list)
                 if (configFoldouts[i])
                 {
                     EditorGUI.indentLevel++;
-                    EditorGUI.BeginChangeCheck();
 
+                    EditorGUI.BeginChangeCheck();
                     EditorGUILayout.PropertyField(componentName);
-                    EditorGUILayout.PropertyField(componentType);
-                    EditorGUILayout.PropertyField(priority);
-                    EditorGUILayout.PropertyField(runtimePlatform);
-                    EditorGUILayout.PropertyField(configurationProfile);
+                    changed |= EditorGUI.EndChangeCheck();
 
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUILayout.PropertyField(componentType);
                     if (EditorGUI.EndChangeCheck())
                     {
+                        // Try to assign default configuration profile when type changes.
                         serializedObject.ApplyModifiedProperties();
-                        MixedRealityToolkit.Instance.ResetConfiguration(MixedRealityToolkit.Instance.ActiveProfile);
+                        AssignDefaultConfigurationValues(((MixedRealityRegisteredServiceProvidersProfile)serializedObject.targetObject).Configurations[i].ComponentType, configurationProfile, runtimePlatform);
+                        changed = true;
+
+                        GUILayout.EndVertical();
+                        break;
                     }
 
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUILayout.PropertyField(priority);
+                    EditorGUILayout.PropertyField(runtimePlatform);
+
+                    changed |= EditorGUI.EndChangeCheck();
+
+                    changed |= RenderProfile(configurationProfile);
+
                     EditorGUI.indentLevel--;
+
+                    serializedObject.ApplyModifiedProperties();
                 }
 
                 GUILayout.EndVertical();
@@ -147,6 +165,26 @@ private void RenderList(SerializedProperty list)
 
             GUILayout.EndVertical();
             GUILayout.EndVertical();
+
+            if (changed)
+            {
+                EditorApplication.delayCall += () => MixedRealityToolkit.Instance.ResetConfiguration(MixedRealityToolkit.Instance.ActiveProfile);
+            }
+        }
+
+        private void AssignDefaultConfigurationValues(System.Type componentType, SerializedProperty configurationProfile, SerializedProperty runtimePlatform)
+        {
+            configurationProfile.objectReferenceValue = null;
+            runtimePlatform.intValue = -1;
+
+            if (componentType != null &&
+                MixedRealityExtensionServiceAttribute.Find(componentType) is MixedRealityExtensionServiceAttribute attr)
+            {
+                configurationProfile.objectReferenceValue = attr.DefaultProfile;
+                runtimePlatform.intValue = (int)attr.RuntimePlatforms;
+            }
+
+            serializedObject.ApplyModifiedProperties();
         }
     }
 }

Assets/MixedRealityToolkit/Utilities/Editor/Setup/MixedRealityEditorSettings.cs

@@ -202,7 +202,9 @@ internal static bool FindDirectory(string directoryPathToSearch, string director
 
         private static string MakePathRelativeToProject(string absolutePath)
         {
-            return absolutePath.Replace(Application.dataPath + "\\", "Assets/");
+            return absolutePath.Replace(
+                Application.dataPath + Path.DirectorySeparatorChar,
+                "Assets" + Path.DirectorySeparatorChar);
         }
 
         private static void SetIconTheme()