Updated XRTK.Core (#10)

* Cherrypicked mouse speed changes

* updated main configuration profile with new camera system settings

* bumped version for breaking changes to camera settings in XRTK.Core 0.1.3

* forgot to update dependency

* updated xrtk version

Author: StephenHodgson

XRTK.SDK/Assets/XRTK.SDK/DefaultProfiles/DefaultMixedRealityToolkitConfigurationProfile.asset

@@ -13,7 +13,9 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityToolkitConfigurationProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
-  enableCameraProfile: 1
+  enableCameraSystem: 1
+  cameraSystemType:
+    reference: XRTK.Services.CameraSystem.MixedRealityCameraSystem, XRTK
   cameraProfile: {fileID: 11400000, guid: 2b0ab6f5348646cebf8585d46c3a3edc, type: 2}
   enableInputSystem: 1
   inputSystemProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}

XRTK.SDK/Assets/XRTK.SDK/Features/UX/Scripts/Pointers/MousePointer.cs

@@ -50,6 +50,13 @@ public class MousePointer : BaseControllerPointer, IMixedRealityMousePointer
         /// <inheritdoc />
         float IMixedRealityMousePointer.HideTimeout => hideTimeout;
 
+        [SerializeField]
+        [Range(0.1f, 1f)]
+        [Tooltip("Mouse cursor speed that gets applied to the mouse delta.")]
+        private float speed = 0.25f;
+
+        float IMixedRealityMousePointer.Speed => speed;
+
         #endregion IMixedRealityMousePointer Implementation
 
         #region IMixedRealityPointer Implementaiton
@@ -78,7 +85,7 @@ public override void OnPreRaycast()
         {
             transform.position = CameraCache.Main.transform.position;
 
-            if (TryGetPointingRay(out Ray pointingRay))
+            if (TryGetPointingRay(out var pointingRay))
             {
                 Rays[0].CopyRay(pointingRay, PointerExtent);
 
@@ -236,9 +243,11 @@ private void Update()
         private void UpdateMousePosition(float mouseX, float mouseY)
         {
             var shouldUpdate = false;
+            var scaledMouseX = mouseX * speed;
+            var scaledMouseY = mouseY * speed;
 
-            if (Mathf.Abs(mouseX) >= movementThresholdToUnHide ||
-                Mathf.Abs(mouseY) >= movementThresholdToUnHide)
+            if (Mathf.Abs(scaledMouseX) >= movementThresholdToUnHide ||
+                Mathf.Abs(scaledMouseY) >= movementThresholdToUnHide)
             {
                 if (isDisabled)
                 {
@@ -256,8 +265,8 @@ private void UpdateMousePosition(float mouseX, float mouseY)
             }
 
             var newRotation = Vector3.zero;
-            newRotation.x += mouseX;
-            newRotation.y += mouseY;
+            newRotation.x += scaledMouseX;
+            newRotation.y += scaledMouseY;
             transform.Rotate(newRotation, Space.World);
         }
     }

XRTK.SDK/Assets/XRTK.SDK/Inspectors/UX/Pointers/MousePointerInspector.cs

@@ -12,6 +12,7 @@ public class MousePointerInspector : BaseControllerPointerInspector
         private SerializedProperty hideCursorWhenInactive;
         private SerializedProperty hideTimeout;
         private SerializedProperty movementThresholdToUnHide;
+        private SerializedProperty speed;
         private bool mousePointerFoldout = true;
 
         protected override void OnEnable()
@@ -22,6 +23,7 @@ protected override void OnEnable()
             hideCursorWhenInactive = serializedObject.FindProperty("hideCursorWhenInactive");
             movementThresholdToUnHide = serializedObject.FindProperty("movementThresholdToUnHide");
             hideTimeout = serializedObject.FindProperty("hideTimeout");
+            speed = serializedObject.FindProperty("speed");
         }
 
         public override void OnInspectorGUI()
@@ -43,6 +45,8 @@ public override void OnInspectorGUI()
                 }
 
                 EditorGUI.indentLevel--;
+
+                EditorGUILayout.PropertyField(speed);
             }
 
             serializedObject.ApplyModifiedProperties();

XRTK.SDK/Assets/XRTK.SDK/package.json

@@ -2,7 +2,7 @@
   "name": "com.xrtk.sdk",
   "displayName": "XRTK.SDK",
   "description": "The SDK for the Mixed Reality Toolkit",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "unity": "2018.3",
   "license": "MIT",
   "repository": {
@@ -12,6 +12,6 @@
   "src": "Assets/XRTK.Core",
   "author": "XRTK Team (https://github.com/XRTK)",
   "dependencies": {
-    "com.xrtk.core": "0.1.2"
+    "com.xrtk.core": "0.1.3"
   }
 }

XRTK.SDK/Packages/manifest.json

@@ -4,7 +4,7 @@
     "com.unity.package-manager-ui": "2.0.7",
     "com.unity.textmeshpro": "1.3.0",
     "com.unity.xr.oculus.standalone": "1.29.1",
-    "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.2",
+    "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.3",
     "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.4",
     "com.xrtk.wmr": "https://github.com/XRTK/WindowsMixedReality.git#0.1.1",
     "com.unity.modules.ai": "1.0.0",
@@ -44,8 +44,8 @@
       "revision": "0.9.4"
     },
     "com.xrtk.core": {
-      "hash": "c3e3c8fc9ae3549a1a501d07bff5dc3d857e2c94",
-      "revision": "0.1.2"
+      "hash": "6b85982fd9d9f6f44d46074e8956b3d53ce2a48e",
+      "revision": "0.1.3"
     },
     "com.xrtk.wmr": {
       "hash": "590a21635dff21d93fd8dd14e66fcdd0424cf63d",