From 3ffd47a0b035b3ffae833bfe5f3bd1ed666bb5a1 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 27 Feb 2015 15:08:13 -0800 Subject: [PATCH 1/6] Update editEntities rotation arrows --- examples/libraries/entitySelectionTool.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index 85be97b1ce..1b69075d13 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -242,8 +242,8 @@ SelectionDisplay = (function () { var ROTATION_DISPLAY_SIZE_Y_MULTIPLIER = 0.18; var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.17; - var ROTATE_ARROW_WEST_NORTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-north.png"; - var ROTATE_ARROW_WEST_SOUTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-south.png"; + var ROTATE_ARROW_WEST_NORTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-north.svg"; + var ROTATE_ARROW_WEST_SOUTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-south.svg"; var showExtendedStretchHandles = false; From cd3281521cf8a954bd396e4e06d1611ea9177e9e Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 27 Feb 2015 15:08:29 -0800 Subject: [PATCH 2/6] Update size of rotation degrees text --- examples/libraries/entitySelectionTool.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index 1b69075d13..5c1ff82d39 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -238,9 +238,9 @@ SelectionDisplay = (function () { // These are multipliers for sizing the rotation degrees display while rotating an entity var ROTATION_DISPLAY_DISTANCE_MULTIPLIER = 1.2; - var ROTATION_DISPLAY_SIZE_X_MULTIPLIER = 0.5; + var ROTATION_DISPLAY_SIZE_X_MULTIPLIER = 0.6; var ROTATION_DISPLAY_SIZE_Y_MULTIPLIER = 0.18; - var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.17; + var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.14; var ROTATE_ARROW_WEST_NORTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-north.svg"; var ROTATE_ARROW_WEST_SOUTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-south.svg"; From 4f4ab144b220d894dd9ce6ce6866a7347fbb622b Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 27 Feb 2015 15:10:56 -0800 Subject: [PATCH 3/6] Update handle colors and up/down arrow image --- examples/libraries/entitySelectionTool.js | 32 +++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index 5c1ff82d39..fe86cb7a69 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -280,11 +280,11 @@ SelectionDisplay = (function () { var originalRoll; - var rotateHandleColor = { red: 0, green: 0, blue: 0 }; - var rotateHandleAlpha = 0.7; + var handleColor = { red: 255, green: 255, blue: 255 }; + var handleAlpha = 0.7; - var highlightedHandleColor = { red: 255, green: 0, blue: 0 }; - var highlightedHandleAlpha = 0.7; + var highlightedHandleColor = { red: 120, green: 216, blue: 209 }; + var highlightedHandleAlpha = 1.0; var previousHandle = false; var previousHandleColor; @@ -385,9 +385,9 @@ SelectionDisplay = (function () { }); var grabberMoveUp = Overlays.addOverlay("billboard", { - url: HIFI_PUBLIC_BUCKET + "images/up-arrow.png", + url: HIFI_PUBLIC_BUCKET + "images/up-arrow.svg", position: { x:0, y: 0, z: 0}, - color: { red: 0, green: 0, blue: 0 }, + color: handleColor, alpha: 1.0, visible: false, size: 0.1, @@ -595,8 +595,8 @@ SelectionDisplay = (function () { var yawHandle = Overlays.addOverlay("billboard", { url: ROTATE_ARROW_WEST_NORTH_URL, position: { x:0, y: 0, z: 0}, - color: rotateHandleColor, - alpha: rotateHandleAlpha, + color: handleColor, + alpha: handleAlpha, visible: false, size: 0.1, scale: 0.1, @@ -608,8 +608,8 @@ SelectionDisplay = (function () { var pitchHandle = Overlays.addOverlay("billboard", { url: ROTATE_ARROW_WEST_NORTH_URL, position: { x:0, y: 0, z: 0}, - color: rotateHandleColor, - alpha: rotateHandleAlpha, + color: handleColor, + alpha: handleAlpha, visible: false, size: 0.1, scale: 0.1, @@ -621,8 +621,8 @@ SelectionDisplay = (function () { var rollHandle = Overlays.addOverlay("billboard", { url: ROTATE_ARROW_WEST_NORTH_URL, position: { x:0, y: 0, z: 0}, - color: rotateHandleColor, - alpha: rotateHandleAlpha, + color: handleColor, + alpha: handleAlpha, visible: false, size: 0.1, scale: 0.1, @@ -2342,14 +2342,14 @@ SelectionDisplay = (function () { case yawHandle: case pitchHandle: case rollHandle: - pickedColor = rotateHandleColor; - pickedAlpha = rotateHandleAlpha; + pickedColor = handleColor; + pickedAlpha = handleAlpha; highlightNeeded = true; break; case grabberMoveUp: - pickedColor = rotateHandleColor; - pickedAlpha = rotateHandleAlpha; + pickedColor = handleColor; + pickedAlpha = handleAlpha; highlightNeeded = true; break; From a0d9e92c641763793492e1a0df0099e97e3bfcd1 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 27 Feb 2015 15:11:23 -0800 Subject: [PATCH 4/6] Update size of rotation overlay --- examples/libraries/entitySelectionTool.js | 38 +++++++++++++---------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index fe86cb7a69..76fb0a7835 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -533,7 +533,7 @@ SelectionDisplay = (function () { var rotateOverlayTarget = Overlays.addOverlay("circle3d", { position: { x:0, y: 0, z: 0}, - size: rotateOverlayTargetSize, + size: rotateOverlayTargetSize * 2, color: { red: 0, green: 0, blue: 0 }, alpha: 0.0, solid: true, @@ -1713,15 +1713,17 @@ SelectionDisplay = (function () { Overlays.editOverlay(rotateOverlayInner, { visible: true, - size: innerRadius, + size: innerRadius * 2, innerRadius: 0.9, + startAt: 0, + endAt: 360, alpha: innerAlpha }); Overlays.editOverlay(rotateOverlayOuter, { visible: true, - size: outerRadius, + size: outerRadius * 2, innerRadius: 0.9, startAt: 0, endAt: 360, @@ -1731,7 +1733,7 @@ SelectionDisplay = (function () { Overlays.editOverlay(rotateOverlayCurrent, { visible: true, - size: outerRadius, + size: outerRadius * 2, startAt: 0, endAt: 0, innerRadius: 0.9, @@ -1809,13 +1811,13 @@ SelectionDisplay = (function () { if (snapToInner) { Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder }); - Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius, + Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius * 2, majorTickMarksAngle: innerSnapAngle, minorTickMarksAngle: 0, majorTickMarksLength: -0.25, minorTickMarksLength: 0, }); } else { Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder }); - Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius, + Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius * 2, majorTickMarksAngle: 45.0, minorTickMarksAngle: 5, majorTickMarksLength: 0.25, minorTickMarksLength: 0.1, }); } @@ -1840,15 +1842,17 @@ SelectionDisplay = (function () { Overlays.editOverlay(rotateOverlayInner, { visible: true, - size: innerRadius, + size: innerRadius * 2, innerRadius: 0.9, + startAt: 0, + endAt: 360, alpha: innerAlpha }); Overlays.editOverlay(rotateOverlayOuter, { visible: true, - size: outerRadius, + size: outerRadius * 2, innerRadius: 0.9, startAt: 0, endAt: 360, @@ -1858,7 +1862,7 @@ SelectionDisplay = (function () { Overlays.editOverlay(rotateOverlayCurrent, { visible: true, - size: outerRadius, + size: outerRadius * 2, startAt: 0, endAt: 0, innerRadius: 0.9, @@ -1929,13 +1933,13 @@ SelectionDisplay = (function () { if (snapToInner) { Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder }); - Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius, + Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius * 2, majorTickMarksAngle: innerSnapAngle, minorTickMarksAngle: 0, majorTickMarksLength: -0.25, minorTickMarksLength: 0, }); } else { Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder }); - Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius, + Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius * 2, majorTickMarksAngle: 45.0, minorTickMarksAngle: 5, majorTickMarksLength: 0.25, minorTickMarksLength: 0.1, }); } @@ -1959,15 +1963,17 @@ SelectionDisplay = (function () { Overlays.editOverlay(rotateOverlayInner, { visible: true, - size: innerRadius, + size: innerRadius * 2, innerRadius: 0.9, + startAt: 0, + endAt: 360, alpha: innerAlpha }); Overlays.editOverlay(rotateOverlayOuter, { visible: true, - size: outerRadius, + size: outerRadius * 2, innerRadius: 0.9, startAt: 0, endAt: 360, @@ -1977,7 +1983,7 @@ SelectionDisplay = (function () { Overlays.editOverlay(rotateOverlayCurrent, { visible: true, - size: outerRadius, + size: outerRadius * 2, startAt: 0, endAt: 0, innerRadius: 0.9, @@ -2047,13 +2053,13 @@ SelectionDisplay = (function () { if (snapToInner) { Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder }); - Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius, + Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius * 2, majorTickMarksAngle: innerSnapAngle, minorTickMarksAngle: 0, majorTickMarksLength: -0.25, minorTickMarksLength: 0, }); } else { Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 }); Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder }); - Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius, + Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius * 2, majorTickMarksAngle: 45.0, minorTickMarksAngle: 5, majorTickMarksLength: 0.25, minorTickMarksLength: 0.1, }); } From dc2cb93cce35ae0b4bb787143846385626b01ed2 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 27 Feb 2015 15:11:43 -0800 Subject: [PATCH 5/6] Add degrees symbol to rotation degrees text --- 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 76fb0a7835..86266d3fb5 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -1692,7 +1692,7 @@ SelectionDisplay = (function () { y: innerRadius * ROTATION_DISPLAY_SIZE_Y_MULTIPLIER }, lineHeight: innerRadius * ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER, - text: normalizeDegrees(angleFromZero), + text: normalizeDegrees(angleFromZero) + "°", }); } From a48c428f426f52f3a2d3aacdd9fed96fa758b62e Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 27 Feb 2015 15:29:00 -0800 Subject: [PATCH 6/6] Update highlighted handle color --- examples/libraries/entitySelectionTool.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index 86266d3fb5..c261e0d8a6 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -283,8 +283,8 @@ SelectionDisplay = (function () { var handleColor = { red: 255, green: 255, blue: 255 }; var handleAlpha = 0.7; - var highlightedHandleColor = { red: 120, green: 216, blue: 209 }; - var highlightedHandleAlpha = 1.0; + var highlightedHandleColor = { red: 183, green: 64, blue: 44 }; + var highlightedHandleAlpha = 0.9; var previousHandle = false; var previousHandleColor; @@ -388,7 +388,7 @@ SelectionDisplay = (function () { url: HIFI_PUBLIC_BUCKET + "images/up-arrow.svg", position: { x:0, y: 0, z: 0}, color: handleColor, - alpha: 1.0, + alpha: handleAlpha, visible: false, size: 0.1, scale: 0.1,