Merge pull request #4 from XRTK/development

Version 0.1.1
XRTK · Apr 16, 2019 · 63cdbfb · 63cdbfb
2 parents 0acaf28 + 3d20f4f
commit 63cdbfb
Show file tree

Hide file tree

Showing 15 changed files with 190 additions and 34 deletions.
diff --git a/...sMixedReality/Assets/XRTK.WindowsMixedReality/Controllers/WindowsDictationDataProvider.cs b/...sMixedReality/Assets/XRTK.WindowsMixedReality/Controllers/WindowsDictationDataProvider.cs
@@ -25,8 +25,9 @@ public class WindowsDictationDataProvider : BaseDictationDataProvider
         /// </summary>
         /// <param name="name"></param>
         /// <param name="priority"></param>
-
-        public WindowsDictationDataProvider(string name, uint priority) : base(name, priority)
+        /// <param name="profile"></param>
+        public WindowsDictationDataProvider(string name, uint priority, BaseMixedRealityControllerDataProviderProfile profile)
+            : base(name, priority, profile)
         {
 #if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
             if (dictationRecognizer == null)
@@ -176,7 +177,7 @@ public override async Task StartRecordingAsync(GameObject listener = null, float
 
             // Query the maximum frequency of the default microphone.
             deviceName = micDeviceName;
-            Microphone.GetDeviceCaps(deviceName, out int minSamplingRate, out samplingRate);
+            Microphone.GetDeviceCaps(deviceName, out var minSamplingRate, out samplingRate);
 
             dictationRecognizer.InitialSilenceTimeoutSeconds = initialSilenceTimeout;
             dictationRecognizer.AutoSilenceTimeoutSeconds = autoSilenceTimeout;

diff --git a/...xedReality/Assets/XRTK.WindowsMixedReality/Controllers/WindowsMixedRealityDataProvider.cs b/...xedReality/Assets/XRTK.WindowsMixedReality/Controllers/WindowsMixedRealityDataProvider.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using XRTK.Providers.Controllers;
+using XRTK.WindowsMixedReality.Profiles;
 
 #if UNITY_WSA
 using System.Collections.Generic;
@@ -38,16 +39,21 @@ public class WindowsMixedRealityDataProvider : BaseControllerDataProvider
         /// </summary>
         /// <param name="name"></param>
         /// <param name="priority"></param>
-        public WindowsMixedRealityDataProvider(string name, uint priority) : base(name, priority)
+        /// <param name="profile"></param>
+        public WindowsMixedRealityDataProvider(string name, uint priority, WindowsMixedRealityControllerDataProviderProfile profile)
+            : base(name, priority, profile)
         {
 #if UNITY_WSA
+            this.profile = profile;
             gestureRecognizer = new GestureRecognizer();
             navigationGestureRecognizer = new GestureRecognizer();
 #endif // UNITY_WSA
         }
 
 #if UNITY_WSA
 
+        private readonly WindowsMixedRealityControllerDataProviderProfile profile;
+
         /// <summary>
         /// Dictionary to capture all active controllers detected
         /// </summary>
@@ -240,10 +246,10 @@ public override void Enable()
                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.GesturesProfile != null)
             {
                 var gestureProfile = MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.GesturesProfile;
-                GestureSettings = gestureProfile.ManipulationGestures;
-                NavigationSettings = gestureProfile.NavigationGestures;
-                RailsNavigationSettings = gestureProfile.RailsNavigationGestures;
-                UseRailsNavigation = gestureProfile.UseRailsNavigation;
+                GestureSettings = profile.ManipulationGestures;
+                NavigationSettings = profile.NavigationGestures;
+                RailsNavigationSettings = profile.RailsNavigationGestures;
+                UseRailsNavigation = profile.UseRailsNavigation;
 
                 for (int i = 0; i < gestureProfile.Gestures.Length; i++)
                 {
@@ -289,7 +295,7 @@ public override void Enable()
 
             if (MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.GesturesProfile != null &&
-                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.GesturesProfile.WindowsGestureAutoStart == AutoStartBehavior.AutoStart)
+                profile.WindowsGestureAutoStart == AutoStartBehavior.AutoStart)
             {
                 GestureRecognizerEnabled = true;
             }

diff --git a/...dowsMixedReality/Assets/XRTK.WindowsMixedReality/Controllers/WindowsSpeechDataProvider.cs b/...dowsMixedReality/Assets/XRTK.WindowsMixedReality/Controllers/WindowsSpeechDataProvider.cs
@@ -20,7 +20,8 @@ namespace XRTK.WindowsMixedReality.Controllers
     /// </summary>
     public class WindowsSpeechDataProvider : BaseSpeechDataProvider
     {
-        public WindowsSpeechDataProvider(string name, uint priority) : base(name, priority)
+        public WindowsSpeechDataProvider(string name, uint priority, BaseMixedRealityControllerDataProviderProfile profile) 
+            : base(name, priority, profile)
         {
             if (MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile == null)
             {

diff --git a/...ts/XRTK.WindowsMixedReality/Inspectors/WindowsMixedRealityDataProviderProfileInspector.cs b/...ts/XRTK.WindowsMixedReality/Inspectors/WindowsMixedRealityDataProviderProfileInspector.cs
@@ -0,0 +1,67 @@
+// 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.Definitions;
+using XRTK.Inspectors.Profiles;
+using XRTK.Inspectors.Utilities;
+using XRTK.Services;
+using XRTK.WindowsMixedReality.Profiles;
+
+namespace XRTK.WindowsMixedReality.Inspectors
+{
+    [CustomEditor(typeof(WindowsMixedRealityControllerDataProviderProfile))]
+    public class WindowsMixedRealityDataProviderProfileInspector : BaseMixedRealityProfileInspector
+    {
+        private SerializedProperty windowsManipulationGestureSettings;
+        private SerializedProperty useRailsNavigation;
+        private SerializedProperty windowsNavigationGestureSettings;
+        private SerializedProperty windowsRailsNavigationGestures;
+        private SerializedProperty windowsGestureAutoStart;
+
+        protected override void OnEnable()
+        {
+            base.OnEnable();
+
+            if (!MixedRealityInspectorUtility.CheckMixedRealityConfigured(false))
+            {
+                return;
+            }
+
+            windowsManipulationGestureSettings = serializedObject.FindProperty("manipulationGestures");
+            useRailsNavigation = serializedObject.FindProperty("useRailsNavigation");
+            windowsNavigationGestureSettings = serializedObject.FindProperty("navigationGestures");
+            windowsRailsNavigationGestures = serializedObject.FindProperty("railsNavigationGestures");
+            windowsGestureAutoStart = serializedObject.FindProperty("windowsGestureAutoStart");
+        }
+
+        public override void OnInspectorGUI()
+        {
+            MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo();
+
+            if (!MixedRealityInspectorUtility.CheckMixedRealityConfigured()) { return; }
+
+            if (GUILayout.Button("Back to Controller Data Providers"))
+            {
+                Selection.activeObject = MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.ControllerDataProvidersProfile;
+            }
+
+            EditorGUILayout.Space();
+            EditorGUILayout.LabelField("Windows Mixed Reality Controller Data Provider Settings", EditorStyles.boldLabel);
+            EditorGUILayout.HelpBox("This profile aids in configuring additional platform settings for the registered controller data provider. This can be anything from additional gestures or platform specific settings.", MessageType.Info);
+
+            (target as BaseMixedRealityProfile).CheckProfileLock();
+
+            serializedObject.Update();
+            EditorGUILayout.Space();
+            EditorGUILayout.LabelField("Windows Gesture Settings", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(windowsGestureAutoStart);
+            EditorGUILayout.PropertyField(windowsManipulationGestureSettings);
+            EditorGUILayout.PropertyField(windowsNavigationGestureSettings);
+            EditorGUILayout.PropertyField(useRailsNavigation);
+            EditorGUILayout.PropertyField(windowsRailsNavigationGestures);
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/...TK.WindowsMixedReality/Inspectors/WindowsMixedRealityDataProviderProfileInspector.cs.meta b/...TK.WindowsMixedReality/Inspectors/WindowsMixedRealityDataProviderProfileInspector.cs.meta
diff --git a/...dowsMixedReality/Inspectors/WindowsMixedRealityMotionControllerMappingProfileInspector.cs b/...dowsMixedReality/Inspectors/WindowsMixedRealityMotionControllerMappingProfileInspector.cs
@@ -3,9 +3,12 @@
 
 using UnityEditor;
 using XRTK.Inspectors.Profiles;
+using XRTK.WindowsMixedReality.Profiles;
 
-namespace XRTK.WindowsMixedReality.Profiles.Inspectors
+namespace XRTK.WindowsMixedReality.Inspectors
 {
     [CustomEditor(typeof(WindowsMixedRealityMotionControllerMappingProfile))]
-    public class WindowsMixedRealityMotionControllerMappingProfileInspector : BaseMixedRealityControllerMappingProfileInspector { }
+    public class WindowsMixedRealityMotionControllerMappingProfileInspector : BaseMixedRealityControllerMappingProfileInspector
+    {
+    }
 }
diff --git a/...ets/XRTK.WindowsMixedReality/Profiles/WindowsMixedRealityControllerDataProviderProfile.cs b/...ets/XRTK.WindowsMixedReality/Profiles/WindowsMixedRealityControllerDataProviderProfile.cs
@@ -0,0 +1,53 @@
+using UnityEngine;
+using XRTK.Attributes;
+using XRTK.Definitions.InputSystem;
+using XRTK.Definitions.Utilities;
+using XRTK.Providers.Controllers;
+
+namespace XRTK.WindowsMixedReality.Profiles
+{
+    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Input System/Controller Data Providers/Windows Mixed Reality", fileName = "WindowsMixedRealityControllerDataProviderProfile", order = (int)CreateProfileMenuItemIndices.Input)]
+    public class WindowsMixedRealityControllerDataProviderProfile : BaseMixedRealityControllerDataProviderProfile
+    {
+        [EnumFlags]
+        [SerializeField]
+        [Tooltip("The recognizable Manipulation Gestures.")]
+        private WindowsGestureSettings manipulationGestures = 0;
+
+        /// <summary>
+        /// The recognizable Manipulation Gestures.
+        /// </summary>
+        public WindowsGestureSettings ManipulationGestures => manipulationGestures;
+
+        [EnumFlags]
+        [SerializeField]
+        [Tooltip("The recognizable Navigation Gestures.")]
+        private WindowsGestureSettings navigationGestures = 0;
+
+        /// <summary>
+        /// The recognizable Navigation Gestures.
+        /// </summary>
+        public WindowsGestureSettings NavigationGestures => navigationGestures;
+
+        [SerializeField]
+        [Tooltip("Should the Navigation use Rails on start?\nNote: This can be changed at runtime to switch between the two Navigation settings.")]
+        private bool useRailsNavigation = false;
+
+        public bool UseRailsNavigation => useRailsNavigation;
+
+        [EnumFlags]
+        [SerializeField]
+        [Tooltip("The recognizable Rails Navigation Gestures.")]
+        private WindowsGestureSettings railsNavigationGestures = 0;
+
+        /// <summary>
+        /// The recognizable Navigation Gestures.
+        /// </summary>
+        public WindowsGestureSettings RailsNavigationGestures => railsNavigationGestures;
+
+        [SerializeField]
+        private AutoStartBehavior windowsGestureAutoStart = AutoStartBehavior.AutoStart;
+
+        public AutoStartBehavior WindowsGestureAutoStart => windowsGestureAutoStart;
+    }
+}
diff --git a/...RTK.WindowsMixedReality/Profiles/WindowsMixedRealityControllerDataProviderProfile.cs.meta b/...RTK.WindowsMixedReality/Profiles/WindowsMixedRealityControllerDataProviderProfile.cs.meta
diff --git a/...ts/XRTK.WindowsMixedReality/Profiles/WindowsMixedRealityMotionControllerMappingProfile.cs b/...ts/XRTK.WindowsMixedReality/Profiles/WindowsMixedRealityMotionControllerMappingProfile.cs
@@ -10,7 +10,7 @@
 
 namespace XRTK.WindowsMixedReality.Profiles
 {
-    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Controller Mappings/Windows Mixed Reality Controller Mapping Profile", fileName = "WindowsMixedRealityControllerMappingProfile")]
+    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Input System/Controller Mappings/Windows Mixed Reality Controller Mapping Profile", fileName = "WindowsMixedRealityControllerMappingProfile")]
     public class WindowsMixedRealityMotionControllerMappingProfile : BaseMixedRealityControllerMappingProfile
     {
         /// <inheritdoc />

diff --git a/...Assets/XRTK.WindowsMixedReality/Profiles/WindowsMixedRealitySpatialMeshObserverProfile.cs b/...Assets/XRTK.WindowsMixedReality/Profiles/WindowsMixedRealitySpatialMeshObserverProfile.cs
@@ -2,10 +2,11 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+using XRTK.Definitions.Utilities;
 using XRTK.Providers.SpatialObservers;
 
 namespace XRTK.WindowsMixedReality.Profiles
 {
-    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Spatial Observers/Windows Mixed Reality Spatial Mesh Data Provider Profile", fileName = "WindowsMixedRealitySpatialMeshObserverProfile")]
+    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Spatial Observers/Windows Mixed Reality Spatial Mesh Data Provider Profile", fileName = "WindowsMixedRealitySpatialMeshObserverProfile", order = (int)CreateProfileMenuItemIndices.SpatialAwarenessDataProviders)]
     public class WindowsMixedRealitySpatialMeshObserverProfile : BaseMixedRealitySpatialMeshObserverProfile { }
 }
diff --git a/...ssets/XRTK.WindowsMixedReality/SpatialObservers/WindowsMixedRealitySpatialMeshObserver.cs b/...ssets/XRTK.WindowsMixedReality/SpatialObservers/WindowsMixedRealitySpatialMeshObserver.cs
@@ -37,12 +37,9 @@ public WindowsMixedRealitySpatialMeshObserver(string name, uint priority, Window
             {
                 UnityEditor.PlayerSettings.WSA.SetCapability(UnityEditor.PlayerSettings.WSACapability.SpatialPerception, true);
             }
-#endif // UNITY_EDITOR
 
+#endif // UNITY_EDITOR
             observer = new SurfaceObserver();
-
-            // Apply the initial observer volume settings.
-            ConfigureObserverVolume(ObserverOrigin, ObservationExtents);
 #endif // UNITY_WSA
         }
 
@@ -168,14 +165,14 @@ void OnDataReady(SurfaceData cookedData, bool outputWritten, float elapsedCookTi
                         return;
                     }
 
-                    if (!SpatialMeshObjects.TryGetValue(cookedData.id.handle, out SpatialMeshObject meshObject))
+                    if (!SpatialMeshObjects.TryGetValue(cookedData.id.handle, out var meshObject))
                     {
                         // Likely it was removed before data could be cooked.
                         return;
                     }
 
                     // Apply the appropriate material to the mesh.
-                    SpatialMeshDisplayOptions displayOption = MeshDisplayOption;
+                    var displayOption = MeshDisplayOption;
 
                     if (displayOption != SpatialMeshDisplayOptions.None)
                     {
@@ -208,7 +205,7 @@ void OnDataReady(SurfaceData cookedData, bool outputWritten, float elapsedCookTi
                     }
                 }
             }
-            else if (SpatialMeshObjects.TryGetValue(surfaceId.handle, out SpatialMeshObject meshObject))
+            else if (SpatialMeshObjects.TryGetValue(surfaceId.handle, out var meshObject))
             {
                 RaiseMeshRemoved(meshObject);
             }

diff --git a/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/XRTK.WindowsMixedReality.asmdef b/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/XRTK.WindowsMixedReality.asmdef
@@ -4,17 +4,12 @@
         "XRTK"
     ],
     "optionalUnityReferences": [],
-    "includePlatforms": [
-        "Editor",
-        "WSA",
-        "WindowsStandalone32",
-        "WindowsStandalone64",
-        "XboxOne"
-    ],
+    "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": []
 }
diff --git a/XRTK.WindowsMixedReality/Packages/manifest.json b/XRTK.WindowsMixedReality/Packages/manifest.json
@@ -3,9 +3,8 @@
     "com.unity.analytics": "3.2.2",
     "com.unity.package-manager-ui": "2.0.7",
     "com.unity.xr.windowsmr.metro": "1.0.8",
-    "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.0",
-    "com.xrtk.sdk": "https://github.com/XRTK/SDK.git#0.1.0",
-    "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.1",
+    "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.2",
+    "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.4",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
@@ -36,5 +35,15 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
+  },
+  "lock": {
+    "com.xrtk.upm-git-extension": {
+      "hash": "869a63adece6138e88881e85f89f7994983db696",
+      "revision": "0.9.4"
+    },
+    "com.xrtk.core": {
+      "hash": "c3e3c8fc9ae3549a1a501d07bff5dc3d857e2c94",
+      "revision": "0.1.2"
+    }
   }
 }
diff --git a/XRTK.WindowsMixedReality/ProjectSettings/ProjectSettings.asset b/XRTK.WindowsMixedReality/ProjectSettings/ProjectSettings.asset
@@ -290,7 +290,7 @@ PlayerSettings:
     m_Automatic: 1
   m_BuildTargetVRSettings:
   - m_BuildTarget: Standalone
-    m_Enabled: 0
+    m_Enabled: 1
     m_Devices:
     - Oculus
     - OpenVR
@@ -535,6 +535,7 @@ PlayerSettings:
   platformArchitecture: {}
   scriptingBackend:
     Metro: 1
+    Standalone: 1
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}

diff --git a/XRTK.WindowsMixedReality/ProjectSettings/ProjectVersion.txt b/XRTK.WindowsMixedReality/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.3.10f1
+m_EditorVersion: 2018.3.11f1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 2018.3.10f1
		m_EditorVersion: 2018.3.11f1