From 9b3b5201c993342f5a45f45e46a35b1ccc698c9d Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 21 May 2014 10:39:26 -0700 Subject: [PATCH] Made voxelTools unselected by default to avoid accidental voxelEdit at login --- examples/editVoxels.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/editVoxels.js b/examples/editVoxels.js index b9f5d925d9..9040306bf6 100644 --- a/examples/editVoxels.js +++ b/examples/editVoxels.js @@ -630,7 +630,7 @@ var trackAsDelete = false; var trackAsRecolor = false; var trackAsEyedropper = false; -var voxelToolSelected = true; +var voxelToolSelected = false; var recolorToolSelected = false; var eyedropperToolSelected = false; var pasteMode = false; @@ -848,7 +848,7 @@ function showPreviewLines() { } function showPreviewGuides() { - if (editToolsOn && !isImporting) { + if (editToolsOn && !isImporting && (voxelToolSelected || recolorToolSelected || eyedropperToolSelected)) { if (previewAsVoxel) { showPreviewVoxel(); @@ -964,7 +964,7 @@ function mousePressEvent(event) { if (clickedOverlay == voxelTool) { modeSwitchSound.play(0); - voxelToolSelected = true; + voxelToolSelected = !voxelToolSelected; recolorToolSelected = false; eyedropperToolSelected = false; moveTools(); @@ -972,7 +972,7 @@ function mousePressEvent(event) { } else if (clickedOverlay == recolorTool) { modeSwitchSound.play(1); voxelToolSelected = false; - recolorToolSelected = true; + recolorToolSelected = !recolorToolSelected; eyedropperToolSelected = false; moveTools(); clickedOnSomething = true; @@ -980,7 +980,7 @@ function mousePressEvent(event) { modeSwitchSound.play(2); voxelToolSelected = false; recolorToolSelected = false; - eyedropperToolSelected = true; + eyedropperToolSelected = !eyedropperToolSelected; moveTools(); clickedOnSomething = true; } else if (scaleSelector.clicked(event.x, event.y)) { @@ -1000,7 +1000,7 @@ function mousePressEvent(event) { } } } - if (clickedOnSomething || isImporting) { + if (clickedOnSomething || isImporting || (!voxelToolSelected && !recolorToolSelected && !eyedropperToolSelected)) { return; // no further processing } @@ -1344,7 +1344,7 @@ function moveTools() { recolorToolOffset = 2; } else if (eyedropperToolSelected) { eyedropperToolOffset = 2; - } else { + } else if (voxelToolSelected) { if (pasteMode) { voxelToolColor = pasteModeColor; }