Fix positioning after teleport

XRTK · Jun 15, 2020 · ee89d8c · ee89d8c
1 parent 3006e53
commit ee89d8c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/XRTK.Oculus/Packages/com.xrtk.oculus/Runtime/Utilities/OculusHandDataConverter.cs b/XRTK.Oculus/Packages/com.xrtk.oculus/Runtime/Utilities/OculusHandDataConverter.cs
@@ -304,8 +304,8 @@ private Transform GetProxyTransform(Handedness handedness, OculusApi.BoneId bone
         private MixedRealityPose GetHandRootPose(Handedness handedness)
         {
             var playspaceTransform = MixedRealityToolkit.CameraSystem.MainCameraRig.PlayspaceTransform;
-            var rootPosition = playspaceTransform.InverseTransformPoint(handState.RootPose.Position.FromFlippedZVector3f());
-            var rootRotation = Quaternion.Inverse(playspaceTransform.rotation) * handState.RootPose.Orientation.FromFlippedZQuatf();
+            var rootPosition = playspaceTransform.InverseTransformPoint(playspaceTransform.position + playspaceTransform.rotation * handState.RootPose.Position.FromFlippedZVector3f());
+            var rootRotation = Quaternion.Inverse(playspaceTransform.rotation) * playspaceTransform.rotation * handState.RootPose.Orientation.FromFlippedZQuatf();
 
             return FixRotation(handedness, new MixedRealityPose(rootPosition + new Vector3(0f, OculusApi.EyeHeight, 0f), rootRotation));
         }
@@ -322,7 +322,7 @@ private MixedRealityPose GetPointerPose(Handedness handedness)
             var platformRootPosition = handState.RootPose.Position.FromFlippedZVector3f();
 
             var platformPointerPosition = rootPose.Position + handState.PointerPose.Position.FromFlippedZVector3f() - platformRootPosition;
-            var platformPointerRotation = Quaternion.Inverse(playspaceTransform.rotation) * handState.PointerPose.Orientation.FromFlippedZQuatf();
+            var platformPointerRotation = Quaternion.Inverse(playspaceTransform.rotation) * playspaceTransform.rotation * handState.PointerPose.Orientation.FromFlippedZQuatf();
 
             return new MixedRealityPose(platformPointerPosition, platformPointerRotation);
         }