Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 11:32:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Alternative, more robust handle scaling method

Browse source
This commit is contained in:
David Rowe 2017-09-27 19:21:07 +13:00
parent 6b3b2beae0
commit e623b1e0a5
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/vr-edit/vr-edit.js
View file

@ -388,6 +388,7 @@
handleUnitScaleAxis,
handleScaleDirections,
handleTargetOffset,
initialHandToTargetOffset,
initialHandleDistance,
laserOffset,
MIN_SCALE = 0.001,
@ -539,8 +540,12 @@
isScalingWithHand = intersection.handIntersected;
// Grab center of selection.
otherTargetPosition = targetPosition;
initialTargetPosition = getScaleTargetPosition();
initialTargetPosition = selection.boundingBox().center;
initialHandToTargetOffset = Vec3.subtract(initialTargetPosition, hand.position());
// Initial handle offset from center of selection.
selectionPositionAndOrientation = selection.getPositionAndOrientation();
handleUnitScaleAxis = handles.scalingAxis(overlayID); // Unit vector in direction of scaling.
handleScaleDirections = handles.scalingDirections(overlayID); // Which axes to scale the selection on.
@ -551,6 +556,7 @@
initialHandleDistance -= handleTargetOffset;
initialHandleDistance = Math.max(initialHandleDistance, MIN_SCALE_HANDLE_DISTANCE);
// Start scaling.
selection.startHandleScaling(initialTargetPosition);
handles.startScaling();
isHandleScaling = true;
@ -626,8 +632,10 @@
deltaHandOrientation = Quat.multiply(hand.orientation(), initialHandOrientationInverse);
selectionOrientation = Quat.multiply(deltaHandOrientation, initialSelectionOrientation);
// Position selection per grabbing hand.
targetPosition = Vec3.sum(hand.position(), Vec3.multiplyQbyV(deltaHandOrientation, initialHandToTargetOffset));
// Desired distance of handle from other hand
targetPosition = getScaleTargetPosition();
scaleAxis = Vec3.multiplyQbyV(selection.getPositionAndOrientation().orientation, handleUnitScaleAxis);
handleDistance = Vec3.dot(Vec3.subtract(otherTargetPosition, targetPosition), scaleAxis);
handleDistance -= handleTargetOffset;