Merge pull request #9384 from microsoft/prerelease/2.6.0_stabilization

Branch synchronization: prerelease/2.6.0_stabilization --> mrtk_development

Author: keveleigh

Assets/MRTK/Examples/Demos/Input/Scenes/InputActions/InputActions.MixedRealityInputSimulationProfile.asset

@@ -34,7 +34,7 @@ MonoBehaviour:
   currentControlMode: 0
   fastControlKey:
     bindingType: 2
-    code: 305
+    code: 303
   controlSlowSpeed: 1
   controlFastSpeed: 5
   moveHorizontal: Horizontal

Assets/MRTK/Examples/Demos/Input/Scenes/PrimaryPointer/PrimaryPointerHandlerExample.cs

@@ -24,7 +24,19 @@ private void OnPrimaryPointerChanged(IMixedRealityPointer oldPointer, IMixedReal
             {
                 if (newPointer != null)
                 {
-                    Transform parentTransform = newPointer.BaseCursor.TryGetMonoBehaviour(out MonoBehaviour baseCursor) ? baseCursor.transform : null;
+                    Transform parentTransform = null;
+
+                    // For this example scene, use special logic if a GGVPointer becomes the primary pointer. 
+                    // In particular, the GGV pointer defers its cursor management to the GazeProvider, which has its own internal pointer definition as well
+                    // In the future, the pointer/cursor relationship will be reworked and standardized to remove this awkward set of co-dependencies
+                    if (newPointer is GGVPointer)
+                    {
+                        parentTransform = CoreServices.InputSystem.GazeProvider.GazePointer.BaseCursor.TryGetMonoBehaviour(out MonoBehaviour baseCursor) ? baseCursor.transform : null;
+                    }
+                    else
+                    {
+                        parentTransform = newPointer.BaseCursor.TryGetMonoBehaviour(out MonoBehaviour baseCursor) ? baseCursor.transform : null;
+                    }
 
                     // If there's no cursor try using the controller pointer transform instead
                     if (parentTransform == null)

Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManager.cs

@@ -46,7 +46,7 @@ public OculusXRSDKDeviceManager(
         public override void Initialize()
         {
             base.Initialize();
-            Debug.Log(@"Detected a potential deployment issue for the Oculus Quest. In order to use hand tracking with the Oculus Quest, download the Oculus Integration Package from the Unity Asset Store and run the Integration tool before deploying.
+            UnityEngine.Debug.Log(@"Detected a potential deployment issue for the Oculus Quest. In order to use hand tracking with the Oculus Quest, download the Oculus Integration Package from the Unity Asset Store and run the Integration tool before deploying.
 The tool can be found under <i>Mixed Reality Toolkit > Utilities > Oculus > Integrate Oculus Integration Unity Modules</i>");
         }
 #endif

Assets/MRTK/Providers/WindowsMixedReality/Shared/BaseWindowsMixedRealityCameraSettings.cs

@@ -141,7 +141,7 @@ private void UninitializeReprojectionUpdater()
         /// </summary>
         private void InitializeProjectionOverride()
         {
-            if (reprojectionUpdater == null && Profile != null && Profile.ReadingModeEnabled)
+            if (projectionOverride == null && Profile != null && Profile.ReadingModeEnabled)
             {
                 projectionOverride = CameraCache.Main.EnsureComponent<ProjectionOverride>();
                 projectionOverride.ReadingModeEnabled = Profile.ReadingModeEnabled;

Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs

@@ -784,7 +784,7 @@ private void Update()
                 // also only use proximity effect if nothing is being dragged or grabbed
                 if (!wireframeOnly && currentPointer == null)
                 {
-                    proximityEffect.UpdateScaling(Vector3.Scale(TargetBounds.center, TargetBounds.gameObject.transform.lossyScale) + Target.transform.position, currentBoundsExtents);
+                    proximityEffect.UpdateScaling(TargetBounds.transform.TransformPoint(TargetBounds.center), currentBoundsExtents);
                 }
             }
         }