XRTK · StephenHodgson · Apr 27, 2020 · Apr 6, 2020 · Apr 6, 2020 · Apr 7, 2020
diff --git a/...ity/Packages/com.xrtk.wmr/Inspectors.meta → ...Reality/Packages/com.xrtk.wmr/Editor.meta b/...ity/Packages/com.xrtk.wmr/Inspectors.meta → ...Reality/Packages/com.xrtk.wmr/Editor.meta
diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/Providers.meta b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/Providers.meta
diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/Providers/SpatialAwarenessSystem.meta b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Editor/Providers/SpatialAwarenessSystem.meta
diff --git a/...ality/Packages/com.xrtk.wmr/Editor/Providers/SpatialAwarenessSystem/SpatialObservers.meta b/...ality/Packages/com.xrtk.wmr/Editor/Providers/SpatialAwarenessSystem/SpatialObservers.meta
diff --git a/...ControllerDataProviderProfileInspector.cs → ...ControllerDataProviderProfileInspector.cs b/...ControllerDataProviderProfileInspector.cs → ...ControllerDataProviderProfileInspector.cs
@@ -3,24 +3,23 @@
 
 using UnityEditor;
 using UnityEngine;
-using XRTK.Inspectors.Extensions;
-using XRTK.Inspectors.Profiles.InputSystem.Controllers;
+using XRTK.Editor.Extensions;
+using XRTK.Editor.Profiles.InputSystem.Controllers;
 using XRTK.WindowsMixedReality.Profiles;
 
