From cbacf5f328ef4742a3268d5891edfc46d08cd2b4 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 19 Feb 2014 22:30:28 -0800 Subject: [PATCH] correctly draw tools when in orbit mode --- examples/editVoxels.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/examples/editVoxels.js b/examples/editVoxels.js index d15c9d33d9..eea5faf1fc 100644 --- a/examples/editVoxels.js +++ b/examples/editVoxels.js @@ -247,6 +247,7 @@ var trackLastMouseY = 0; var trackAsDelete = false; var trackAsRecolor = false; var trackAsEyedropper = false; +var trackAsOrbit = false; function showPreviewVoxel() { var voxelColor; @@ -293,6 +294,8 @@ function showPreviewVoxel() { solid: true, alpha: 0.8 }); + } else if (trackAsOrbit) { + Overlays.editOverlay(voxelPreview, { visible: false }); } else if (!isExtruding) { guidePosition = { x: intersection.voxel.x, y: intersection.voxel.y, @@ -440,6 +443,7 @@ function trackMouseEvent(event) { trackAsDelete = event.isControl; trackAsRecolor = event.isShifted; trackAsEyedropper = event.isMeta; + trackAsOrbit = event.isAlt; showPreviewGuides(); } @@ -456,6 +460,10 @@ function trackKeyPressEvent(event) { trackAsEyedropper = true; moveTools(); } + if (event.text == "ALT") { + trackAsOrbit = true; + moveTools(); + } showPreviewGuides(); } @@ -472,6 +480,10 @@ function trackKeyReleaseEvent(event) { trackAsEyedropper = false; moveTools(); } + if (event.text == "ALT") { + trackAsOrbit = false; + moveTools(); + } // on TAB release, toggle our tool state if (event.text == "TAB") { @@ -763,6 +775,8 @@ function moveTools() { recolorToolColor = toolSelectedColor; } else if (trackAsEyedropper) { eyedropperToolColor = toolSelectedColor; + } else if (trackAsOrbit) { + // nothing gets selected in this case... } else { addToolColor = toolSelectedColor; }