Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 20:32:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR changes

Browse source
This commit is contained in:
unknown 2018-09-10 16:09:21 -07:00
parent 17c3163264
commit 1ad3a09984
1 changed files with 73 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -410,7 +410,7 @@ SelectionDisplay = (function() {
var COLOR_RED = { red: 226, green: 51, blue: 77 }; var COLOR_RED = { red: 226, green: 51, blue: 77 };
var COLOR_HOVER = { red: 227, green: 227, blue: 227 }; var COLOR_HOVER = { red: 227, green: 227, blue: 227 };
var COLOR_ROTATE_CURRENT_RING = { red: 255, green: 99, blue: 9 }; var COLOR_ROTATE_CURRENT_RING = { red: 255, green: 99, blue: 9 };
var COLOR_SCALE_EDGE = { red: 87, green: 87, blue: 87 }; var COLOR_BOUNDING_EDGE = { red: 87, green: 87, blue: 87 };
var COLOR_SCALE_CUBE = { red: 106, green: 106, blue: 106 }; var COLOR_SCALE_CUBE = { red: 106, green: 106, blue: 106 };
var COLOR_SCALE_CUBE_SELECTED = { red: 18, green: 18, blue: 18 }; var COLOR_SCALE_CUBE_SELECTED = { red: 18, green: 18, blue: 18 };
@ -440,7 +440,7 @@ SelectionDisplay = (function() {
var STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE = 2; var STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE = 2;
var STRETCH_PANEL_WIDTH = 0.01; var STRETCH_PANEL_WIDTH = 0.01;
var SCALE_EDGE_OFFSET = 0.5; var BOUNDING_EDGE_OFFSET = 0.5;
var SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.02; var SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.02;
var CLONER_OFFSET = { x: 0.9, y: -0.9, z: 0.9 }; var CLONER_OFFSET = { x: 0.9, y: -0.9, z: 0.9 };
@ -629,26 +629,26 @@ SelectionDisplay = (function() {
borderSize: 1.4 borderSize: 1.4
}); });
var handlePropertiesScaleEdge = { var handlePropertiesBoundingEdge = {
alpha: 1, alpha: 1,
color: COLOR_SCALE_EDGE, color: COLOR_BOUNDING_EDGE,
visible: false, visible: false,
ignoreRayIntersection: true, ignoreRayIntersection: true,
drawInFront: true, drawInFront: true,
lineWidth: 0.2 lineWidth: 0.2
}; };
var handleScaleTREdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingTREdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleTLEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingTLEdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleTFEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingTFEdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleTNEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingTNEdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleBREdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingBREdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleBLEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingBLEdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleBFEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingBFEdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleBNEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingBNEdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleNREdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingNREdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleNLEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingNLEdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleFREdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingFREdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleScaleFLEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge); var handleBoundingFLEdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
var handleCloner = Overlays.addOverlay("cube", { var handleCloner = Overlays.addOverlay("cube", {
alpha: 1, alpha: 1,
@ -736,18 +736,18 @@ SelectionDisplay = (function() {
handleStretchYPanel, handleStretchYPanel,
handleStretchZPanel, handleStretchZPanel,
handleScaleCube, handleScaleCube,
handleScaleTREdge, handleBoundingTREdge,
handleScaleTLEdge, handleBoundingTLEdge,
handleScaleTFEdge, handleBoundingTFEdge,
handleScaleTNEdge, handleBoundingTNEdge,
handleScaleBREdge, handleBoundingBREdge,
handleScaleBLEdge, handleBoundingBLEdge,
handleScaleBFEdge, handleBoundingBFEdge,
handleScaleBNEdge, handleBoundingBNEdge,
handleScaleNREdge, handleBoundingNREdge,
handleScaleNLEdge, handleBoundingNLEdge,
handleScaleFREdge, handleBoundingFREdge,
handleScaleFLEdge, handleBoundingFLEdge,
handleCloner, handleCloner,
selectionBox, selectionBox,
iconSelectionBox, iconSelectionBox,
@ -780,18 +780,18 @@ SelectionDisplay = (function() {
overlayNames[handleScaleCube] = "handleScaleCube"; overlayNames[handleScaleCube] = "handleScaleCube";
overlayNames[handleScaleTREdge] = "handleScaleTREdge"; overlayNames[handleBoundingTREdge] = "handleBoundingTREdge";
overlayNames[handleScaleTLEdge] = "handleScaleTLEdge"; overlayNames[handleBoundingTLEdge] = "handleBoundingTLEdge";
overlayNames[handleScaleTFEdge] = "handleScaleTFEdge"; overlayNames[handleBoundingTFEdge] = "handleBoundingTFEdge";
overlayNames[handleScaleTNEdge] = "handleScaleTNEdge"; overlayNames[handleBoundingTNEdge] = "handleBoundingTNEdge";
overlayNames[handleScaleBREdge] = "handleScaleBREdge"; overlayNames[handleBoundingBREdge] = "handleBoundingBREdge";
overlayNames[handleScaleBLEdge] = "handleScaleBLEdge"; overlayNames[handleBoundingBLEdge] = "handleBoundingBLEdge";
overlayNames[handleScaleBFEdge] = "handleScaleBFEdge"; overlayNames[handleBoundingBFEdge] = "handleBoundingBFEdge";
overlayNames[handleScaleBNEdge] = "handleScaleBNEdge"; overlayNames[handleBoundingBNEdge] = "handleBoundingBNEdge";
overlayNames[handleScaleNREdge] = "handleScaleNREdge"; overlayNames[handleBoundingNREdge] = "handleBoundingNREdge";
overlayNames[handleScaleNLEdge] = "handleScaleNLEdge"; overlayNames[handleBoundingNLEdge] = "handleBoundingNLEdge";
overlayNames[handleScaleFREdge] = "handleScaleFREdge"; overlayNames[handleBoundingFREdge] = "handleBoundingFREdge";
overlayNames[handleScaleFLEdge] = "handleScaleFLEdge"; overlayNames[handleBoundingFLEdge] = "handleBoundingFLEdge";
overlayNames[handleCloner] = "handleCloner"; overlayNames[handleCloner] = "handleCloner";
overlayNames[selectionBox] = "selectionBox"; overlayNames[selectionBox] = "selectionBox";
@ -1405,10 +1405,10 @@ SelectionDisplay = (function() {
dimensions: scaleCubeDimensions dimensions: scaleCubeDimensions
}); });
// UPDATE SCALE EDGES // UPDATE BOUNDING BOX EDGES
var edgeOffsetX = SCALE_EDGE_OFFSET * dimensions.x; var edgeOffsetX = BOUNDING_EDGE_OFFSET * dimensions.x;
var edgeOffsetY = SCALE_EDGE_OFFSET * dimensions.y; var edgeOffsetY = BOUNDING_EDGE_OFFSET * dimensions.y;
var edgeOffsetZ = SCALE_EDGE_OFFSET * dimensions.z; var edgeOffsetZ = BOUNDING_EDGE_OFFSET * dimensions.z;
var LBNPosition = { x: -edgeOffsetX, y: -edgeOffsetY, z: -edgeOffsetZ }; var LBNPosition = { x: -edgeOffsetX, y: -edgeOffsetY, z: -edgeOffsetZ };
LBNPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, LBNPosition)); LBNPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, LBNPosition));
var RBNPosition = { x: edgeOffsetX, y: -edgeOffsetY, z: -edgeOffsetZ }; var RBNPosition = { x: edgeOffsetX, y: -edgeOffsetY, z: -edgeOffsetZ };
@ -1425,18 +1425,18 @@ SelectionDisplay = (function() {
LTFPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, LTFPosition)); LTFPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, LTFPosition));
var RTFPosition = { x: edgeOffsetX, y: edgeOffsetY, z: edgeOffsetZ }; var RTFPosition = { x: edgeOffsetX, y: edgeOffsetY, z: edgeOffsetZ };
RTFPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, RTFPosition)); RTFPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, RTFPosition));
Overlays.editOverlay(handleScaleTREdge, { start: RTNPosition, end: RTFPosition }); Overlays.editOverlay(handleBoundingTREdge, { start: RTNPosition, end: RTFPosition });
Overlays.editOverlay(handleScaleTLEdge, { start: LTNPosition, end: LTFPosition }); Overlays.editOverlay(handleBoundingTLEdge, { start: LTNPosition, end: LTFPosition });
Overlays.editOverlay(handleScaleTFEdge, { start: LTFPosition, end: RTFPosition }); Overlays.editOverlay(handleBoundingTFEdge, { start: LTFPosition, end: RTFPosition });
Overlays.editOverlay(handleScaleTNEdge, { start: LTNPosition, end: RTNPosition }); Overlays.editOverlay(handleBoundingTNEdge, { start: LTNPosition, end: RTNPosition });
Overlays.editOverlay(handleScaleBREdge, { start: RBNPosition, end: RBFPosition }); Overlays.editOverlay(handleBoundingBREdge, { start: RBNPosition, end: RBFPosition });
Overlays.editOverlay(handleScaleBLEdge, { start: LBNPosition, end: LBFPosition }); Overlays.editOverlay(handleBoundingBLEdge, { start: LBNPosition, end: LBFPosition });
Overlays.editOverlay(handleScaleBFEdge, { start: LBFPosition, end: RBFPosition }); Overlays.editOverlay(handleBoundingBFEdge, { start: LBFPosition, end: RBFPosition });
Overlays.editOverlay(handleScaleBNEdge, { start: LBNPosition, end: RBNPosition }); Overlays.editOverlay(handleBoundingBNEdge, { start: LBNPosition, end: RBNPosition });
Overlays.editOverlay(handleScaleNREdge, { start: RTNPosition, end: RBNPosition }); Overlays.editOverlay(handleBoundingNREdge, { start: RTNPosition, end: RBNPosition });
Overlays.editOverlay(handleScaleNLEdge, { start: LTNPosition, end: LBNPosition }); Overlays.editOverlay(handleBoundingNLEdge, { start: LTNPosition, end: LBNPosition });
Overlays.editOverlay(handleScaleFREdge, { start: RTFPosition, end: RBFPosition }); Overlays.editOverlay(handleBoundingFREdge, { start: RTFPosition, end: RBFPosition });
Overlays.editOverlay(handleScaleFLEdge, { start: LTFPosition, end: LBFPosition }); Overlays.editOverlay(handleBoundingFLEdge, { start: LTFPosition, end: LBFPosition });
// UPDATE STRETCH HIGHLIGHT PANELS // UPDATE STRETCH HIGHLIGHT PANELS
var RBFPositionRotated = Vec3.multiplyQbyV(rotationInverse, RBFPosition); var RBFPositionRotated = Vec3.multiplyQbyV(rotationInverse, RBFPosition);
@ -1569,7 +1569,7 @@ SelectionDisplay = (function() {
var showOutlineForZone = (SelectionManager.selections.length === 1 && var showOutlineForZone = (SelectionManager.selections.length === 1 &&
typeof SelectionManager.savedProperties[SelectionManager.selections[0]] !== "undefined" && typeof SelectionManager.savedProperties[SelectionManager.selections[0]] !== "undefined" &&
SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone"); SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
that.setHandleScaleEdgeVisible(showOutlineForZone || (!isActiveTool(handleRotatePitchRing) && that.setHandleBoundingEdgeVisible(showOutlineForZone || (!isActiveTool(handleRotatePitchRing) &&
!isActiveTool(handleRotateYawRing) && !isActiveTool(handleRotateYawRing) &&
!isActiveTool(handleRotateRollRing))); !isActiveTool(handleRotateRollRing)));
@ -1669,26 +1669,26 @@ SelectionDisplay = (function() {
// FUNCTION: SET HANDLE SCALE VISIBLE // FUNCTION: SET HANDLE SCALE VISIBLE
that.setHandleScaleVisible = function(isVisible) { that.setHandleScaleVisible = function(isVisible) {
that.setHandleScaleCubeVisible(isVisible); that.setHandleScaleCubeVisible(isVisible);
that.setHandleScaleEdgeVisible(isVisible); that.setHandleBoundingEdgeVisible(isVisible);
}; };
that.setHandleScaleCubeVisible = function(isVisible) { that.setHandleScaleCubeVisible = function(isVisible) {
Overlays.editOverlay(handleScaleCube, { visible: isVisible }); Overlays.editOverlay(handleScaleCube, { visible: isVisible });
}; };
that.setHandleScaleEdgeVisible = function(isVisible) { that.setHandleBoundingEdgeVisible = function(isVisible) {
Overlays.editOverlay(handleScaleTREdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingTREdge, { visible: isVisible });
Overlays.editOverlay(handleScaleTLEdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingTLEdge, { visible: isVisible });
Overlays.editOverlay(handleScaleTFEdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingTFEdge, { visible: isVisible });
Overlays.editOverlay(handleScaleTNEdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingTNEdge, { visible: isVisible });
Overlays.editOverlay(handleScaleBREdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingBREdge, { visible: isVisible });
Overlays.editOverlay(handleScaleBLEdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingBLEdge, { visible: isVisible });
Overlays.editOverlay(handleScaleBFEdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingBFEdge, { visible: isVisible });
Overlays.editOverlay(handleScaleBNEdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingBNEdge, { visible: isVisible });
Overlays.editOverlay(handleScaleNREdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingNREdge, { visible: isVisible });
Overlays.editOverlay(handleScaleNLEdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingNLEdge, { visible: isVisible });
Overlays.editOverlay(handleScaleFREdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingFREdge, { visible: isVisible });
Overlays.editOverlay(handleScaleFLEdge, { visible: isVisible }); Overlays.editOverlay(handleBoundingFLEdge, { visible: isVisible });
}; };
// FUNCTION: SET HANDLE CLONER VISIBLE // FUNCTION: SET HANDLE CLONER VISIBLE
@ -2292,7 +2292,8 @@ SelectionDisplay = (function() {
var toCameraDistance = getDistanceToCamera(position); var toCameraDistance = getDistanceToCamera(position);
var dimensionsMultiple = toCameraDistance * STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE; var dimensionsMultiple = toCameraDistance * STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE;
var dimensionChange = mouseDifference * dimensionsMultiple; var dimensionChange = mouseDifference * dimensionsMultiple;
percentChange = dimensionChange / initialDimensions.z; var averageInitialDimension = (initialDimensions.x + initialDimensions.y + initialDimensions.z) / 3;
percentChange = dimensionChange / averageInitialDimension;
percentChange += 1.0; percentChange += 1.0;
newDimensions = Vec3.multiply(percentChange, initialDimensions); newDimensions = Vec3.multiply(percentChange, initialDimensions);
newDimensions.x = Math.abs(newDimensions.x); newDimensions.x = Math.abs(newDimensions.x);