-namespace XRTK.WindowsMixedReality.Inspectors
+namespace XRTK.WindowsMixedReality.Editor.Providers.SpatialAwarenessSystem.SpatialObservers
 {
     [CustomEditor(typeof(WindowsMixedRealityControllerDataProviderProfile))]
     public class WindowsMixedRealityControllerDataProviderProfileInspector : BaseMixedRealityControllerDataProviderProfileInspector
     {
+        private static readonly GUIContent GestureSettingsFoldoutHeader = new GUIContent("Windows Gesture Settings");
+
         private SerializedProperty manipulationGestures;
         private SerializedProperty useRailsNavigation;
         private SerializedProperty navigationGestures;
         private SerializedProperty railsNavigationGestures;
         private SerializedProperty windowsGestureAutoStart;
 
-        bool showGestureSettings = true;
-        private static readonly GUIContent gestureSettingsFoldoutHeader = new GUIContent("Windows Gesture Settings");
-
         protected override void OnEnable()
         {
             base.OnEnable();
@@ -38,14 +37,15 @@ public override void OnInspectorGUI()
 
             serializedObject.Update();
             EditorGUILayout.Space();
-            showGestureSettings = EditorGUILayoutExtensions.FoldoutWithBoldLabel(showGestureSettings, gestureSettingsFoldoutHeader, true);
-            if (showGestureSettings)
+
+            if (windowsGestureAutoStart.FoldoutWithBoldLabelPropertyField(GestureSettingsFoldoutHeader))
             {
-                EditorGUILayout.PropertyField(windowsGestureAutoStart);
+                EditorGUI.indentLevel++;
                 EditorGUILayout.PropertyField(manipulationGestures);
                 EditorGUILayout.PropertyField(navigationGestures);
                 EditorGUILayout.PropertyField(useRailsNavigation);
                 EditorGUILayout.PropertyField(railsNavigationGestures);
+                EditorGUI.indentLevel--;
             }
 
             serializedObject.ApplyModifiedProperties();

diff --git a/...ollerDataProviderProfileInspector.cs.meta → ...ollerDataProviderProfileInspector.cs.meta b/...ollerDataProviderProfileInspector.cs.meta → ...ollerDataProviderProfileInspector.cs.meta
diff --git a/...RTK.WindowsMixedReality.Inspectors.asmdef → ...or/XRTK.WindowsMixedReality.Editor.asmdef b/...RTK.WindowsMixedReality.Inspectors.asmdef → ...or/XRTK.WindowsMixedReality.Editor.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "XRTK.WindowsMixedReality.Inspectors",
+    "name": "XRTK.WindowsMixedReality.Editor",
     "references": [
         "GUID:f3241d040533491e8a1e2714b27c3111",
         "GUID:e67d30660ec243e4836aac191d3f36fb",

diff --git a/...indowsMixedReality.Inspectors.asmdef.meta → ...TK.WindowsMixedReality.Editor.asmdef.meta b/...indowsMixedReality.Inspectors.asmdef.meta → ...TK.WindowsMixedReality.Editor.asmdef.meta
diff --git a/...ackages/com.xrtk.wmr/Inspectors/WindowsMixedRealitySpatialMeshObserverProfileInspector.cs b/...ackages/com.xrtk.wmr/Inspectors/WindowsMixedRealitySpatialMeshObserverProfileInspector.cs
diff --git a/...es/com.xrtk.wmr/Inspectors/WindowsMixedRealitySpatialMeshObserverProfileInspector.cs.meta b/...es/com.xrtk.wmr/Inspectors/WindowsMixedRealitySpatialMeshObserverProfileInspector.cs.meta
diff --git a/...ackages/com.xrtk.wmr/DefaultProfiles.meta → ...com.xrtk.wmr/Runtime/DefaultProfiles.meta b/...ackages/com.xrtk.wmr/DefaultProfiles.meta → ...com.xrtk.wmr/Runtime/DefaultProfiles.meta
diff --git a/...wsMixedRealityCameraProviderProfile.asset → ...wsMixedRealityCameraProviderProfile.asset b/...wsMixedRealityCameraProviderProfile.asset → ...wsMixedRealityCameraProviderProfile.asset
diff --git a/...edRealityCameraProviderProfile.asset.meta → ...edRealityCameraProviderProfile.asset.meta b/...edRealityCameraProviderProfile.asset.meta → ...edRealityCameraProviderProfile.asset.meta
diff --git a/...ity/Packages/com.xrtk.wmr/Extensions.meta → ...ages/com.xrtk.wmr/Runtime/Extensions.meta b/...ity/Packages/com.xrtk.wmr/Extensions.meta → ...ages/com.xrtk.wmr/Runtime/Extensions.meta
diff --git a/...wmr/Extensions/HandJointKindExtensions.cs → ...ime/Extensions/HandJointKindExtensions.cs b/...wmr/Extensions/HandJointKindExtensions.cs → ...ime/Extensions/HandJointKindExtensions.cs
diff --git a/...xtensions/HandJointKindExtensions.cs.meta → ...xtensions/HandJointKindExtensions.cs.meta b/...xtensions/HandJointKindExtensions.cs.meta → ...xtensions/HandJointKindExtensions.cs.meta
diff --git a/...lInteractionSourceHandednessExtensions.cs → ...lInteractionSourceHandednessExtensions.cs b/...lInteractionSourceHandednessExtensions.cs → ...lInteractionSourceHandednessExtensions.cs
diff --git a/...ractionSourceHandednessExtensions.cs.meta → ...ractionSourceHandednessExtensions.cs.meta b/...ractionSourceHandednessExtensions.cs.meta → ...ractionSourceHandednessExtensions.cs.meta
diff --git a/...SpatialInteractionSourceKindExtensions.cs → ...SpatialInteractionSourceKindExtensions.cs b/...SpatialInteractionSourceKindExtensions.cs → ...SpatialInteractionSourceKindExtensions.cs
diff --git a/...alInteractionSourceKindExtensions.cs.meta → ...alInteractionSourceKindExtensions.cs.meta b/...alInteractionSourceKindExtensions.cs.meta → ...alInteractionSourceKindExtensions.cs.meta
diff --git a/...ality/Packages/com.xrtk.wmr/Profiles.meta → ...ckages/com.xrtk.wmr/Runtime/Profiles.meta b/...ality/Packages/com.xrtk.wmr/Profiles.meta → ...ckages/com.xrtk.wmr/Runtime/Profiles.meta
diff --git a/...edRealityControllerDataProviderProfile.cs → ...edRealityControllerDataProviderProfile.cs b/...edRealityControllerDataProviderProfile.cs → ...edRealityControllerDataProviderProfile.cs
@@ -6,7 +6,7 @@
 using XRTK.Definitions.InputSystem;
 using XRTK.Definitions.Utilities;
 using XRTK.Definitions.Controllers;
-using XRTK.WindowsMixedReality.Controllers;
+using XRTK.WindowsMixedReality.Providers.InputSystem.Controllers;
 
 namespace XRTK.WindowsMixedReality.Profiles
 {

diff --git a/...lityControllerDataProviderProfile.cs.meta → ...lityControllerDataProviderProfile.cs.meta b/...lityControllerDataProviderProfile.cs.meta → ...lityControllerDataProviderProfile.cs.meta
diff --git a/...alityHandControllerDataProviderProfile.cs → ...alityHandControllerDataProviderProfile.cs b/...alityHandControllerDataProviderProfile.cs → ...alityHandControllerDataProviderProfile.cs
diff --git a/...HandControllerDataProviderProfile.cs.meta → ...HandControllerDataProviderProfile.cs.meta b/...HandControllerDataProviderProfile.cs.meta → ...HandControllerDataProviderProfile.cs.meta
diff --git a/...MixedRealitySpatialMeshObserverProfile.cs → ...MixedRealitySpatialMeshObserverProfile.cs b/...MixedRealitySpatialMeshObserverProfile.cs → ...MixedRealitySpatialMeshObserverProfile.cs
diff --git a/...RealitySpatialMeshObserverProfile.cs.meta → ...RealitySpatialMeshObserverProfile.cs.meta b/...RealitySpatialMeshObserverProfile.cs.meta → ...RealitySpatialMeshObserverProfile.cs.meta
diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/InputSystem.meta b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/InputSystem.meta
diff --git a/...ty/Packages/com.xrtk.wmr/Controllers.meta → ...me/Providers/InputSystem/Controllers.meta b/...ty/Packages/com.xrtk.wmr/Controllers.meta → ...me/Providers/InputSystem/Controllers.meta
diff --git a/...dowsMixedRealityControllerDataProvider.cs → ...dowsMixedRealityControllerDataProvider.cs b/...dowsMixedRealityControllerDataProvider.cs → ...dowsMixedRealityControllerDataProvider.cs
@@ -27,7 +27,7 @@
 using XRTK.Utilities;
 #endif // WINDOWS_UWP
 
-namespace XRTK.WindowsMixedReality.Controllers
+namespace XRTK.WindowsMixedReality.Providers.InputSystem.Controllers
 {
     /// <summary>
     /// The device manager for Windows Mixed Reality controllers.

diff --git a/...ixedRealityControllerDataProvider.cs.meta → ...ixedRealityControllerDataProvider.cs.meta b/...ixedRealityControllerDataProvider.cs.meta → ...ixedRealityControllerDataProvider.cs.meta
diff --git a/...MixedRealityHandControllerDataProvider.cs → ...MixedRealityHandControllerDataProvider.cs b/...MixedRealityHandControllerDataProvider.cs → ...MixedRealityHandControllerDataProvider.cs
@@ -22,7 +22,7 @@
 
 #endif // WINDOWS_UWP
 
-namespace XRTK.WindowsMixedReality.Controllers
+namespace XRTK.WindowsMixedReality.Providers.InputSystem.Controllers
 {
     /// <summary>
     /// The Windows Mixed Reality Data Provider for hand controller support.

diff --git a/...RealityHandControllerDataProvider.cs.meta → ...RealityHandControllerDataProvider.cs.meta b/...RealityHandControllerDataProvider.cs.meta → ...RealityHandControllerDataProvider.cs.meta
diff --git a/...rs/WindowsMixedRealityMotionController.cs → ...rs/WindowsMixedRealityMotionController.cs b/...rs/WindowsMixedRealityMotionController.cs → ...rs/WindowsMixedRealityMotionController.cs
@@ -14,7 +14,7 @@
 using XRTK.Services;
 #endif
 
-namespace XRTK.WindowsMixedReality.Controllers
+namespace XRTK.WindowsMixedReality.Providers.InputSystem.Controllers
 {
     /// <summary>
     /// A Windows Mixed Reality Controller Instance.

diff --git a/...ndowsMixedRealityMotionController.cs.meta → ...ndowsMixedRealityMotionController.cs.meta b/...ndowsMixedRealityMotionController.cs.meta → ...ndowsMixedRealityMotionController.cs.meta
diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/SpatialAwarenessSystem.meta b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Runtime/Providers/SpatialAwarenessSystem.meta
diff --git a/...ckages/com.xrtk.wmr/SpatialObservers.meta → ...tialAwarenessSystem/SpatialObservers.meta b/...ckages/com.xrtk.wmr/SpatialObservers.meta → ...tialAwarenessSystem/SpatialObservers.meta
diff --git a/...WindowsMixedRealitySpatialMeshObserver.cs → ...WindowsMixedRealitySpatialMeshObserver.cs b/...WindowsMixedRealitySpatialMeshObserver.cs → ...WindowsMixedRealitySpatialMeshObserver.cs
@@ -15,7 +15,7 @@
 using XRTK.Utilities;
 #endif // UNITY_WSA
 
-namespace XRTK.WindowsMixedReality.SpatialObservers
+namespace XRTK.WindowsMixedReality.Providers.SpatialAwarenessSystem.SpatialObservers
 {
     /// <summary>
     /// The Windows Mixed Reality Spatial Mesh Observer.

diff --git a/...wsMixedRealitySpatialMeshObserver.cs.meta → ...wsMixedRealitySpatialMeshObserver.cs.meta b/...wsMixedRealitySpatialMeshObserver.cs.meta → ...wsMixedRealitySpatialMeshObserver.cs.meta
diff --git a/...lity/Packages/com.xrtk.wmr/Utilities.meta → ...kages/com.xrtk.wmr/Runtime/Utilities.meta b/...lity/Packages/com.xrtk.wmr/Utilities.meta → ...kages/com.xrtk.wmr/Runtime/Utilities.meta
diff --git a/...s/WindowsMixedRealityHandDataConverter.cs → ...s/WindowsMixedRealityHandDataConverter.cs b/...s/WindowsMixedRealityHandDataConverter.cs → ...s/WindowsMixedRealityHandDataConverter.cs
diff --git a/...dowsMixedRealityHandDataConverter.cs.meta → ...dowsMixedRealityHandDataConverter.cs.meta b/...dowsMixedRealityHandDataConverter.cs.meta → ...dowsMixedRealityHandDataConverter.cs.meta
diff --git a/...Utilities/WindowsMixedRealityUtilities.cs → ...Utilities/WindowsMixedRealityUtilities.cs b/...Utilities/WindowsMixedRealityUtilities.cs → ...Utilities/WindowsMixedRealityUtilities.cs
diff --git a/...ties/WindowsMixedRealityUtilities.cs.meta → ...ties/WindowsMixedRealityUtilities.cs.meta b/...ties/WindowsMixedRealityUtilities.cs.meta → ...ties/WindowsMixedRealityUtilities.cs.meta
diff --git a/....xrtk.wmr/XRTK.WindowsMixedReality.asmdef → ...r/Runtime/XRTK.WindowsMixedReality.asmdef b/....xrtk.wmr/XRTK.WindowsMixedReality.asmdef → ...r/Runtime/XRTK.WindowsMixedReality.asmdef
diff --git a/....wmr/XRTK.WindowsMixedReality.asmdef.meta → ...time/XRTK.WindowsMixedReality.asmdef.meta b/....wmr/XRTK.WindowsMixedReality.asmdef.meta → ...time/XRTK.WindowsMixedReality.asmdef.meta