Merge branch 'mrtk3' into new_hand_menu

microsoft · Dec 28, 2022 · 30959cf · 30959cf
2 parents 658de76 + 1405fd9
commit 30959cf
Show file tree

Hide file tree

Showing 88 changed files with 741 additions and 1,028 deletions.
diff --git a/Pipelines/Templates/tests.yaml b/Pipelines/Templates/tests.yaml
@@ -1,90 +1,123 @@
 # Copyright (c) Microsoft Corporation.
- #Licensed under the MIT License.
+# Licensed under the MIT License.
 
 # [Template] Run MRTK tests.
 
 parameters:
-- name: UnityVersion
-  type: string
-  default: ''
-
-- name: BuildTarget
-  type: string
-  values:
-    - StandaloneWindows64
-    - WSAPlayer
-    - Android
-  default: StandaloneWindows64
-    
-- name: PathToProject
-  type: string
-
-- name: AdditionalArguments
-  type: string
-  default: ''
+  - name: UnityVersion
+    type: string
+    default: ""
+
+  - name: BuildTarget
+    type: string
+    values:
+      - StandaloneWindows64
+      - WSAPlayer
+      - Android
+    default: StandaloneWindows64
+
+  - name: PathToProject
+    type: string
+
+  - name: AdditionalArguments
+    type: string
+    default: ""
 
 steps:
-# No edit mode tests (yet!)
-# - pwsh: |
-    # Write-Host "======================= EditMode Tests ======================="
-
-    # $logFile = Join-Path $(Build.ArtifactStagingDirectory) "editmode-test-run.log"
-    # New-Item -Path $logFile -ItemType File -Force
-
-    # $resultFile = Join-Path $(Build.ArtifactStagingDirectory) "test-results-editmode.xml"
-    # New-Item -Path $resultFile -ItemType File -Force
-
-    # if ("${{ parameters.UnityVersion }}" -eq "Latest") {
-    #   $proc = Start-UnityEditor -Project "${{ parameters.PathToProject }}" -Latest -RunTests -TestPlatform EditMode -BuildTarget ${{ parameters.BuildTarget }} -BatchMode -Quit -PassThru -LogFile $logFile -EditorTestsResultFile $resultFile -AdditionalArguments "${{ parameters.AdditionalArguments }}"
-    # }
-    # else {
-    #   $proc = Start-UnityEditor -Project "${{ parameters.PathToProject }}" -Version ${{ parameters.UnityVersion }} -RunTests -TestPlatform PlayMode -BuildTarget ${{ parameters.BuildTarget }} -BatchMode -Quit -PassThru -LogFile $logFile -EditorTestsResultFile ".\test-editmode-default.xml" -AdditionalArguments "${{ parameters.AdditionalArguments }}"
-    # }
-
-    # $ljob = Start-Job -ScriptBlock { param($log) Get-Content "$log" -Wait } -ArgumentList $logFile
-
-    # while (-not $proc.HasExited -and $ljob.HasMoreData)
-    # {
-    #     Receive-Job $ljob
-    #     Start-Sleep -Milliseconds 200
-    # }
-    # Stop-Job $ljob
-    # Remove-Job $ljob
-    # Stop-Process $proc
-
-    # Write-Output '====================================================='
-    # Write-Output '              PlayMode Tests Finished                '
-    # Write-Output '====================================================='
-#   displayName: 'Run EditMode tests'
+  - pwsh: |
+      Write-Host "======================= EditMode Tests ======================="
+
+      $logFile = Join-Path $(Build.ArtifactStagingDirectory) "editmode-test-run.log"
+      New-Item -Path $logFile -ItemType File -Force
+
+      $resultFile = Join-Path $(Build.ArtifactStagingDirectory) "test-results-editmode.xml"
+      New-Item -Path $resultFile -ItemType File -Force
+
+      try {
+        if ("${{ parameters.UnityVersion }}" -eq "Latest") {
+          $proc = Start-UnityEditor -Project "${{ parameters.PathToProject }}" -Latest -RunTests -TestPlatform EditMode -BuildTarget ${{ parameters.BuildTarget }} -BatchMode -PassThru -LogFile $logFile -EditorTestsResultFile $resultFile -AdditionalArguments "${{ parameters.AdditionalArguments }}"
+        }
+        else {
+          $proc = Start-UnityEditor -Project "${{ parameters.PathToProject }}" -Version ${{ parameters.UnityVersion }} -RunTests -TestPlatform EditMode -BuildTarget ${{ parameters.BuildTarget }} -BatchMode -PassThru -LogFile $logFile -EditorTestsResultFile $resultFile -AdditionalArguments "${{ parameters.AdditionalArguments }}"
+        }
+
+        $ljob = Start-Job -ScriptBlock { param($log) Get-Content "$log" -Wait } -ArgumentList $logFile
+        while (-not $proc.HasExited -and $ljob.HasMoreData)
+        {
+          Receive-Job $ljob
+          Start-Sleep -Milliseconds 200
+        }
+        Stop-Job $ljob
+        Remove-Job $ljob
+        Stop-Process $proc
+      }
+      finally {
+        Write-Output '====================================================='
+        Write-Output '              EditMode Tests Finished                '
+        Write-Output '====================================================='
+
+        if (Test-Path $logFile) {
+          Write-Output '====================================================='
+          Write-Output '             Begin EditMode Tests Logs               '
+          Write-Output '====================================================='
+
+          Get-Content $logFile
+
+          Write-Output '====================================================='
+          Write-Output '              End EditMode Tests Logs                '
+          Write-Output '====================================================='
+        }
+        else {
+          Write-Output 'EditMode Tests log missing!'
+        }
+
+        if (Test-Path $resultFile) {
+          Write-Output '====================================================='
+          Write-Output '            Begin EditMode Tests Results             '
+          Write-Output '====================================================='
+
+          Get-Content $resultFile
+
+          Write-Output '====================================================='
+          Write-Output '             End EditMode Tests Results              '
+          Write-Output '====================================================='
+        }
+        else {
+          Write-Output 'EditMode Tests results missing!'
+        }
+
+        Write-Output "Exit code: $($proc.ExitCode)"
+      }
+    displayName: Run EditMode tests
 
   - pwsh: |
       Write-Host "======================= PlayMode Tests ======================="
