Skip to content

Commit db03e84

Browse files
MaxWang-MSMaxWang-MS
committed
Address feedback
1 parent 267a249 commit db03e84

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

‎Assets/MRTK/Core/Inspectors/MixedRealityToolkitHelpLinks.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ public class MixedRealityToolkitHelpLinks : MonoBehaviour
1616
internal const string MRTKAPIRefUrl = "https://docs.microsoft.com/dotnet/api/microsoft.mixedreality.toolkit";
1717

1818
[MenuItem("Mixed Reality/Toolkit/Help/Show Documentation", false)]
19-
public static void ShowDocumentation()
19+
private static void ShowDocumentation()
2020
{
2121
Application.OpenURL(MRTKDocsUrl);
2222
}
2323
[MenuItem("Mixed Reality/Toolkit/Help/Show API Reference", false)]
24-
public static void ShowAPIReference()
24+
private static void ShowAPIReference()
2525
{
2626
Application.OpenURL(MRTKAPIRefUrl);
2727
}
2828
[MenuItem("Mixed Reality/Toolkit/Help/File a bug report", false)]
29-
public static void FileBugReport()
29+
private static void FileBugReport()
3030
{
3131
Application.OpenURL(MRTKIssuePageUrl);
3232
}

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

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class MixedRealityProjectConfiguratorWindow : EditorWindow
3030
private readonly GUIContent IgnoreButtonContent = new GUIContent("Always Skip Setup", "This configurator will not show up again unless manually launched by clicking Mixed Reality (menu bar) -> Toolkit -> Utilities -> Configure Project for MRTK\nor this preference modified under Edit -> Project Settings -> Mixed Reality Toolkit");
3131
private GUIStyle multiLineButtonStyle;
3232

33-
private static ConfigurationStage currentStage
33+
private static ConfigurationStage CurrentStage
3434
{
3535
get => MixedRealityProjectPreferences.ConfiguratorState;
3636
set => MixedRealityProjectPreferences.ConfiguratorState = value;
@@ -71,30 +71,30 @@ private static void ResetNullableBoolState()
7171
}
7272

7373
[MenuItem("Mixed Reality/Toolkit/Utilities/Configure Project for MRTK", false, 499)]
74-
public static void ShowWindowFromMenu()
74+
private static void ShowWindowFromMenu()
7575
{
76-
currentStage = ConfigurationStage.Init;
76+
CurrentStage = ConfigurationStage.Init;
7777
ShowWindow();
7878
}
7979

80-
public static void ShowWindowOnInit(bool switchToConfigurationStage)
80+
internal static void ShowWindowOnInit(bool switchToConfigurationStage)
8181
{
82-
if (!IsOpen && currentStage == ConfigurationStage.Done)
82+
if (!IsOpen && CurrentStage == ConfigurationStage.Done)
8383
{
8484
if (switchToConfigurationStage)
8585
{
86-
currentStage = ConfigurationStage.ProjectConfiguration;
86+
CurrentStage = ConfigurationStage.ProjectConfiguration;
8787
}
8888
else
8989
{
90-
currentStage = ConfigurationStage.Init;
90+
CurrentStage = ConfigurationStage.Init;
9191
}
9292
}
9393

9494
ShowWindow();
9595
}
9696

