Skip to content

Commit a13e91f

Browse files
author
David Kline
committed
unify editor menus: mixed reality toolkit -> mixed reality
1 parent 6e06145 commit a13e91f

File tree

23 files changed

+36
-36
lines changed

23 files changed

+36
-36
lines changed

Assets/MRTK/Core/Definitions/Devices/MixedRealityControllerMappingProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class MixedRealityControllerMappingProfile : BaseMixedRealityProfile
3535
public MixedRealityControllerMapping[] MixedRealityControllerMappingProfiles => mixedRealityControllerMappings;
3636

3737
#if UNITY_EDITOR
38-
[MenuItem("Mixed Reality Toolkit/Utilities/Update/Controller Mapping Profiles")]
38+
[MenuItem("Mixed Reality/Utilities/Update/Controller Mapping Profiles")]
3939
private static void UpdateAllControllerMappingProfiles()
4040
{
4141
string[] guids = AssetDatabase.FindAssets("t:MixedRealityControllerMappingProfile");

Assets/MRTK/Core/Inspectors/MixedRealityStandardShaderGUI.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -781,9 +781,9 @@ protected static void SetupMaterialWithAlbedo(Material material, MaterialPropert
781781
}
782782

783783
#if UNITY_2019_1_OR_NEWER
784-
[MenuItem("Mixed Reality Toolkit/Utilities/Upgrade MRTK Standard Shader for Universal Render Pipeline")]
784+
[MenuItem("Mixed Reality/Utilities/Upgrade MRTK Standard Shader for Universal Render Pipeline")]
785785
#else
786-
[MenuItem("Mixed Reality Toolkit/Utilities/Upgrade MRTK Standard Shader for Lightweight Render Pipeline")]
786+
[MenuItem("Mixed Reality/Utilities/Upgrade MRTK Standard Shader for Lightweight Render Pipeline")]
787787
#endif
788788
protected static void UpgradeShaderForUniversalRenderPipeline()
789789
{
@@ -840,9 +840,9 @@ protected static void UpgradeShaderForUniversalRenderPipeline()
840840
}
841841

842842
#if UNITY_2019_1_OR_NEWER
843-
[MenuItem("Mixed Reality Toolkit/Utilities/Upgrade MRTK Standard Shader for Universal Render Pipeline", true)]
843+
[MenuItem("Mixed Reality/Utilities/Upgrade MRTK Standard Shader for Universal Render Pipeline", true)]
844844
#else
845-
[MenuItem("Mixed Reality Toolkit/Utilities/Upgrade MRTK Standard Shader for Lightweight Render Pipeline", true)]
845+
[MenuItem("Mixed Reality/Utilities/Upgrade MRTK Standard Shader for Lightweight Render Pipeline", true)]
846846
#endif
847847
protected static bool UpgradeShaderForUniversalRenderPipelineValidate()
848848
{

Assets/MRTK/Core/Inspectors/MixedRealityToolkitInspector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public override void OnInspectorGUI()
6969
}
7070
}
7171