-      
+
       $logFile = Join-Path $(Build.ArtifactStagingDirectory) "playmode-test-run.log"
       New-Item -Path $logFile -ItemType File -Force
-      
+
       $resultFile = Join-Path $(Build.ArtifactStagingDirectory) "test-results-playmode.xml"
       New-Item -Path $resultFile -ItemType File -Force
 
       $setupMethod = "Microsoft.MixedReality.Toolkit.Examples.Build.BuildApp.EnsureTMPro"
 
       try {
-      if ("${{ parameters.UnityVersion }}" -eq "Latest") {
-        $proc = Start-UnityEditor -Project "${{ parameters.PathToProject }}" -Latest -ExecuteMethod $setupMethod -RunTests -TestPlatform PlayMode -BuildTarget ${{ parameters.BuildTarget }} -BatchMode -PassThru -LogFile $logFile -EditorTestsResultFile $resultFile -AdditionalArguments "${{ parameters.AdditionalArguments }}"
-      }
-      else {
-        $proc = Start-UnityEditor -Project "${{ parameters.PathToProject }}" -Version ${{ parameters.UnityVersion }} -ExecuteMethod $setupMethod -RunTests -TestPlatform PlayMode -BuildTarget ${{ parameters.BuildTarget }} -BatchMode -PassThru -LogFile $logFile -EditorTestsResultFile $resultFile -AdditionalArguments "${{ parameters.AdditionalArguments }}"
-      }
+        if ("${{ parameters.UnityVersion }}" -eq "Latest") {
+          $proc = Start-UnityEditor -Project "${{ parameters.PathToProject }}" -Latest -ExecuteMethod $setupMethod -RunTests -TestPlatform PlayMode -BuildTarget ${{ parameters.BuildTarget }} -BatchMode -PassThru -LogFile $logFile -EditorTestsResultFile $resultFile -AdditionalArguments "${{ parameters.AdditionalArguments }}"
+        }
+        else {
+          $proc = Start-UnityEditor -Project "${{ parameters.PathToProject }}" -Version ${{ parameters.UnityVersion }} -ExecuteMethod $setupMethod -RunTests -TestPlatform PlayMode -BuildTarget ${{ parameters.BuildTarget }} -BatchMode -PassThru -LogFile $logFile -EditorTestsResultFile $resultFile -AdditionalArguments "${{ parameters.AdditionalArguments }}"
+        }
 
-      $ljob = Start-Job -ScriptBlock { param($log) Get-Content "$log" -Wait } -ArgumentList $logFile
-      while (-not $proc.HasExited -and $ljob.HasMoreData)
-      {
-        Receive-Job $ljob
-        Start-Sleep -Milliseconds 200
-      }
-      Stop-Job $ljob
-      Remove-Job $ljob
-      Stop-Process $proc
+        $ljob = Start-Job -ScriptBlock { param($log) Get-Content "$log" -Wait } -ArgumentList $logFile
+        while (-not $proc.HasExited -and $ljob.HasMoreData)
+        {
+          Receive-Job $ljob
+          Start-Sleep -Milliseconds 200
+        }
+        Stop-Job $ljob
+        Remove-Job $ljob
+        Stop-Process $proc
       }
       finally {
         Write-Output '====================================================='
@@ -105,6 +138,7 @@ steps:
         else {
           Write-Output 'PlayMode Tests log missing!'
         }
+
         if (Test-Path $resultFile) {
           Write-Output '====================================================='
           Write-Output '            Begin PlayMode Tests Results             '
@@ -119,16 +153,16 @@ steps:
         else {
           Write-Output 'PlayMode Tests results missing!'
         }
-      Write-Output "Exit code: $($proc.ExitCode)"
-      }
 
-    displayName: 'Run PlayMode tests'
+        Write-Output "Exit code: $($proc.ExitCode)"
+      }
+    displayName: Run PlayMode tests
 
   - task: PublishTestResults@2
