Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 10:50:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve handle scaling of entity with near-zero dimension

Browse source
This commit is contained in:
David Rowe 2017-09-27 12:04:05 +13:00
parent 0f5adb488c
commit 76889d1b67
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,6 +391,7 @@
initialHandleDistance,
laserOffset,
MIN_SCALE = 0.001,
MIN_SCALE_HANDLE_DISTANCE = 0.0001,
getIntersection, // Function.
intersection,
@ -548,6 +549,7 @@
+ Vec3.dot(Vec3.subtract(otherTargetPosition, Overlays.getProperty(overlayID, "position")), scaleAxis);
initialHandleDistance = Math.abs(Vec3.dot(Vec3.subtract(otherTargetPosition, initialTargetPosition), scaleAxis));
initialHandleDistance -= handleTargetOffset;
initialHandleDistance = Math.max(initialHandleDistance, MIN_SCALE_HANDLE_DISTANCE);
selection.startHandleScaling(initialTargetPosition);
handles.startScaling();
@ -629,6 +631,7 @@
scaleAxis = Vec3.multiplyQbyV(selection.getPositionAndOrientation().orientation, handleUnitScaleAxis);
handleDistance = Vec3.dot(Vec3.subtract(otherTargetPosition, targetPosition), scaleAxis);
handleDistance -= handleTargetOffset;
handleDistance = Math.max(handleDistance, MIN_SCALE_HANDLE_DISTANCE);
// Scale selection relative to initial dimensions.
scale = handleDistance / initialHandleDistance;