Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

editVoxels new layout / assets

Browse source
This commit is contained in:
stojce 2014-02-27 23:20:40 +01:00
parent 89cf2f9a7a
commit 5c22376312
1 changed files with 123 additions and 216 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

339
examples/editVoxels.js
View file

@ -68,7 +68,8 @@ colors[4] = { red: 236, green: 174, blue: 0 };
colors[5] = { red: 234, green: 133, blue: 0 }; colors[5] = { red: 234, green: 133, blue: 0 };
colors[6] = { red: 211, green: 115, blue: 0 }; colors[6] = { red: 211, green: 115, blue: 0 };
colors[7] = { red: 48, green: 116, blue: 119 }; colors[7] = { red: 48, green: 116, blue: 119 };
var numColors = 8; colors[8] = { red: 31, green: 64, blue: 64 };
var numColors = 9;
var whichColor = -1; // Starting color is 'Copy' mode var whichColor = -1; // Starting color is 'Copy' mode
// Create sounds for adding, deleting, recoloring voxels // Create sounds for adding, deleting, recoloring voxels
@ -138,34 +139,46 @@ var linePreviewRight = Overlays.addOverlay("line3d", {
// these will be used below // these will be used below
var sliderWidth = 158; var sliderWidth = 154;
var sliderHeight = 35; var sliderHeight = 37;
// These will be our "overlay IDs" // These will be our "overlay IDs"
var swatches = new Array(); var swatches = new Array();
var swatchHeight = 54; var swatchExtraPadding = 5;
var swatchWidth = 31; var swatchHeight = 37;
var swatchesWidth = swatchWidth * numColors; var swatchWidth = 27;
var swatchesWidth = swatchWidth * numColors + numColors + swatchExtraPadding * 2;
var swatchesX = (windowDimensions.x - (swatchesWidth + sliderWidth)) / 2; var swatchesX = (windowDimensions.x - (swatchesWidth + sliderWidth)) / 2;
var swatchesY = windowDimensions.y - swatchHeight; var swatchesY = windowDimensions.y - swatchHeight + 1;
var toolIconUrl = "http://highfidelity-public.s3-us-west-1.amazonaws.com/images/tools/";
// create the overlays, position them in a row, set their colors, and for the selected one, use a different source image // create the overlays, position them in a row, set their colors, and for the selected one, use a different source image
// location so that it displays the "selected" marker // location so that it displays the "selected" marker
for (s = 0; s < numColors; s++) { for (s = 0; s < numColors; s++) {
var imageFromX = 12 + (s * 27);
var imageFromY = 0; var extraWidth = 0;
if (s == whichColor) {
imageFromY = 55; if (s == 0) {
extraWidth = swatchExtraPadding;
}
var imageFromX = swatchExtraPadding - extraWidth + s * swatchWidth;
var imageFromY = swatchHeight + 1;
var swatchX = swatchExtraPadding - extraWidth + swatchesX + ((swatchWidth - 1) * s);
if (s == (numColors - 1)) {
extraWidth = swatchExtraPadding;
} }
var swatchX = swatchesX + (30 * s);
swatches[s] = Overlays.addOverlay("image", { swatches[s] = Overlays.addOverlay("image", {
x: swatchX, x: swatchX,
y: swatchesY, y: swatchesY,
width: swatchWidth, width: swatchWidth + extraWidth,
height: swatchHeight, height: swatchHeight,
subImage: { x: imageFromX, y: imageFromY, width: (swatchWidth - 1), height: swatchHeight }, subImage: { x: imageFromX, y: imageFromY, width: swatchWidth + extraWidth, height: swatchHeight },
imageURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/images/swatches.svg", imageURL: toolIconUrl + "swatches.svg",
color: colors[s], color: colors[s],
alpha: 1, alpha: 1,
visible: editToolsOn visible: editToolsOn
@ -174,66 +187,41 @@ for (s = 0; s < numColors; s++) {
// These will be our tool palette overlays // These will be our tool palette overlays
var numberOfTools = 5; var numberOfTools = 3;
var toolHeight = 40; var toolHeight = 50;
var toolWidth = 62; var toolWidth = 50;
var toolsHeight = toolHeight * numberOfTools; var toolVerticalSpacing = 4;
var toolsX = 0; var toolsHeight = toolHeight * numberOfTools + toolVerticalSpacing * (numberOfTools - 1);
var toolsX = 8;
var toolsY = (windowDimensions.y - toolsHeight) / 2; var toolsY = (windowDimensions.y - toolsHeight) / 2;
var addToolAt = 0; var voxelToolAt = 0;
var deleteToolAt = 1; var recolorToolAt = 1;
var recolorToolAt = 2; var eyedropperToolAt = 2;
var eyedropperToolAt = 3;
var selectToolAt = 4;
var toolSelectedColor = { red: 255, green: 255, blue: 255 };
var notSelectedColor = { red: 128, green: 128, blue: 128 };
var addTool = Overlays.addOverlay("image", { var voxelTool = Overlays.addOverlay("image", {
x: 0, y: 0, width: toolWidth, height: toolHeight, x: 0, y: 0, width: toolWidth, height: toolHeight,
subImage: { x: 0, y: toolHeight * addToolAt, width: toolWidth, height: toolHeight }, subImage: { x: 0, y: toolHeight, width: toolWidth, height: toolHeight },
imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/hifi-interface-tools.svg", imageURL: toolIconUrl + "voxel-tool.svg",
color: toolSelectedColor,
visible: false,
alpha: 0.9
});
var deleteTool = Overlays.addOverlay("image", {
x: 0, y: 0, width: toolWidth, height: toolHeight,
subImage: { x: 0, y: toolHeight * deleteToolAt, width: toolWidth, height: toolHeight },
imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/hifi-interface-tools.svg",
color: toolSelectedColor,
visible: false, visible: false,
alpha: 0.9 alpha: 0.9
}); });
var recolorTool = Overlays.addOverlay("image", { var recolorTool = Overlays.addOverlay("image", {
x: 0, y: 0, width: toolWidth, height: toolHeight, x: 0, y: 0, width: toolWidth, height: toolHeight,
subImage: { x: 0, y: toolHeight * recolorToolAt, width: toolWidth, height: toolHeight }, subImage: { x: 0, y: toolHeight, width: toolWidth, height: toolHeight },
imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/hifi-interface-tools.svg", imageURL: toolIconUrl + "paint-tool.svg",
color: toolSelectedColor,
visible: false, visible: false,
alpha: 0.9 alpha: 0.9
}); });
var eyedropperTool = Overlays.addOverlay("image", { var eyedropperTool = Overlays.addOverlay("image", {
x: 0, y: 0, width: toolWidth, height: toolHeight, x: 0, y: 0, width: toolWidth, height: toolHeight,
subImage: { x: 0, y: toolHeight * eyedropperToolAt, width: toolWidth, height: toolHeight }, subImage: { x: 0, y: toolHeight, width: toolWidth, height: toolHeight },
imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/hifi-interface-tools.svg", imageURL: toolIconUrl + "eyedropper-tool.svg",
color: toolSelectedColor,
visible: false, visible: false,
alpha: 0.9 alpha: 0.9
}); });
var selectTool = Overlays.addOverlay("image", {
x: 0, y: 0, width: toolWidth, height: toolHeight,
subImage: { x: 0, y: toolHeight * selectToolAt, width: toolWidth, height: toolHeight },
imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/hifi-interface-tools.svg",
color: toolSelectedColor,
visible: false,
alpha: 0.9
});
// This will create a couple of image overlays that make a "slider", we will demonstrate how to trap mouse messages to // This will create a couple of image overlays that make a "slider", we will demonstrate how to trap mouse messages to
// move the slider // move the slider
@ -242,35 +230,33 @@ var selectTool = Overlays.addOverlay("image", {
//var sliderWidth = 158; //var sliderWidth = 158;
//var sliderHeight = 35; //var sliderHeight = 35;
var sliderX = swatchesX + swatchesWidth;
var sliderY = windowDimensions.y - sliderHeight; var sliderX = swatchesX - swatchWidth;
var sliderY = windowDimensions.y - sliderHeight + 1;
var slider = Overlays.addOverlay("image", { var slider = Overlays.addOverlay("image", {
// alternate form of expressing bounds // alternate form of expressing bounds
bounds: { x: sliderX, y: sliderY, width: sliderWidth, height: sliderHeight}, bounds: { x: sliderX, y: sliderY, width: sliderWidth, height: sliderHeight},
imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png", imageURL: toolIconUrl + "voxel-size-slider-bg.svg",
color: { red: 255, green: 255, blue: 255},
alpha: 1, alpha: 1,
visible: false visible: false
}); });
// The slider is handled in the mouse event callbacks. // The slider is handled in the mouse event callbacks.
var isMovingSlider = false; var isMovingSlider = false;
var thumbClickOffsetX = 0; var thumbClickOffsetX = 0;
// This is the thumb of our slider // This is the thumb of our slider
var minThumbX = 30; // relative to the x of the slider var minThumbX = 20; // relative to the x of the slider
var maxThumbX = minThumbX + 65; var maxThumbX = minThumbX + 90;
var thumbExtents = maxThumbX - minThumbX; var thumbExtents = maxThumbX - minThumbX;
var thumbX = (minThumbX + maxThumbX) / 2; var thumbX = (minThumbX + maxThumbX) / 2;
var thumbY = sliderY + 9; var thumbY = sliderY + 11;
var thumb = Overlays.addOverlay("image", { var thumb = Overlays.addOverlay("image", {
x: sliderX + thumbX, x: sliderX + thumbX,
y: thumbY, y: thumbY,
width: 18, width: 17,
height: 17, height: 17,
imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png", imageURL: toolIconUrl + "voxel-size-slider-handle.svg",
color: { red: 255, green: 255, blue: 255},
alpha: 1, alpha: 1,
visible: false visible: false
}); });
@ -347,11 +333,9 @@ var trackAsRecolor = false;
var trackAsEyedropper = false; var trackAsEyedropper = false;
var trackAsOrbitOrPan = false; var trackAsOrbitOrPan = false;
var addToolSelected = true; var voxelToolSelected = true;
var deleteToolSelected = false;
var recolorToolSelected = false; var recolorToolSelected = false;
var eyedropperToolSelected = false; var eyedropperToolSelected = false;
var selectToolSelected = false;
function playRandomAddSound(audioOptions) { function playRandomAddSound(audioOptions) {
if (Math.random() < 0.33) { if (Math.random() < 0.33) {
@ -524,51 +508,12 @@ function showPreviewVoxel() {
} }
var guidePosition; var guidePosition;
if (trackAsRecolor || recolorToolSelected || trackAsEyedropper || eyedropperToolSelected) {
if (trackAsDelete || deleteToolSelected) { Overlays.editOverlay(voxelPreview, { visible: true });
guidePosition = calculateVoxelFromIntersection(intersection,"delete");
Overlays.editOverlay(voxelPreview, {
position: guidePosition,
size: guidePosition.s + zFightingSizeAdjust,
visible: true,
color: { red: 255, green: 0, blue: 0 },
solid: false,
alpha: 1
});
} else if (selectToolSelected) {
guidePosition = calculateVoxelFromIntersection(intersection,"select");
Overlays.editOverlay(voxelPreview, {
position: guidePosition,
size: guidePosition.s + zFightingSizeAdjust,
visible: true,
color: { red: 255, green: 255, blue: 0 },
solid: false,
alpha: 1
});
} else if (trackAsRecolor || recolorToolSelected || trackAsEyedropper|| eyedropperToolSelected) {
guidePosition = calculateVoxelFromIntersection(intersection,"recolor");
Overlays.editOverlay(voxelPreview, {
position: guidePosition,
size: guidePosition.s + zFightingSizeAdjust,
visible: true,
color: voxelColor,
solid: true,
alpha: 0.8
});
} else if (trackAsOrbitOrPan) { } else if (trackAsOrbitOrPan) {
Overlays.editOverlay(voxelPreview, { visible: false }); Overlays.editOverlay(voxelPreview, { visible: false });
} else if (addToolSelected && !isExtruding) { } else if (voxelToolSelected && !isExtruding) {
guidePosition = calculateVoxelFromIntersection(intersection,"add"); Overlays.editOverlay(voxelPreview, { visible: true });
Overlays.editOverlay(voxelPreview, {
position: guidePosition,
size: (guidePosition.s - zFightingSizeAdjust),
visible: true,
color: voxelColor,
solid: true,
alpha: 0.7
});
} else if (isExtruding) { } else if (isExtruding) {
Overlays.editOverlay(voxelPreview, { visible: false }); Overlays.editOverlay(voxelPreview, { visible: false });
} }
@ -587,23 +532,11 @@ function showPreviewLines() {
} }
resultVoxel = calculateVoxelFromIntersection(intersection,""); resultVoxel = calculateVoxelFromIntersection(intersection,"");
if (selectToolSelected) { Overlays.editOverlay(voxelPreview, { visible: false });
Overlays.editOverlay(voxelPreview, { Overlays.editOverlay(linePreviewTop, { position: resultVoxel.topLeft, end: resultVoxel.topRight, visible: true });
position: resultVoxel, Overlays.editOverlay(linePreviewBottom, { position: resultVoxel.bottomLeft, end: resultVoxel.bottomRight, visible: true });
size: resultVoxel.s + zFightingSizeAdjust, Overlays.editOverlay(linePreviewLeft, { position: resultVoxel.topLeft, end: resultVoxel.bottomLeft, visible: true });
visible: true, Overlays.editOverlay(linePreviewRight, { position: resultVoxel.topRight, end: resultVoxel.bottomRight, visible: true });
color: { red: 255, green: 255, blue: 0 },
lineWidth: previewLineWidth,
solid: false,
alpha: 1
});
} else {
Overlays.editOverlay(voxelPreview, { visible: false });
Overlays.editOverlay(linePreviewTop, { position: resultVoxel.topLeft, end: resultVoxel.topRight, visible: true });
Overlays.editOverlay(linePreviewBottom, { position: resultVoxel.bottomLeft, end: resultVoxel.bottomRight, visible: true });
Overlays.editOverlay(linePreviewLeft, { position: resultVoxel.topLeft, end: resultVoxel.bottomLeft, visible: true });
Overlays.editOverlay(linePreviewRight, { position: resultVoxel.topRight, end: resultVoxel.bottomRight, visible: true });
}
} else { } else {
Overlays.editOverlay(voxelPreview, { visible: false }); Overlays.editOverlay(voxelPreview, { visible: false });
Overlays.editOverlay(linePreviewTop, { visible: false }); Overlays.editOverlay(linePreviewTop, { visible: false });
@ -829,44 +762,39 @@ function mousePressEvent(event) {
isMovingSlider = true; isMovingSlider = true;
thumbClickOffsetX = event.x - (sliderX + thumbX); // this should be the position of the mouse relative to the thumb thumbClickOffsetX = event.x - (sliderX + thumbX); // this should be the position of the mouse relative to the thumb
clickedOnSomething = true; clickedOnSomething = true;
} else if (clickedOverlay == addTool) {
addToolSelected = true; Overlays.editOverlay(thumb, { imageURL: toolIconUrl + "voxel-size-slider-handle.svg", });
deleteToolSelected = false;
} else if (clickedOverlay == voxelTool) {
voxelToolSelected = true;
recolorToolSelected = false; recolorToolSelected = false;
eyedropperToolSelected = false; eyedropperToolSelected = false;
selectToolSelected = false;
moveTools();
clickedOnSomething = true;
} else if (clickedOverlay == deleteTool) {
addToolSelected = false;
deleteToolSelected = true;
recolorToolSelected = false;
eyedropperToolSelected = false;
selectToolSelected = false;
moveTools(); moveTools();
clickedOnSomething = true; clickedOnSomething = true;
} else if (clickedOverlay == recolorTool) { } else if (clickedOverlay == recolorTool) {
addToolSelected = false; voxelToolSelected = false;
deleteToolSelected = false;
recolorToolSelected = true; recolorToolSelected = true;
eyedropperToolSelected = false; eyedropperToolSelected = false;
selectToolSelected = false;
moveTools(); moveTools();
clickedOnSomething = true; clickedOnSomething = true;
} else if (clickedOverlay == eyedropperTool) { } else if (clickedOverlay == eyedropperTool) {
addToolSelected = false; voxelToolSelected = false;
deleteToolSelected = false;
recolorToolSelected = false; recolorToolSelected = false;
eyedropperToolSelected = true; eyedropperToolSelected = true;
selectToolSelected = false;
moveTools(); moveTools();
clickedOnSomething = true; clickedOnSomething = true;
} else if (clickedOverlay == selectTool) { } else if (clickedOverlay == slider) {
addToolSelected = false;
deleteToolSelected = false; if (event.x < sliderX + minThumbX) {
recolorToolSelected = false; thumbX -= thumbDeltaPerStep;
eyedropperToolSelected = false; calcScaleFromThumb(thumbX);
selectToolSelected = true; }
if (event.x > sliderX + maxThumbX) {
thumbX += thumbDeltaPerStep;
calcScaleFromThumb(thumbX);
}
moveTools(); moveTools();
clickedOnSomething = true; clickedOnSomething = true;
} else { } else {
@ -908,7 +836,7 @@ function mousePressEvent(event) {
startPanMode(event); startPanMode(event);
isPanning = true; isPanning = true;
} }
} else if (deleteToolSelected || trackAsDelete || (event.isRightButton && !trackAsEyedropper)) { } else if (trackAsDelete || event.isRightButton && !trackAsEyedropper) {
// Delete voxel // Delete voxel
voxelDetails = calculateVoxelFromIntersection(intersection,"delete"); voxelDetails = calculateVoxelFromIntersection(intersection,"delete");
Voxels.eraseVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s); Voxels.eraseVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s);
@ -932,7 +860,7 @@ function mousePressEvent(event) {
colors[whichColor].red, colors[whichColor].green, colors[whichColor].blue); colors[whichColor].red, colors[whichColor].green, colors[whichColor].blue);
Audio.playSound(changeColorSound, audioOptions); Audio.playSound(changeColorSound, audioOptions);
Overlays.editOverlay(voxelPreview, { visible: false }); Overlays.editOverlay(voxelPreview, { visible: false });
} else if (addToolSelected) { } else if (voxelToolSelected) {
// Add voxel on face // Add voxel on face
if (whichColor == -1) { if (whichColor == -1) {
// Copy mode - use clicked voxel color // Copy mode - use clicked voxel color
@ -968,7 +896,7 @@ function keyPressEvent(event) {
// if our tools are off, then don't do anything // if our tools are off, then don't do anything
if (editToolsOn) { if (editToolsOn) {
var nVal = parseInt(event.text); var nVal = parseInt(event.text);
if (event.text == "0") { if (event.text == "`") {
print("Color = Copy"); print("Color = Copy");
whichColor = -1; whichColor = -1;
Audio.playSound(clickSound, audioOptions); Audio.playSound(clickSound, audioOptions);
@ -978,7 +906,7 @@ function keyPressEvent(event) {
print("Color = " + (whichColor + 1)); print("Color = " + (whichColor + 1));
Audio.playSound(clickSound, audioOptions); Audio.playSound(clickSound, audioOptions);
moveTools(); moveTools();
} else if (event.text == "9") { } else if (event.text == "0") {
// Create a brand new 1 meter voxel in front of your avatar // Create a brand new 1 meter voxel in front of your avatar
var color = whichColor; var color = whichColor;
if (color == -1) color = 0; if (color == -1) color = 0;
@ -1010,18 +938,6 @@ function keyPressEvent(event) {
function keyReleaseEvent(event) { function keyReleaseEvent(event) {
trackKeyReleaseEvent(event); // used by preview support trackKeyReleaseEvent(event); // used by preview support
// handle clipboard items
if (selectToolSelected) {
// menu tied to BACKSPACE, so we handle DELETE key here...
if (event.text == "DELETE") {
var pickRay = Camera.computePickRay(trackLastMouseX, trackLastMouseY);
var intersection = Voxels.findRayIntersection(pickRay);
selectedVoxel = calculateVoxelFromIntersection(intersection,"select");
print("the DELETE key was pressed... delete");
Clipboard.deleteVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s);
}
}
} }
function setupMenus() { function setupMenus() {
@ -1186,22 +1102,33 @@ function mouseReleaseEvent(event) {
function moveTools() { function moveTools() {
// move the swatches // move the swatches
swatchesX = (windowDimensions.x - (swatchesWidth + sliderWidth)) / 2; swatchesX = (windowDimensions.x - (swatchesWidth + sliderWidth)) / 2;
swatchesY = windowDimensions.y - swatchHeight; swatchesY = windowDimensions.y - swatchHeight + 1;
// create the overlays, position them in a row, set their colors, and for the selected one, use a different source image // create the overlays, position them in a row, set their colors, and for the selected one, use a different source image
// location so that it displays the "selected" marker // location so that it displays the "selected" marker
for (s = 0; s < numColors; s++) { for (s = 0; s < numColors; s++) {
var imageFromX = 12 + (s * 27); var extraWidth = 0;
var imageFromY = 0;
if (s == whichColor) {
imageFromY = 55;
}
var swatchX = swatchesX + ((swatchWidth - 1) * s);
if (s == 0) {
extraWidth = swatchExtraPadding;
}
var imageFromX = swatchExtraPadding - extraWidth + s * swatchWidth;
var imageFromY = swatchHeight + 1;
if (s == whichColor) {
imageFromY = 0;
}
var swatchX = swatchExtraPadding - extraWidth + swatchesX + ((swatchWidth - 1) * s);
if (s == (numColors - 1)) {
extraWidth = swatchExtraPadding;
}
Overlays.editOverlay(swatches[s], { Overlays.editOverlay(swatches[s], {
x: swatchX, x: swatchX,
y: swatchesY, y: swatchesY,
subImage: { x: imageFromX, y: imageFromY, width: (swatchWidth - 1), height: swatchHeight }, subImage: { x: imageFromX, y: imageFromY, width: swatchWidth + extraWidth, height: swatchHeight },
color: colors[s], color: colors[s],
alpha: 1, alpha: 1,
visible: editToolsOn visible: editToolsOn
@ -1210,62 +1137,44 @@ function moveTools() {
// move the tools // move the tools
toolsY = (windowDimensions.y - toolsHeight) / 2; toolsY = (windowDimensions.y - toolsHeight) / 2;
addToolColor = notSelectedColor;
deleteToolColor = notSelectedColor;
recolorToolColor = notSelectedColor;
eyedropperToolColor = notSelectedColor;
selectToolColor = notSelectedColor;
if (trackAsDelete || deleteToolSelected) { var voxelToolOffset = 1,
deleteToolColor = toolSelectedColor; recolorToolOffset = 1,
} else if (trackAsRecolor || recolorToolSelected) { eyedropperToolOffset = 1;
recolorToolColor = toolSelectedColor;
if (trackAsRecolor || recolorToolSelected) {
recolorToolOffset = 2;
} else if (trackAsEyedropper || eyedropperToolSelected) { } else if (trackAsEyedropper || eyedropperToolSelected) {
eyedropperToolColor = toolSelectedColor; eyedropperToolOffset = 2;
} else if (selectToolSelected) {
selectToolColor = toolSelectedColor;
} else if (trackAsOrbitOrPan) { } else if (trackAsOrbitOrPan) {
// nothing gets selected in this case... // nothing gets selected in this case...
} else { } else {
addToolColor = toolSelectedColor; voxelToolOffset = 2;
} }
Overlays.editOverlay(addTool, { Overlays.editOverlay(voxelTool, {
x: 0, y: toolsY + (toolHeight * addToolAt), width: toolWidth, height: toolHeight, subImage: { x: 0, y: toolHeight * voxelToolOffset, width: toolWidth, height: toolHeight },
color: addToolColor, x: toolsX, y: toolsY + ((toolHeight + toolVerticalSpacing) * voxelToolAt), width: toolWidth, height: toolHeight,
visible: editToolsOn
});
Overlays.editOverlay(deleteTool, {
x: 0, y: toolsY + (toolHeight * deleteToolAt), width: toolWidth, height: toolHeight,
color: deleteToolColor,
visible: editToolsOn visible: editToolsOn
}); });
Overlays.editOverlay(recolorTool, { Overlays.editOverlay(recolorTool, {
x: 0, y: toolsY + (toolHeight * recolorToolAt), width: toolWidth, height: toolHeight, subImage: { x: 0, y: toolHeight * recolorToolOffset, width: toolWidth, height: toolHeight },
color: recolorToolColor, x: toolsX, y: toolsY + ((toolHeight + toolVerticalSpacing) * recolorToolAt), width: toolWidth, height: toolHeight,
visible: editToolsOn visible: editToolsOn
}); });
Overlays.editOverlay(eyedropperTool, { Overlays.editOverlay(eyedropperTool, {
x: 0, y: toolsY + (toolHeight * eyedropperToolAt), width: toolWidth, height: toolHeight, subImage: { x: 0, y: toolHeight * eyedropperToolOffset, width: toolWidth, height: toolHeight },
color: eyedropperToolColor, x: toolsX, y: toolsY + ((toolHeight + toolVerticalSpacing) * eyedropperToolAt), width: toolWidth, height: toolHeight,
visible: editToolsOn visible: editToolsOn
}); });
Overlays.editOverlay(selectTool, { sliderX = swatchesX + swatchesWidth - 17;
x: 0, y: toolsY + (toolHeight * selectToolAt), width: toolWidth, height: toolHeight, sliderY = windowDimensions.y - sliderHeight + 1;
color: selectToolColor,
visible: editToolsOn
});
sliderX = swatchesX + swatchesWidth;
sliderY = windowDimensions.y - sliderHeight;
Overlays.editOverlay(slider, { x: sliderX, y: sliderY, visible: editToolsOn }); Overlays.editOverlay(slider, { x: sliderX, y: sliderY, visible: editToolsOn });
// This is the thumb of our slider // This is the thumb of our slider
thumbY = sliderY + 9;
Overlays.editOverlay(thumb, { x: sliderX + thumbX, y: thumbY, visible: editToolsOn }); Overlays.editOverlay(thumb, { x: sliderX + thumbX, y: thumbY, visible: editToolsOn });
} }
@ -1421,11 +1330,9 @@ function scriptEnding() {
for (s = 0; s < numColors; s++) { for (s = 0; s < numColors; s++) {
Overlays.deleteOverlay(swatches[s]); Overlays.deleteOverlay(swatches[s]);
} }
Overlays.deleteOverlay(addTool); Overlays.deleteOverlay(voxelTool);
Overlays.deleteOverlay(deleteTool);
Overlays.deleteOverlay(recolorTool); Overlays.deleteOverlay(recolorTool);
Overlays.deleteOverlay(eyedropperTool); Overlays.deleteOverlay(eyedropperTool);
Overlays.deleteOverlay(selectTool);
Overlays.deleteOverlay(slider); Overlays.deleteOverlay(slider);
Overlays.deleteOverlay(thumb); Overlays.deleteOverlay(thumb);
Controller.releaseKeyEvents({ text: "+" }); Controller.releaseKeyEvents({ text: "+" });