97-
public static void ShowWindow()
97+
private static void ShowWindow()
9898
{
9999
// There should be only one configurator window open as a "pop-up". If already open, then just force focus on our instance
100100
if (IsOpen)
@@ -113,7 +113,7 @@ public static void ShowWindow()
113113
private void OnGUI()
114114
{
115115
MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo();
116-
if (currentStage != ConfigurationStage.Done)
116+
if (CurrentStage != ConfigurationStage.Done)
117117
{
118118
GUILayout.Label("Welcome to MRTK!", MixedRealityStylesUtility.BoldLargeTitleStyle);
119119
CreateSpace(5);
@@ -129,7 +129,7 @@ private void OnGUI()
129129
};
130130

131131

132-
switch (currentStage)
132+
switch (CurrentStage)
133133
{
134134
case ConfigurationStage.Init:
135135
RenderXRPipelineSelection();
@@ -195,7 +195,7 @@ private void RenderNoPipeline()
195195
if (!XRSettingsUtilities.LegacyXRAvailable)
196196
{
197197
#if UNITY_2020_2_OR_NEWER
198-
currentStage = ConfigurationStage.SelectXRSDKPlugin;
198+
CurrentStage = ConfigurationStage.SelectXRSDKPlugin;
199199
#else
200200
currentStage = ConfigurationStage.InstallBuiltinPlugin;
201201
#endif // UNITY_2020_2_OR_NEWER
@@ -239,7 +239,7 @@ private void RenderNoPipeline()
239239
{
240240
AddUPMPackage("com.unity.xr.management");
241241
}
242-
currentStage = ConfigurationStage.InstallBuiltinPlugin;
242+
CurrentStage = ConfigurationStage.InstallBuiltinPlugin;
243243
Repaint();
244244
}
245245
CreateSpace(15);
@@ -250,7 +250,7 @@ private void RenderNoPipeline()
250250
#endif // !UNITY_2019_3_OR_NEWER
251251

252252
RenderSetupLaterSection(true, () => {
253-
currentStage = ConfigurationStage.ProjectConfiguration;
253+
CurrentStage = ConfigurationStage.ProjectConfiguration;
254254
Repaint();
255255
});
256256
}
@@ -266,7 +266,7 @@ private void RenderLegacyXRPipelineDetected()
266266
{
267267
if (GUILayout.Button("Next"))
268268
{
269-
currentStage = ConfigurationStage.ProjectConfiguration;
269+
CurrentStage = ConfigurationStage.ProjectConfiguration;
270270
Repaint();
271271
}
272272
if (GUILayout.Button("Learn More"))
@@ -288,7 +288,7 @@ private void RenderMicrosoftOpenXRPipelineDetected()
288288
{
289289
if (GUILayout.Button("Next"))
290290
{
291-
currentStage = ConfigurationStage.ProjectConfiguration;
291+
CurrentStage = ConfigurationStage.ProjectConfiguration;
292292
Repaint();
293293
}
294294
if (GUILayout.Button("Learn More"))
@@ -312,12 +312,12 @@ private void RenderOpenXRPipelineDetected()
312312
{
313313
if (GUILayout.Button("Next"))
314314
{
315-
currentStage = ConfigurationStage.ProjectConfiguration;
315+
CurrentStage = ConfigurationStage.ProjectConfiguration;
316316
Repaint();
317317
}
318318
if (GUILayout.Button("Install Microsoft OpenXR plugin..."))
319319
{
320-
currentStage = ConfigurationStage.InstallMSOpenXR;
320+
CurrentStage = ConfigurationStage.InstallMSOpenXR;
321321
Repaint();
322322
}
323323
if (GUILayout.Button("Learn More"))
@@ -340,7 +340,7 @@ private void RenderXRSDKBuiltinPluginPipelineDetected()
340340
{
341341
if (GUILayout.Button("Next"))
342342
{
343-
currentStage = ConfigurationStage.ProjectConfiguration;
343+
CurrentStage = ConfigurationStage.ProjectConfiguration;
344344
Repaint();
345345
}
346346
if (GUILayout.Button("Learn More"))
@@ -355,7 +355,7 @@ private void RenderSelectXRSDKPlugin()
355355
{
356356
if (XRSettingsUtilities.XRSDKEnabled)
357357
{
358-
currentStage = ConfigurationStage.Init;
358+
CurrentStage = ConfigurationStage.Init;
359359
Repaint();
360360
}
361361
EditorGUILayout.LabelField("XR Pipeline Setting - Enabling the XR SDK Pipeline", EditorStyles.boldLabel);
@@ -369,7 +369,7 @@ private void RenderSelectXRSDKPlugin()
369369

370370
#if UNITY_2020_2_OR_NEWER
371371
AddUPMPackage("com.unity.xr.openxr");
372-
currentStage = ConfigurationStage.InstallOpenXR;
372+
CurrentStage = ConfigurationStage.InstallOpenXR;
373373
#endif // UNITY_2020_2_OR_NEWER
374374
Repaint();
375375
}
@@ -383,7 +383,7 @@ private void RenderSelectXRSDKPlugin()
383383
AddUPMPackage("com.unity.xr.management");
384384
}
385385
#endif // UNITY_2019_3_OR_NEWER
386-
currentStage = ConfigurationStage.InstallBuiltinPlugin;
386+
CurrentStage = ConfigurationStage.InstallBuiltinPlugin;
387387
Repaint();
388388
}
389389
CreateSpace(25);
@@ -395,7 +395,7 @@ private void RenderSelectXRSDKPlugin()
395395
}
396396

397397
RenderSetupLaterSection(true, () => {
398-
currentStage = ConfigurationStage.ProjectConfiguration;
398+
CurrentStage = ConfigurationStage.ProjectConfiguration;
399399
Repaint();
400400
});
401401
}
@@ -404,7 +404,7 @@ private void RenderEnableXRSDKBuiltinPlugin()
404404
{
405405
if (XRSettingsUtilities.XRSDKEnabled)
406406
{
407-
currentStage = ConfigurationStage.Init;
407+
CurrentStage = ConfigurationStage.Init;
408408
Repaint();
409409
}
410410
EditorGUILayout.LabelField("XR Pipeline Setting - Enabling the XR SDK Pipeline with built-in Plugins (non-OpenXR)", EditorStyles.boldLabel);
@@ -429,7 +429,7 @@ private void RenderEnableXRSDKBuiltinPlugin()
429429
}
430430
}
431431
RenderSetupLaterSection(true, () => {
432-
currentStage = ConfigurationStage.ProjectConfiguration;
432+
CurrentStage = ConfigurationStage.ProjectConfiguration;
433433
Repaint();
434434
});
435435
}
@@ -438,7 +438,7 @@ private void RenderEnableOpenXRPlugin()
438438
{
439439
if (XRSettingsUtilities.OpenXREnabled)
440440
{
441-
currentStage = ConfigurationStage.Init;
441+
CurrentStage = ConfigurationStage.Init;
442442
Repaint();
443443
}
444444
EditorGUILayout.LabelField("XR Pipeline Setting - Enabling the XR SDK Pipeline with OpenXR", EditorStyles.boldLabel);
@@ -455,7 +455,7 @@ private void RenderEnableOpenXRPlugin()
455455
}
456456

