Skip to content

Commit 9638d49

Browse files
Forgotten to add a few files for the last commit
1 parent 35c03ea commit 9638d49

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Assets/MixedRealityToolkit-Tests/MixedRealityToolkitTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ private static void InitializeMixedRealityToolkitScene()
324324

325325
// Tests
326326
Assert.IsNotNull(MixedRealityToolkit.Instance);
327-
var configuration = ScriptableObject.CreateInstance<MixedRealityConfigurationProfile>();
327+
var configuration = ScriptableObject.CreateInstance<MixedRealityToolkitConfigurationProfile>();
328328
MixedRealityToolkit.Instance.ActiveProfile = configuration;
329329
Assert.NotNull(MixedRealityToolkit.Instance.ActiveProfile);
330330
}

Assets/MixedRealityToolkit/_Core/Inspectors/MixedRealityToolkitInspector.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public override void OnInspectorGUI()
3030
EditorGUILayout.PropertyField(activeProfile);
3131
bool changed = EditorGUI.EndChangeCheck();
3232
string commandName = Event.current.commandName;
33-
var allConfigProfiles = ScriptableObjectExtensions.GetAllInstances<MixedRealityConfigurationProfile>();
33+
var allConfigProfiles = ScriptableObjectExtensions.GetAllInstances<MixedRealityToolkitConfigurationProfile>();
3434

3535
if (activeProfile.objectReferenceValue == null && currentPickerWindow == -1 && checkChange)
3636
{
3737
if (allConfigProfiles.Length > 1)
3838
{
3939
EditorUtility.DisplayDialog("Attention!", "You must choose a profile for the Mixed Reality Toolkit.", "OK");
4040
currentPickerWindow = GUIUtility.GetControlID(FocusType.Passive);
41-
EditorGUIUtility.ShowObjectPicker<MixedRealityConfigurationProfile>(null, false, string.Empty, currentPickerWindow);
41+
EditorGUIUtility.ShowObjectPicker<MixedRealityToolkitConfigurationProfile>(null, false, string.Empty, currentPickerWindow);
4242
}
4343
else if (allConfigProfiles.Length == 1)
4444
{
@@ -52,7 +52,7 @@ public override void OnInspectorGUI()
5252
if (EditorUtility.DisplayDialog("Attention!", "No profiles were found for the Mixed Reality Toolkit.\n\n" +
5353
"Would you like to create one now?", "OK", "Later"))
5454
{
55-
ScriptableObject profile = CreateInstance(nameof(MixedRealityConfigurationProfile));
55+
ScriptableObject profile = CreateInstance(nameof(MixedRealityToolkitConfigurationProfile));
5656
profile.CreateAsset();
5757
activeProfile.objectReferenceValue = profile;
5858
Selection.activeObject = profile;
@@ -85,7 +85,7 @@ public override void OnInspectorGUI()
8585

8686
if (changed)
8787
{
88-
MixedRealityToolkit.Instance.ResetConfiguration((MixedRealityConfigurationProfile)activeProfile.objectReferenceValue);
88+
MixedRealityToolkit.Instance.ResetConfiguration((MixedRealityToolkitConfigurationProfile)activeProfile.objectReferenceValue);
8989
}
9090
}
9191

Assets/MixedRealityToolkit/_Core/Services/MixedRealityToolkit.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ public static bool HasActiveProfile
5656
/// </summary>
5757
[SerializeField]
5858
[Tooltip("The current active configuration for the Mixed Reality project")]
59-
private MixedRealityConfigurationProfile activeProfile = null;
59+
private MixedRealityToolkitConfigurationProfile activeProfile = null;
6060

6161
/// <summary>
6262
/// The public property of the Active Profile, ensuring events are raised on the change of the configuration
6363
/// </summary>
64-
public MixedRealityConfigurationProfile ActiveProfile
64+
public MixedRealityToolkitConfigurationProfile ActiveProfile
6565
{
6666
get
6767
{
@@ -84,7 +84,7 @@ public MixedRealityConfigurationProfile ActiveProfile
8484
/// When a configuration Profile is replaced with a new configuration, force all services to reset and read the new values
8585
/// </summary>
8686
/// <param name="profile"></param>
87-
public void ResetConfiguration(MixedRealityConfigurationProfile profile)
87+
public void ResetConfiguration(MixedRealityToolkitConfigurationProfile profile)
8888
{
8989
if (activeProfile != null)
9090
{

0 commit comments

Comments
 (0)