-    displayName: 'Publish Test Results'
+    displayName: Publish Test Results
     inputs:
       testResultsFormat: NUnit
-      testResultsFiles: 'test*.xml'
+      testResultsFiles: "test*.xml"
       searchFolder: $(Build.ArtifactStagingDirectory)
       failTaskOnFailedTests: true
       continueOnError: false
diff --git a/com.microsoft.mrtk.core/Editor/AboutMRTK.cs b/com.microsoft.mrtk.core/Editor/AboutMRTK.cs
@@ -42,7 +42,7 @@ private static void Init()
             window = GetWindow<AboutMRTK>();
             window.titleContent = WindowTitle;
 
-            if (MixedRealityInspectorUtility.IsMixedRealityToolkitLogoAssetPresent())
+            if (InspectorUIUtility.IsMixedRealityToolkitLogoAssetPresent())
             {
                 window.minSize = WindowSizeWithLogo;
                 window.maxSize = WindowSizeWithLogo;
@@ -78,18 +78,18 @@ private void OnGUI()
             using (new EditorGUILayout.VerticalScope())
             {
                 EditorGUILayout.Space(2);
-                if (!MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo())
+                if (!InspectorUIUtility.RenderMixedRealityToolkitLogo())
                 {
                     // Only add additional space if the text fallback is used in RenderMixedRealityToolkitLogo().
                     EditorGUILayout.Space(3);
                 }
-                EditorGUILayout.LabelField("Copyright (c) Microsoft Corporation. Licensed under the MIT License.", MixedRealityStylesUtility.LicenseStyle);
+                EditorGUILayout.LabelField("Copyright (c) Microsoft Corporation. Licensed under the MIT License.", MRTKEditorStyles.LicenseStyle);
                 EditorGUILayout.Space(12);
 
                 if (packageListRequest != null && packageListRequest.IsCompleted == false)
                 {
                     EditorGUILayout.Space(30);
-                    EditorGUILayout.LabelField("Loading package information...", MixedRealityStylesUtility.LicenseStyle);
+                    EditorGUILayout.LabelField("Loading package information...", MRTKEditorStyles.LicenseStyle);
                 }
                 else
                 {

diff --git a/...icrosoft.mrtk.core/Editor/Inspectors.meta → com.microsoft.mrtk.core/Editor/Editors.meta b/...icrosoft.mrtk.core/Editor/Inspectors.meta → com.microsoft.mrtk.core/Editor/Editors.meta
diff --git a/...rtk.core/Editor/BaseInteractableEditor.cs → .../Editor/Editors/BaseInteractableEditor.cs b/...rtk.core/Editor/BaseInteractableEditor.cs → .../Editor/Editors/BaseInteractableEditor.cs
diff --git a/...ore/Editor/BaseInteractableEditor.cs.meta → ...or/Editors/BaseInteractableEditor.cs.meta b/...ore/Editor/BaseInteractableEditor.cs.meta → ...or/Editors/BaseInteractableEditor.cs.meta
diff --git a/....mrtk.core/Editor/MRTKProfileInspector.cs → ....core/Editor/Editors/MRTKProfileEditor.cs b/....mrtk.core/Editor/MRTKProfileInspector.cs → ....core/Editor/Editors/MRTKProfileEditor.cs
@@ -17,7 +17,7 @@ namespace Microsoft.MixedReality.Toolkit.Editor
     /// as the configurations assigned to each subsystem.
     /// </summary>
     [CustomEditor(typeof(MRTKProfile))]
-    public class MRTKProfileInspector : UnityEditor.Editor
+    public class MRTKProfileEditor : UnityEditor.Editor
     {
         /// <summary>
         /// A container class, intended to wrap all information about a subsystem
@@ -290,13 +290,13 @@ private void DrawSubsystemList()
         {
             using (new EditorGUILayout.VerticalScope(Styles.SubsystemSelectionPanel, GUILayout.Width(Styles.SubsystemListWidth), GUILayout.ExpandWidth(true)))
             {
-                EditorGUILayout.LabelField("Available MRTK Subsystems", MixedRealityStylesUtility.BoldLargeTitleStyle);
+                EditorGUILayout.LabelField("Available MRTK Subsystems", MRTKEditorStyles.BoldLargeTitleStyle);
 
                 foreach (KeyValuePair<string, List<SubsystemItem>> pair in allSubsystemTypes)
                 {
                     using (new EditorGUILayout.VerticalScope(Styles.SubsystemListStyle, GUILayout.ExpandHeight(true)))
                     {
-                        EditorGUILayout.LabelField(pair.Key, MixedRealityStylesUtility.BoldLargeTitleStyle);
+                        EditorGUILayout.LabelField(pair.Key, MRTKEditorStyles.BoldLargeTitleStyle);
 
                         foreach (SubsystemItem subsystemItem in pair.Value)
                         {
@@ -330,7 +330,7 @@ private void DrawSubsystemInspector()
         {
             using (new EditorGUILayout.VerticalScope(Styles.SubsystemDetailsPanel))
             {
-                EditorGUILayout.LabelField("Subsystem Details", MixedRealityStylesUtility.BoldLargeTitleStyle);
+                EditorGUILayout.LabelField("Subsystem Details", MRTKEditorStyles.BoldLargeTitleStyle);
 
                 if (selectedItem == null)
                 {

diff --git a/....core/Editor/MRTKProfileInspector.cs.meta → .../Editor/Editors/MRTKProfileEditor.cs.meta b/....core/Editor/MRTKProfileInspector.cs.meta → .../Editor/Editors/MRTKProfileEditor.cs.meta
diff --git a/...ft.mrtk.core/Editor/MRTKSettingsEditor.cs → ...core/Editor/Editors/MRTKSettingsEditor.cs b/...ft.mrtk.core/Editor/MRTKSettingsEditor.cs → ...core/Editor/Editors/MRTKSettingsEditor.cs
diff --git a/...tk.core/Editor/MRTKSettingsEditor.cs.meta → ...Editor/Editors/MRTKSettingsEditor.cs.meta b/...tk.core/Editor/MRTKSettingsEditor.cs.meta → ...Editor/Editors/MRTKSettingsEditor.cs.meta
diff --git a/...spectors/StatefulInteractableInspector.cs → ...tor/Editors/StatefulInteractableEditor.cs b/...spectors/StatefulInteractableInspector.cs → ...tor/Editors/StatefulInteractableEditor.cs
@@ -8,7 +8,7 @@ namespace Microsoft.MixedReality.Toolkit.Editor
 {
     [CustomEditor(typeof(StatefulInteractable), true)]
     [CanEditMultipleObjects]
-    public class StatefulInteractableInspector : BaseInteractableEditor
+    public class StatefulInteractableEditor : BaseInteractableEditor
     {
         private SerializedProperty IsToggled;
         private SerializedProperty IsToggledStateActive;

diff --git a/...ors/StatefulInteractableInspector.cs.meta → ...ditors/StatefulInteractableEditor.cs.meta b/...ors/StatefulInteractableInspector.cs.meta → ...ditors/StatefulInteractableEditor.cs.meta