Merge pull request #56 from XRTK/development

Release 0.1.12
XRTK · Apr 1, 2020 · 176d526 · 176d526
2 parents 50c4e1a + c10c24f
commit 176d526
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Controllers/WindowsMixedRealityController.cs b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Controllers/WindowsMixedRealityController.cs
@@ -4,13 +4,13 @@
 using XRTK.Definitions.Devices;
 using XRTK.Definitions.InputSystem;
 using XRTK.Definitions.Utilities;
-using XRTK.Extensions;
 using XRTK.Interfaces.InputSystem;
 using XRTK.Providers.Controllers;
 
 #if UNITY_WSA
 using UnityEngine;
 using UnityEngine.XR.WSA.Input;
+using XRTK.Extensions;
 using XRTK.Services;
 #endif
 

diff --git a/...ality/Packages/com.xrtk.wmr/Inspectors/WindowsMixedRealityDataProviderProfileInspector.cs b/...ality/Packages/com.xrtk.wmr/Inspectors/WindowsMixedRealityDataProviderProfileInspector.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEditor;
-using UnityEngine;
 using XRTK.Inspectors.Profiles;
 using XRTK.Inspectors.Utilities;
 using XRTK.WindowsMixedReality.Profiles;
@@ -12,32 +11,26 @@ namespace XRTK.WindowsMixedReality.Inspectors
     [CustomEditor(typeof(WindowsMixedRealityControllerDataProviderProfile))]
     public class WindowsMixedRealityDataProviderProfileInspector : BaseMixedRealityProfileInspector
     {
-        private SerializedProperty windowsManipulationGestureSettings;
+        private SerializedProperty manipulationGestures;
         private SerializedProperty useRailsNavigation;
-        private SerializedProperty windowsNavigationGestureSettings;
-        private SerializedProperty windowsRailsNavigationGestures;
+        private SerializedProperty navigationGestures;
+        private SerializedProperty railsNavigationGestures;
         private SerializedProperty windowsGestureAutoStart;
 
         protected override void OnEnable()
         {
             base.OnEnable();
 
-            windowsManipulationGestureSettings = serializedObject.FindProperty("manipulationGestures");
-            useRailsNavigation = serializedObject.FindProperty("useRailsNavigation");
-            windowsNavigationGestureSettings = serializedObject.FindProperty("navigationGestures");
-            windowsRailsNavigationGestures = serializedObject.FindProperty("railsNavigationGestures");
-            windowsGestureAutoStart = serializedObject.FindProperty("windowsGestureAutoStart");
+            manipulationGestures = serializedObject.FindProperty(nameof(manipulationGestures));
+            useRailsNavigation = serializedObject.FindProperty(nameof(useRailsNavigation));
+            navigationGestures = serializedObject.FindProperty(nameof(navigationGestures));
+            railsNavigationGestures = serializedObject.FindProperty(nameof(railsNavigationGestures));
+            windowsGestureAutoStart = serializedObject.FindProperty(nameof(windowsGestureAutoStart));
         }
 
         public override void OnInspectorGUI()
         {
-            MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo();
-
-            if (ThisProfile.ParentProfile != null &&
-                GUILayout.Button("Back to Controller Data Providers"))
-            {
-                Selection.activeObject = ThisProfile.ParentProfile;
-            }
+            RenderHeader();
 
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Windows Mixed Reality Controller Data Provider Settings", EditorStyles.boldLabel);
@@ -49,10 +42,10 @@ public override void OnInspectorGUI()
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Windows Gesture Settings", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(windowsGestureAutoStart);
-            EditorGUILayout.PropertyField(windowsManipulationGestureSettings);
-            EditorGUILayout.PropertyField(windowsNavigationGestureSettings);
+            EditorGUILayout.PropertyField(manipulationGestures);
+            EditorGUILayout.PropertyField(navigationGestures);
             EditorGUILayout.PropertyField(useRailsNavigation);
-            EditorGUILayout.PropertyField(windowsRailsNavigationGestures);
+            EditorGUILayout.PropertyField(railsNavigationGestures);
             serializedObject.ApplyModifiedProperties();
         }
     }

diff --git a/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/package.json b/XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/package.json
@@ -10,12 +10,12 @@
     "mixed",
     "reality"
   ],
-  "version": "0.1.11",
+  "version": "0.1.12",
   "unity": "2019.1",
   "license": "MIT",
   "author": "XRTK Team (https://github.com/XRTK)",
   "dependencies": {
-    "com.xrtk.core": "0.1.31",
+    "com.xrtk.core": "0.1.32",
     "com.unity.xr.windowsmr.metro": "1.0.19"
   }
 }
diff --git a/XRTK.WindowsMixedReality/Packages/manifest.json b/XRTK.WindowsMixedReality/Packages/manifest.json
@@ -14,7 +14,7 @@
     "com.unity.xr.legacyinputhelpers": "2.0.8",
     "com.unity.xr.openvr.standalone": "1.0.5",
     "com.unity.xr.windowsmr.metro": "1.0.19",
-    "com.xrtk.core": "0.1.31",
+    "com.xrtk.core": "0.1.32",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",