72-
[MenuItem("Mixed Reality Toolkit/Add to Scene and Configure...")]
72+
[MenuItem("Mixed Reality/Add to Scene and Configure...")]
7373
public static void CreateMixedRealityToolkitGameObject()
7474
{
7575
MixedRealityInspectorUtility.AddMixedRealityToolkitToScene();

Assets/MRTK/Core/Inspectors/Setup/MixedRealityProjectConfiguratorWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class MixedRealityProjectConfiguratorWindow : EditorWindow
6161
/// <summary>
6262
/// Show the MRTK Project Configurator utility window or focus if already opened
6363
/// </summary>
64-
[MenuItem("Mixed Reality Toolkit/Utilities/Configure Unity Project", false, 499)]
64+
[MenuItem("Mixed Realityt/Utilities/Configure Unity Project", false, 499)]
6565
public static void ShowWindow()
6666
{
6767
// There should be only one configurator window open as a "pop-up". If already open, then just force focus on our instance

Assets/MRTK/Core/Providers/InputSimulation/Editor/InputSimulationWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public enum ToolMode
8787
private Texture2D iconJumpBack = null;
8888
private Texture2D iconJumpFwd = null;
8989

90-
[MenuItem("Mixed Reality Toolkit/Utilities/Input Simulation")]
90+
[MenuItem("Mixed Reality/Utilities/Input Simulation")]
9191
private static void ShowWindow()
9292
{
9393
InputSimulationWindow window = GetWindow<InputSimulationWindow>();

Assets/MRTK/Providers/LeapMotion/Editor/LeapMotionConfigurationChecker.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ static void UpdateCSC()
398398
/// <summary>
399399
/// Integrate MRTK and the Leap Motion Unity Modules if the Leap Motion Unity Modules are in the project. If they are not in the project, display a pop up window.
400400
/// </summary>
401-
[MenuItem("Mixed Reality Toolkit/Utilities/Leap Motion/Integrate Leap Motion Unity Modules")]
401+
[MenuItem("Mixed Reality/Utilities/Leap Motion/Integrate Leap Motion Unity Modules")]
402402
public static void IntegrateLeapMotionWithMRTK()
403403
{
404404
// Check if leap unity modules are in the project
@@ -419,7 +419,7 @@ public static void IntegrateLeapMotionWithMRTK()
419419
/// <summary>
420420
/// Separate MRTK and the Leap Motion Unity Modules and display a prompt for the user to close unity and delete the assets.
421421
/// </summary>
422-
[MenuItem("Mixed Reality Toolkit/Utilities/Leap Motion/Separate Leap Motion Unity Modules")]
422+
[MenuItem("Mixed Reality/Utilities/Leap Motion/Separate Leap Motion Unity Modules")]
423423
public static void SeparateLeapMotion()
424424
{
425425

@@ -441,7 +441,7 @@ public static void SeparateLeapMotion()
441441
/// <summary>
442442
/// Check the integration status of the Leap Motion Assets and display a message to the user.
443443
/// </summary>
444-
[MenuItem("Mixed Reality Toolkit/Utilities/Leap Motion/Check Integration Status")]
444+
[MenuItem("Mixed Reality/Utilities/Leap Motion/Check Integration Status")]
445445
public static void CheckIntegrationStatus()
446446
{
447447
if (isLeapRecognizedByMRTK)

Assets/MRTK/Providers/UnityAR/Editor/UnityARConfigurationChecker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static class UnityARConfigurationChecker
2424
/// Ensures that the appropriate symbolic constant is defined based on the presence of the AR Foundation package.
2525
/// </summary>
2626
/// <returns>True if the define was added, false otherwise.</returns>
27-
[MenuItem("Mixed Reality Toolkit/Utilities/UnityAR/Update Scripting Defines")]
27+
[MenuItem("Mixed Reality/Utilities/UnityAR/Update Scripting Defines")]
2828
private static bool ReconcileArFoundationDefine()
2929
{
3030
FileInfo[] files = FileUtilities.FindFilesInPackageCache(FileName);

Assets/MRTK/Providers/WindowsMixedReality/Shared/Editor/WindowsMixedRealityConfigurationChecker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static class WindowsMixedRealityConfigurationChecker
1818
/// <summary>
1919
/// Ensures that the appropriate symbolic constant is defined based on the presence of the DotNetWinRT binary.
2020
/// </summary>
21-
[MenuItem("Mixed Reality Toolkit/Utilities/Windows Mixed Reality/Check Configuration")]
21+
[MenuItem("Mixed Reality/Utilities/Windows Mixed Reality/Check Configuration")]
2222
private static void ReconcileDotNetWinRTDefine()
2323
{
2424
FileInfo[] files = FileUtilities.FindFilesInAssets(FileName);

Assets/MRTK/SDK/Editor/Inspectors/UX/Interactable/ButtonConfigHelperInspector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public override void OnInspectorGUI()
9090
{
9191
if (GUILayout.Button("Use migration tool to upgrade buttons"))
9292
{
93-
if (!EditorApplication.ExecuteMenuItem("Mixed Reality Toolkit/Utilities/Migration Window"))
93+
if (!EditorApplication.ExecuteMenuItem("Mixed Reality/Utilities/Migration Window"))
9494
{
9595
EditorUtility.DisplayDialog("Package Required", "You need to install the MRTK tools (Microsoft.MixedRealityToolkit.Unity.Tools) package to use the Migration Tool", "OK");
9696
}

Assets/MRTK/StandardAssets/EditorUtilities/OnLoadUtilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static OnLoadUtilities()
2626
/// <summary>
2727
/// Checks for updated shaders and bypasses the ignore update check.
2828
/// </summary>
29-
[MenuItem("Mixed Reality Toolkit/Utilities/Check for Shader Updates")]
29+
[MenuItem("Mixed Reality/Utilities/Check for Shader Updates")]
3030
private static void CheckForShaderUpdates()
3131
{
3232
EnsureShaders(true);

0 commit comments

Comments
 (0)