From 6017db0f31d6cad6799fc0f5f185ac4035831817 Mon Sep 17 00:00:00 2001 From: PhilipRosedale Date: Wed, 9 Mar 2016 17:43:44 -0800 Subject: [PATCH 1/2] Adjust grab handle sizes --- examples/libraries/entitySelectionTool.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index 95e695aa9c..af5c420694 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -894,7 +894,7 @@ SelectionDisplay = (function() { alpha: handleAlpha, visible: false, size: 0.1, - scale: 0.1, + scale: 0.025, isFacingAvatar: false, drawInFront: true, }); @@ -4316,16 +4316,23 @@ SelectionDisplay = (function() { return false; }; + that.updateHandleSizes = function() { if (selectionManager.hasSelection()) { var diff = Vec3.subtract(selectionManager.worldPosition, Camera.getPosition()); var grabberSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO; + var dimensions = SelectionManager.worldDimensions; + var avgDimension = (dimensions.x + dimensions.y + dimensions.z) / 3; + grabberSize = Math.min(grabberSize, avgDimension / 10); + for (var i = 0; i < stretchHandles.length; i++) { Overlays.editOverlay(stretchHandles[i], { size: grabberSize, }); } - var handleSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 10; + var handleSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 7; + handleSize = Math.min(handleSize, avgDimension / 3); + Overlays.editOverlay(yawHandle, { scale: handleSize, }); @@ -4342,7 +4349,7 @@ SelectionDisplay = (function() { }); Overlays.editOverlay(grabberMoveUp, { position: pos, - scale: handleSize / 2, + scale: handleSize / 1.25, }); } } From c11487735fcafe17c6493c82e4eff6d8accf58cb Mon Sep 17 00:00:00 2001 From: PhilipRosedale Date: Wed, 9 Mar 2016 17:46:38 -0800 Subject: [PATCH 2/2] Adjust grab handle sizes --- examples/libraries/entitySelectionTool.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index af5c420694..5b6c15def6 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -894,7 +894,7 @@ SelectionDisplay = (function() { alpha: handleAlpha, visible: false, size: 0.1, - scale: 0.025, + scale: 0.1, isFacingAvatar: false, drawInFront: true, });