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

Move baseOfEntityProjectionOverlay update to updateHandles()

Browse source
This commit is contained in:
Ryan Huffman 2014-12-02 16:00:33 -08:00
parent 2f1ceb922a
commit 0fb0169ff2
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
examples/libraries/entitySelectionTool.js
View file

@ -946,23 +946,6 @@ SelectionDisplay = (function () {
var dimensions = selectionManager.worldDimensions; var dimensions = selectionManager.worldDimensions;
var position = selectionManager.worldPosition; var position = selectionManager.worldPosition;
Overlays.editOverlay(baseOfEntityProjectionOverlay,
{
visible: mode != "ROTATE_YAW" && mode != "ROTATE_PITCH" && mode != "ROTATE_ROLL",
solid: true,
// lineWidth: 2.0,
position: {
x: position.x,
y: grid.getOrigin().y,
z: position.z
},
dimensions: {
x: dimensions.x,
y: dimensions.z
},
rotation: rotation,
});
Overlays.editOverlay(rotateOverlayTarget, { visible: rotationOverlaysVisible }); Overlays.editOverlay(rotateOverlayTarget, { visible: rotationOverlaysVisible });
Overlays.editOverlay(rotateZeroOverlay, { visible: rotationOverlaysVisible }); Overlays.editOverlay(rotateZeroOverlay, { visible: rotationOverlaysVisible });
@ -999,7 +982,6 @@ SelectionDisplay = (function () {
return; return;
} }
that.updateRotationHandles(); that.updateRotationHandles();
that.highlightSelectable(); that.highlightSelectable();
@ -1182,6 +1164,23 @@ SelectionDisplay = (function () {
var grabberMoveUpOffset = 0.1; var grabberMoveUpOffset = 0.1;
grabberMoveUpPosition = { x: position.x, y: position.y + worldTop + grabberMoveUpOffset, z: position.z } grabberMoveUpPosition = { x: position.x, y: position.y + worldTop + grabberMoveUpOffset, z: position.z }
Overlays.editOverlay(grabberMoveUp, { visible: activeTool == null || mode == "TRANSLATE_UP_DOWN" }); Overlays.editOverlay(grabberMoveUp, { visible: activeTool == null || mode == "TRANSLATE_UP_DOWN" });
Overlays.editOverlay(baseOfEntityProjectionOverlay, {
visible: mode != "ROTATE_YAW" && mode != "ROTATE_PITCH" && mode != "ROTATE_ROLL",
solid: true,
position: {
x: selectionManager.worldPosition.x,
y: grid.getOrigin().y,
z: selectionManager.worldPosition.z
},
dimensions: {
x: selectionManager.worldDimensions.x,
y: selectionManager.worldDimensions.z
},
rotation: Quat.fromPitchYawRollDegrees(0, 0, 0),
});
}; };
that.setOverlaysVisible = function(isVisible) { that.setOverlaysVisible = function(isVisible) {