Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Dev/bounding box accessors #60

Merged
merged 15 commits into from
Aug 9, 2019
Merged

Dev/bounding box accessors #60

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6c6fcea
added public accessors for setting bounding box properties.
StephenHodgson Aug 5, 2019
a8edded
show rotate handles if set
StephenHodgson Aug 5, 2019
ff841cc
- Fixed handle visibility when using cardinal axes.
StephenHodgson Aug 6, 2019
3e7bac1
Don't use the offset if the object's position is at zero
StephenHodgson Aug 6, 2019
c09c782
- Ensure we enabled display handles if setting any of the handle disp…
StephenHodgson Aug 6, 2019
2b90bb1
only enable the bounds collider when rig is active
StephenHodgson Aug 6, 2019
823d568
Disable link colliders. We don't need them
StephenHodgson Aug 6, 2019
f29a313
Ignore the manipulation target while we're performing our transform s…
StephenHodgson Aug 6, 2019
282d8c9
removed unused using statement
StephenHodgson Aug 6, 2019
7d2732b
Added spatial mesh visibility options while manipulating an object
StephenHodgson Aug 7, 2019
08e0bc3
revert removal of extensions
StephenHodgson Aug 7, 2019
9f7b881
use the manipulation target to determine the layer
StephenHodgson Aug 7, 2019
f81d804
Merge branch 'dev/bounding-box-layer' into dev/bounding-box-accessors
StephenHodgson Aug 7, 2019
e8d3b64
added pointer offset rotation/scaling to manipulation handler
StephenHodgson Aug 8, 2019
1a6418a
Merge branch 'development' into dev/bounding-box-accessors
StephenHodgson Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion XRTK.SDK/Packages/com.xrtk.sdk/Features/Input/Handlers/ManipulationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ public Vector2 NudgeConstraints

private bool isRotationPossible = false;

private Vector3 offsetPosition = Vector3.zero;

private Vector3 prevPosition = Vector3.zero;

private Vector3 prevScale = Vector3.one;
Expand All @@ -346,7 +348,7 @@ private void Update()
{
if (isBeingHeld)
{
manipulationTarget.position = primaryPointer.Result.Details.Point;
manipulationTarget.position = offsetPosition + primaryPointer.Result.Details.Point;
}

if (isPressed && isNudgePossible && primaryPointer != null)
Expand Down Expand Up @@ -656,6 +658,7 @@ public virtual void BeginHold(MixedRealityPointerEventData eventData)
MixedRealityToolkit.SpatialAwarenessSystem.SetMeshVisibility(SpatialMeshDisplayOptions.Collision);

prevPosition = manipulationTarget.position;
offsetPosition = prevPosition - eventData.Pointer.Result.Details.Point;
prevScale = manipulationTarget.localScale;
prevRotation = manipulationTarget.rotation;

Expand Down
Loading