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

scale invertly once passing minimum

Browse source
This commit is contained in:
David Back 2018-09-06 16:04:59 -07:00
parent 434e840167
commit 3d75d4726a
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/system/libraries/entitySelectionTool.js
View file

@ -2283,39 +2283,25 @@ SelectionDisplay = (function() {
var changeInDimensions = Vec3.multiply(NEGATE_VECTOR, vec3Mult(localSigns, vector));
var newDimensions;
if (proportional) {
var viewportDimensions = Controller.getViewportDimensions();
var mouseXDifference = (event.x - beginMouseEvent.x) / viewportDimensions.x;
var mouseYDifference = (beginMouseEvent.y - event.y) / viewportDimensions.y;
var mouseDifference = mouseXDifference + mouseYDifference;
changeInDimensions = { x:mouseDifference, y:mouseDifference, z:mouseDifference };
var toCameraDistance = getDistanceToCamera(position);
var dimensionsMultiple = toCameraDistance * STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE;
changeInDimensions = Vec3.multiply(changeInDimensions, dimensionsMultiple);
}
var newDimensions;
if (proportional) {
var absoluteX = Math.abs(changeInDimensions.x);
var absoluteY = Math.abs(changeInDimensions.y);
var absoluteZ = Math.abs(changeInDimensions.z);
var percentChange = 0;
if (absoluteX > absoluteY && absoluteX > absoluteZ) {
percentChange = changeInDimensions.x / initialProperties.dimensions.x;
percentChange = changeInDimensions.x / initialDimensions.x;
} else if (absoluteY > absoluteZ) {
percentChange = changeInDimensions.y / initialProperties.dimensions.y;
percentChange = changeInDimensions.y / initialDimensions.y;
} else {
percentChange = changeInDimensions.z / initialProperties.dimensions.z;
percentChange = changeInDimensions.z / initialDimensions.z;
}
var dimensionChange = mouseDifference * dimensionsMultiple;
percentChange = dimensionChange / initialDimensions.z;
percentChange += 1.0;
newDimensions = Vec3.multiply(percentChange, initialDimensions);
newDimensions.x = Math.abs(newDimensions.x);
newDimensions.y = Math.abs(newDimensions.y);
newDimensions.z = Math.abs(newDimensions.z);
} else {
newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
}
var minimumDimension = directionEnum ===
STRETCH_DIRECTION.ALL ? STRETCH_ALL_MINIMUM_DIMENSION : STRETCH_MINIMUM_DIMENSION;
if (newDimensions.x < minimumDimension) {