Consolidate and clean up editor assembly

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployPreferences.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs

@@ -5,9 +5,9 @@
 using System.IO;
 using UnityEditor;
 using UnityEngine;
-using XRTK.Utilities.Editor;
+using XRTK.Editor.Utilities;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     /// <summary>
     /// Build and Deploy Specific Editor Preferences for the Build and Deploy Window.

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployWindow.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs

@@ -11,16 +11,16 @@
 using System.Xml;
 using UnityEditor;
 using UnityEngine;
-using XRTK.Utilities.Editor;
-using XRTK.Utilities.Editor.Usb;
+using XRTK.Editor.Utilities;
+using XRTK.Editor.Utilities.USB;
 using XRTK.Utilities.Gltf;
 using XRTK.Utilities.WebRequestRest;
 using XRTK.Utilities.WindowsDevicePortal;
 using XRTK.Utilities.WindowsDevicePortal.DataStructures;
 using Debug = UnityEngine.Debug;
 using FileInfo = System.IO.FileInfo;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     /// <summary>
     /// Build window - supports SLN creation, APPX from SLN, Deploy on device, and misc helper utilities associated with the build/deploy/test iteration loop

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfo.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfo.cs

@@ -5,7 +5,7 @@
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     public class BuildInfo : IBuildInfo
     {

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfoExtensions.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfoExtensions.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEditor;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     public static class BuildInfoExtensions
     {

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/IBuildInfo.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/IBuildInfo.cs

@@ -4,7 +4,7 @@
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     /// <summary>
     /// The Build Info defines common properties for a build.

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/LuminPlayerBuildTools.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/LuminPlayerBuildTools.cs

@@ -8,7 +8,7 @@
 using XRTK.Extensions;
 using Debug = UnityEngine.Debug;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     /// <summary>
     /// Class containing various utility methods to build a lumin mpk installer from a Unity project.

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/MixedRealityAppIcon.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/MixedRealityAppIcon.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     /// <summary>
     /// Build profile for saving 3d app icon's path in the build settings.

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs

@@ -13,10 +13,10 @@
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 using XRTK.Extensions;
-using XRTK.Utilities.Editor;
+using XRTK.Editor.Utilities;
 using Debug = UnityEngine.Debug;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     /// <summary>
     /// Cross platform player build tools

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpAppxBuildTools.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs

@@ -12,10 +12,10 @@
 using UnityEditor;
 using UnityEngine;
 using XRTK.Extensions;
-using XRTK.Utilities.Editor;
+using XRTK.Editor.Utilities;
 using Debug = UnityEngine.Debug;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     public static class UwpAppxBuildTools
     {

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildDeployPreferences.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs

@@ -1,10 +1,10 @@
 using System;
 using System.IO;
 using UnityEngine;
-using XRTK.Utilities.Editor;
+using XRTK.Editor.Utilities;
 using XRTK.Utilities.WindowsDevicePortal.DataStructures;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     public static class UwpBuildDeployPreferences
     {

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildInfo.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildInfo.cs

@@ -3,7 +3,7 @@
 
 using UnityEditor;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     public class UwpBuildInfo : BuildInfo
     {

XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpPlayerBuildTools.cs → XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs

@@ -7,9 +7,9 @@
 using System.Threading.Tasks;
 using UnityEditor;
 using UnityEditor.Build.Reporting;
-using XRTK.Utilities.Editor;
+using XRTK.Editor.Utilities;
 
-namespace XRTK.Utilities.Build
+namespace XRTK.Editor.BuildAndDeploy
 {
     /// <summary>
     /// Class containing various utility methods to build a WSA solution from a Unity project.

XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs

@@ -17,7 +17,6 @@
 using XRTK.Interfaces.Providers.Controllers.Hands;
 using XRTK.Providers.Controllers.OpenVR;
 using XRTK.Providers.Controllers.UnityInput;
-using XRTK.Utilities.Editor;
 
 namespace XRTK.Editor
 {
@@ -106,7 +105,7 @@ private void OnFocus()
                 Close();
             }
 
-            currentControllerTexture = ControllerMappingLibrary.GetControllerTexture(controllerDataProviderProfile);
+            currentControllerTexture = ControllerMappingUtilities.GetControllerTexture(controllerDataProviderProfile);
         }
 
         /// <summary>
@@ -136,7 +135,7 @@ public static void Show(MixedRealityControllerMappingProfile profile, Serialized
             window.titleContent = new GUIContent($"{window.currentControllerName} {handednessTitleText}Input Action Assignment");
             window.controllerDataProviderProfile = profile;
             window.currentInteractionProfiles = interactionMappingProfiles;
-            window.currentControllerTexture = ControllerMappingLibrary.GetControllerTexture(profile);
+            window.currentControllerTexture = ControllerMappingUtilities.GetControllerTexture(profile);
 
             isMouseInRects = new bool[interactionMappingProfiles.arraySize];
 

XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs

@@ -0,0 +1,36 @@
+// Copyright (c) XRTK. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEditor;
+using UnityEngine;
+using XRTK.Extensions;
+using XRTK.Services;
+
+namespace XRTK.Editor
+{
+    [InitializeOnLoad]
+    public static class EditorActiveProfileChangeHandler
+    {
+        static EditorActiveProfileChangeHandler()
+        {
+            EditorApplication.hierarchyChanged += EditorApplication_hierarchyChanged;
+        }
+
+        private static void EditorApplication_hierarchyChanged()
+        {
+            if (!MixedRealityToolkit.Instance.IsNull())
+            {
+                if (MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
+                    Utilities.InputMappingAxisUtility.CheckUnityInputManagerMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes))
+                {
+                    Debug.Log("XRTK Input System was enabled, updated input axis mappings.");
+                }
+                else if (!MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
+                    Utilities.InputMappingAxisUtility.RemoveMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes))
+                {
+                    Debug.Log("XRTK Input System was disabled, removed input axis mappings.");
+                }
+            }
+        }
+    }
+}

XRTK-Core/Packages/com.xrtk.core/Editor/MixedRealityPreferences.cs

@@ -10,7 +10,7 @@
 using XRTK.Editor.Utilities.SymbolicLinks;
 using XRTK.Editor.Extensions;
 using XRTK.Extensions;
-using XRTK.Utilities.Editor;
+using XRTK.Editor.Utilities;
 
 namespace XRTK.Editor
 {

XRTK-Core/Packages/com.xrtk.core/Editor/Profiles/InputSystem/Controllers/BaseMixedRealityControllerDataProviderProfileInspector.cs

@@ -15,6 +15,7 @@
 using System.Runtime.InteropServices;
 using XRTK.Editor.Extensions;
 using XRTK.Editor.PropertyDrawers;
+using XRTK.Editor.Utilities;
 
 namespace XRTK.Editor.Profiles.InputSystem.Controllers
 {
@@ -283,7 +284,7 @@ internal void RenderControllerMappingButton(MixedRealityControllerMappingProfile
                 typeName = "HoloLens 1";
             }
 
-            var buttonContent = new GUIContent($"Edit {typeName} Action Mapping", ControllerMappingLibrary.GetControllerTextureScaled(controllerMappingProfile));
+            var buttonContent = new GUIContent($"Edit {typeName} Action Mapping", ControllerMappingUtilities.GetControllerTextureScaled(controllerMappingProfile));
             if (GUILayout.Button(buttonContent, ControllerButtonStyle, GUILayout.Height(128f), GUILayout.MinWidth(32f), GUILayout.ExpandWidth(true)))
             {
                 EditorApplication.delayCall += () => ControllerPopupWindow.Show(controllerMappingProfile, new SerializedObject(controllerMappingProfile).FindProperty("interactionMappingProfiles"));

XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ChannelPackerWindow.cs

@@ -5,7 +5,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace XRTK.Editor
+namespace XRTK.Editor.Utilities
 {
     public class ChannelPackerWindow : EditorWindow
     {