457457
RenderSetupLaterSection(true, () => {
458-
currentStage = ConfigurationStage.ProjectConfiguration;
458+
CurrentStage = ConfigurationStage.ProjectConfiguration;
459459
Repaint();
460460
});
461461
}
@@ -464,7 +464,7 @@ private void RenderEnableMicrosoftOpenXRPlugin()
464464
{
465465
if (XRSettingsUtilities.MicrosoftOpenXREnabled)
466466
{
467-
currentStage = ConfigurationStage.Init;
467+
CurrentStage = ConfigurationStage.Init;
468468
Repaint();
469469
}
470470
EditorGUILayout.LabelField("XR Pipeline Setting - Installing the Microsoft OpenXR plugin", EditorStyles.boldLabel);
@@ -480,7 +480,7 @@ private void RenderEnableMicrosoftOpenXRPlugin()
480480
Application.OpenURL(MSOpenXRPluginUrl);
481481
}
482482
RenderSetupLaterSection(true, () => {
483-
currentStage = ConfigurationStage.ProjectConfiguration;
483+
CurrentStage = ConfigurationStage.ProjectConfiguration;
484484
Repaint();
485485
});
486486
}
@@ -512,7 +512,7 @@ private void RenderConfiguredConfirmation()
512512
CreateSpace(10);
513513
if (GUILayout.Button("Next"))
514514
{
515-
currentStage = ConfigurationStage.ImportTMP;
515+
CurrentStage = ConfigurationStage.ImportTMP;
516516
Repaint();
517517
}
518518
RenderSetupLaterSection();
@@ -535,7 +535,7 @@ private void RenderChoiceDialog()
535535
}
536536

537537
RenderSetupLaterSection(true, () => {
538-
currentStage = ConfigurationStage.ImportTMP;
538+
CurrentStage = ConfigurationStage.ImportTMP;
539539
Repaint();
540540
});
541541
}
@@ -544,7 +544,7 @@ private void RenderImportTMP()
544544
{
545545
if (TMPEssentialsImported())
546546
{
547-
currentStage = ConfigurationStage.ShowExamples;
547+
CurrentStage = ConfigurationStage.ShowExamples;
548548
Repaint();
549549
}
550550
EditorGUILayout.LabelField("Importing TMP Essentials", EditorStyles.boldLabel);
@@ -555,7 +555,7 @@ private void RenderImportTMP()
555555
m_ResourceImporter.OnGUI();
556556
CreateSpace(15);
557557
RenderSetupLaterSection(true, () => {
558-
currentStage = ConfigurationStage.ShowExamples;
558+
CurrentStage = ConfigurationStage.ShowExamples;
559559
Repaint();
560560
});
561561
}
@@ -564,7 +564,7 @@ private void RenderShowUPMExamples()
564564
{
565565
if (!MRTKExamplesPackageImportedViaUPM())
566566
{
567-
currentStage = ConfigurationStage.Done;
567+
CurrentStage = ConfigurationStage.Done;
568568
Repaint();
569569
GUIUtility.ExitGUI();
570570
}
@@ -584,7 +584,7 @@ private void RenderShowUPMExamples()
584584
}
585585
if (GUILayout.Button("Got it, next"))
586586
{
587-
currentStage = ConfigurationStage.Done;
587+
CurrentStage = ConfigurationStage.Done;
588588
Repaint();
589589
}
590590
}

0 commit comments

Comments
 (0)