Skip to content

Commit 3b9e4cd

Browse files
Merge pull request #1177 from StephenHodgson/MRTK-InputUpdateHotfix
Properly supports Hand position and Fixed HandDraggable
2 parents e060fbb + 07ae810 commit 3b9e4cd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ private void UpdateSourceData(InteractionSourceState interactionSourceState, Sou
622622
#if UNITY_2017_2_OR_NEWER
623623
interactionSourceState.sourcePose.TryGetPosition(out newPointerPosition, InteractionSourceNode.Pointer);
624624
#else
625-
false;
625+
interactionSourceState.properties.location.TryGetPosition(out newPointerPosition);
626626
#endif
627627
// Using a heuristic for IsSupported, since the APIs don't yet support querying this capability directly.
628628
sourceData.PointerPosition.IsSupported |= sourceData.PointerPosition.IsAvailable;

Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/HandDraggable.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void StartDragging(Vector3 initialDraggingPosition)
118118

119119
Transform cameraTransform = CameraCache.Main.transform;
120120
Vector3 handPosition;
121-
currentInputSource.TryGetGripPosition(currentInputSourceId, out handPosition);
121+
currentInputSource.TryGetPointerPosition(currentInputSourceId, out handPosition);
122122

123123
Vector3 pivotPosition = GetHandPivotPosition(cameraTransform);
124124
handRefDistance = Vector3.Magnitude(handPosition - pivotPosition);
@@ -183,7 +183,7 @@ private void UpdateDragging()
183183
{
184184
Vector3 newHandPosition;
185185
Transform cameraTransform = CameraCache.Main.transform;
186-
currentInputSource.TryGetGripPosition(currentInputSourceId, out newHandPosition);
186+
currentInputSource.TryGetPointerPosition(currentInputSourceId, out newHandPosition);
187187

188188
Vector3 pivotPosition = GetHandPivotPosition(cameraTransform);
189189

0 commit comments

Comments
 (0)