Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

Commit

Permalink
cleaned up wmr controller a bit (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
@StephenHodgson
StephenHodgson authored May 22, 2020
1 parent b951cbc commit 173eef1
Showing 1 changed file with 57 additions and 71 deletions.
128 changes: 57 additions & 71 deletions ...xrtk.wmr/Runtime/Providers/InputSystem/Controllers/WindowsMixedRealityMotionController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,26 +231,26 @@ private void UpdateGripData(InteractionSourceState interactionSourceState, Mixed
switch (interactionMapping.AxisType)
{
case AxisType.SixDof:
interactionSourceState.sourcePose.TryGetPosition(out currentGripPosition, InteractionSourceNode.Grip);
interactionSourceState.sourcePose.TryGetRotation(out currentGripRotation);

var cameraRig = MixedRealityToolkit.CameraSystem?.MainCameraRig;

if (cameraRig != null &&
cameraRig.PlayspaceTransform != null)
{
interactionSourceState.sourcePose.TryGetPosition(out currentGripPosition, InteractionSourceNode.Grip);
interactionSourceState.sourcePose.TryGetRotation(out currentGripRotation, InteractionSourceNode.Grip);

var cameraRig = MixedRealityToolkit.CameraSystem?.MainCameraRig;

if (cameraRig != null &&
cameraRig.PlayspaceTransform != null)
{
currentGripPose.Position = cameraRig.PlayspaceTransform.TransformPoint(currentGripPosition);
currentGripPose.Rotation = Quaternion.Euler(cameraRig.PlayspaceTransform.TransformDirection(currentGripRotation.eulerAngles));
}
else
{
currentGripPose.Position = currentGripPosition;
currentGripPose.Rotation = currentGripRotation;
}

interactionMapping.PoseData = currentGripPose;
currentGripPose.Position = cameraRig.PlayspaceTransform.TransformPoint(currentGripPosition);
currentGripPose.Rotation =
Quaternion.Euler(
cameraRig.PlayspaceTransform.TransformDirection(currentGripRotation.eulerAngles));
}
else
{
currentGripPose.Position = currentGripPosition;
currentGripPose.Rotation = currentGripRotation;
}

interactionMapping.PoseData = currentGripPose;
break;
}
}
Expand All @@ -265,20 +265,14 @@ private void UpdateTouchPadData(InteractionSourceState interactionSourceState, M
switch (interactionMapping.InputType)
{
case DeviceInputType.TouchpadTouch:
{
interactionMapping.BoolData = interactionSourceState.touchpadTouched;
break;
}
interactionMapping.BoolData = interactionSourceState.touchpadTouched;
break;
case DeviceInputType.TouchpadPress:
{
interactionMapping.BoolData = interactionSourceState.touchpadPressed;
break;
}
interactionMapping.BoolData = interactionSourceState.touchpadPressed;
break;
case DeviceInputType.Touchpad:
{
interactionMapping.Vector2Data = interactionSourceState.touchpadPosition;
break;
}
interactionMapping.Vector2Data = interactionSourceState.touchpadPosition;
break;
}
}

Expand All @@ -292,15 +286,11 @@ private void UpdateThumbStickData(InteractionSourceState interactionSourceState,
switch (interactionMapping.InputType)
{
case DeviceInputType.ThumbStickPress:
{
interactionMapping.BoolData = interactionSourceState.thumbstickPressed;
break;
}
interactionMapping.BoolData = interactionSourceState.thumbstickPressed;
break;
case DeviceInputType.ThumbStick:
{
interactionMapping.Vector2Data = interactionSourceState.thumbstickPosition;
break;
}
interactionMapping.Vector2Data = interactionSourceState.thumbstickPosition;
break;
}
}

Expand All @@ -315,45 +305,41 @@ private void UpdateTriggerData(InteractionSourceState interactionSourceState, Mi
{
case DeviceInputType.TriggerPress:
interactionMapping.BoolData = interactionSourceState.grasped;
Debug.Log($"{interactionMapping.Description}:{interactionMapping.BoolData}:{interactionMapping.MixedRealityInputAction.Description}:{interactionSourceState.grasped}");
break;
case DeviceInputType.Select:
bool selectPressed = interactionSourceState.selectPressed;
Debug.Log($"{interactionMapping.Description}:{interactionMapping.BoolData}:{interactionMapping.MixedRealityInputAction.Description}:{interactionSourceState.selectPressed}");

// BEGIN WORKAROUND: Unity issue #1033526
// See https://issuetracker.unity3d.com/issues/hololens-interactionsourcestate-dot-selectpressed-is-false-when-air-tap-and-hold
// Bug was discovered May 2018 and still exists as of today Feb 2019 in version 2018.3.4f1, timeline for fix is unknown
// The bug only affects the development workflow via Holographic Remoting or Simulation
if (interactionSourceState.source.kind == InteractionSourceKind.Hand)
{
bool selectPressed = interactionSourceState.selectPressed;

// BEGIN WORKAROUND: Unity issue #1033526
// See https://issuetracker.unity3d.com/issues/hololens-interactionsourcestate-dot-selectpressed-is-false-when-air-tap-and-hold
// Bug was discovered May 2018 and still exists as of today Feb 2019 in version 2018.3.4f1, timeline for fix is unknown
// The bug only affects the development workflow via Holographic Remoting or Simulation
if (interactionSourceState.source.kind == InteractionSourceKind.Hand)
{
Debug.Assert(!(UnityEngine.XR.WSA.HolographicRemoting.ConnectionState == UnityEngine.XR.WSA.HolographicStreamerConnectionState.Connected
&& interactionSourceState.selectPressed),
"Unity issue #1033526 seems to have been resolved. Please remove this ugly workaround!");

// This workaround is safe as long as all these assumptions hold:
Debug.Assert(!interactionSourceState.source.supportsGrasp);
Debug.Assert(!interactionSourceState.source.supportsMenu);
Debug.Assert(!interactionSourceState.source.supportsPointing);
Debug.Assert(!interactionSourceState.source.supportsThumbstick);
Debug.Assert(!interactionSourceState.source.supportsTouchpad);

selectPressed = interactionSourceState.anyPressed;
}
// END WORKAROUND: Unity issue #1033526

interactionMapping.BoolData = selectPressed;
break;
Debug.Assert(!(UnityEngine.XR.WSA.HolographicRemoting.ConnectionState == UnityEngine.XR.WSA.HolographicStreamerConnectionState.Connected
&& interactionSourceState.selectPressed),
"Unity issue #1033526 seems to have been resolved. Please remove this ugly workaround!");

// This workaround is safe as long as all these assumptions hold:
Debug.Assert(!interactionSourceState.source.supportsGrasp);
Debug.Assert(!interactionSourceState.source.supportsMenu);
Debug.Assert(!interactionSourceState.source.supportsPointing);
Debug.Assert(!interactionSourceState.source.supportsThumbstick);
Debug.Assert(!interactionSourceState.source.supportsTouchpad);

selectPressed = interactionSourceState.anyPressed;
}
// END WORKAROUND: Unity issue #1033526

interactionMapping.BoolData = selectPressed;
break;
case DeviceInputType.Trigger:
{
interactionMapping.FloatData = interactionSourceState.selectPressedAmount;
break;
}
interactionMapping.FloatData = interactionSourceState.selectPressedAmount;
break;
case DeviceInputType.TriggerTouch:
{
interactionMapping.BoolData = interactionSourceState.selectPressedAmount > 0;
break;
}
interactionMapping.BoolData = interactionSourceState.selectPressedAmount > 0;
break;
}
}

Expand Down

0 comments on commit 173eef1

Please sign in to comment.