Skip to content

Commit b1d09db

Browse files
reverted a name change
1 parent 0633e2e commit b1d09db

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

Assets/MixedRealityToolkit/InputSystem/Cursors/BaseCursor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,9 @@ protected virtual void UpdateCursorTransform()
353353
// If no modifier is on the target, just use the hit result to set cursor position
354354
// Get the look forward by using distance between pointer origin and target position
355355
// (This may not be strictly accurate for extremely wobbly pointers, but it should produce usable results)
356-
float distanceToTarget = Vector3.Distance(Pointer.Rays[0].Origin, focusDetails.Origin);
356+
float distanceToTarget = Vector3.Distance(Pointer.Rays[0].Origin, focusDetails.Point);
357357
lookForward = -RayStep.GetDirectionByDistance(Pointer.Rays, distanceToTarget);
358-
targetPosition = focusDetails.Origin + (lookForward * surfaceCursorDistance);
358+
targetPosition = focusDetails.Point + (lookForward * surfaceCursorDistance);
359359
Vector3 lookRotation = Vector3.Slerp(focusDetails.Normal, lookForward, lookRotationBlend);
360360
targetRotation = Quaternion.LookRotation(lookRotation == Vector3.zero ? lookForward : lookRotation, Vector3.up);
361361
}

Assets/MixedRealityToolkit/InputSystem/Cursors/CursorModifier.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public Vector3 GetModifiedPosition(IMixedRealityCursor cursor)
163163
if (inputSystem.FocusProvider.TryGetFocusDetails(cursor.Pointer, out focusDetails))
164164
{
165165
// Else, consider the modifiers on the cursor modifier, but don't snap
166-
return focusDetails.Origin + HostTransform.TransformVector(CursorOffset);
166+
return focusDetails.Point + HostTransform.TransformVector(CursorOffset);
167167
}
168168

169169
return Vector3.zero;

Assets/MixedRealityToolkit/InputSystem/Focus/FocusProvider.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void UpdateHit(RaycastHit hit, RayStep sourceRay, int rayStepIndex)
148148
StartPoint = sourceRay.Origin;
149149

150150
focusDetails.LastRaycastHit = hit;
151-
focusDetails.Origin = hit.point;
151+
focusDetails.Point = hit.point;
152152
focusDetails.Normal = hit.normal;
153153
focusDetails.Object = hit.transform.gameObject;
154154
Details = focusDetails;
@@ -163,7 +163,7 @@ public void UpdateHit(RaycastResult result, RaycastHit hit, RayStep sourceRay, i
163163
RayStepIndex = rayStepIndex;
164164
StartPoint = sourceRay.Origin;
165165

166-
focusDetails.Origin = hit.point;
166+
focusDetails.Point = hit.point;
167167
focusDetails.Normal = hit.normal;
168168
focusDetails.Object = result.gameObject;
169169
Details = focusDetails;
@@ -179,7 +179,7 @@ public void UpdateHit()
179179

180180
StartPoint = firstStep.Origin;
181181

182-
focusDetails.Origin = finalStep.Terminus;
182+
focusDetails.Point = finalStep.Terminus;
183183
focusDetails.Normal = -finalStep.Direction;
184184
focusDetails.Object = null;
185185
Details = focusDetails;
@@ -193,7 +193,7 @@ public void ResetFocusedObjects(bool clearPreviousObject = true)
193193
PreviousPointerTarget = null;
194194
}
195195

196-
focusDetails.Origin = Details.Origin;
196+
focusDetails.Point = Details.Point;
197197
focusDetails.Normal = Details.Normal;
198198
focusDetails.Object = null;
199199
Details = focusDetails;
@@ -511,7 +511,7 @@ private void UpdatePointers()
511511
rayColor = Color.green;
512512
}
513513

514-
Debug.DrawRay(pointer.StartPoint, (pointer.Details.Origin - pointer.StartPoint), rayColor);
514+
Debug.DrawRay(pointer.StartPoint, (pointer.Details.Point - pointer.StartPoint), rayColor);
515515
}
516516
}
517517
}
@@ -632,7 +632,7 @@ private static void RaycastPhysics(PointerData pointer, LayerMask[] prioritizedL
632632
/// <param name="prioritizedLayerMasks"></param>
633633
private void RaycastGraphics(PointerData pointer, LayerMask[] prioritizedLayerMasks)
634634
{
635-
Debug.Assert(pointer.Details.Origin != Vector3.zero, "Invalid pointer source start point found to raycast from!");
635+
Debug.Assert(pointer.Details.Point != Vector3.zero, "Invalid pointer source start point found to raycast from!");
636636
Debug.Assert(UIRaycastCamera != null, "You must assign a UIRaycastCamera on the FocusProvider before you can process uGUI raycasting.");
637637

638638
RaycastResult raycastResult = default(RaycastResult);

Assets/MixedRealityToolkit/InputSystem/Gaze/GazeProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public override void OnPostRaycast()
179179

180180
if (Result.Details.Object != null)
181181
{
182-
gazeProvider.lastHitDistance = (Result.Details.Origin - Rays[0].Origin).magnitude;
182+
gazeProvider.lastHitDistance = (Result.Details.Point - Rays[0].Origin).magnitude;
183183
gazeProvider.HitPosition = Rays[0].Origin + (gazeProvider.lastHitDistance * Rays[0].Direction);
184184
gazeProvider.HitNormal = Result.Details.Normal;
185185
}

Assets/MixedRealityToolkit/InputSystem/Utilities/HandDraggable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ void IMixedRealityPointerHandler.OnPointerDown(MixedRealityPointerEventData even
317317

318318
FocusDetails focusDetails;
319319
Vector3 initialDraggingPosition = inputSystem.FocusProvider.TryGetFocusDetails(eventData, out focusDetails)
320-
? focusDetails.Origin
320+
? focusDetails.Point
321321
: hostTransform.position;
322322

323323
StartDragging(initialDraggingPosition);

Assets/MixedRealityToolkit/_Core/Definitions/Physics/FocusDetails.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ namespace Microsoft.MixedReality.Toolkit.Internal.Definitions.Physics
1414
public struct FocusDetails
1515
{
1616
/// <summary>
17-
/// The origin of the raycast.
17+
/// The hit point of the raycast.
1818
/// </summary>
19-
public Vector3 Origin;
19+
public Vector3 Point;
2020

2121
/// <summary>
2222
/// The normal of the raycast.

0 commit comments

Comments
 (0)