From 766a922fb3d8ac253399535fdaa031cbbd458abe Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 19:02:10 -0800
Subject: [PATCH] add work around for voxel add of larger voxel on top of
 smaller voxels

---
 examples/editVoxels.js                            | 3 +++
 libraries/voxels/src/VoxelsScriptingInterface.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index 26090d2f49..d676e71087 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -922,6 +922,7 @@ print("clickedOverlay="+clickedOverlay);
             }
                     
             voxelDetails = calculateVoxelFromIntersection(intersection,"add");
+            Voxels.eraseVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s);
             Voxels.setVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s,
                 newColor.red, newColor.green, newColor.blue);
             lastVoxelPosition = { x: voxelDetails.x, y: voxelDetails.y, z: voxelDetails.z };
@@ -963,6 +964,7 @@ function keyPressEvent(event) {
                         red: colors[color].red,
                         green: colors[color].green,
                         blue: colors[color].blue };
+            Voxels.eraseVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s);
             Voxels.setVoxel(newVoxel.x, newVoxel.y, newVoxel.z, newVoxel.s, newVoxel.red, newVoxel.green, newVoxel.blue);
             setAudioPosition();
             Audio.playSound(addSound, audioOptions);
@@ -1089,6 +1091,7 @@ function mouseMoveEvent(event) {
             var dy = event.y - mouseY;
             if (Math.sqrt(dx*dx + dy*dy) > PIXELS_PER_EXTRUDE_VOXEL)  {
                 lastVoxelPosition = Vec3.sum(lastVoxelPosition, extrudeDirection);
+                Voxels.eraseVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s);
                 Voxels.setVoxel(lastVoxelPosition.x, lastVoxelPosition.y, lastVoxelPosition.z, 
                             extrudeScale, lastVoxelColor.red, lastVoxelColor.green, lastVoxelColor.blue);
                 mouseX = event.x;
diff --git a/libraries/voxels/src/VoxelsScriptingInterface.cpp b/libraries/voxels/src/VoxelsScriptingInterface.cpp
index 1a0a234e0a..db61460d69 100644
--- a/libraries/voxels/src/VoxelsScriptingInterface.cpp
+++ b/libraries/voxels/src/VoxelsScriptingInterface.cpp
@@ -42,7 +42,7 @@ void VoxelsScriptingInterface::setVoxelNonDestructive(float x, float y, float z,
     VoxelDetail addVoxelDetail = {x / (float)TREE_SCALE, y / (float)TREE_SCALE, z / (float)TREE_SCALE, 
                                     scale / (float)TREE_SCALE, red, green, blue};
 
-    // queue the packet
+    // queue the add packet
     queueVoxelAdd(PacketTypeVoxelSet, addVoxelDetail);
     
     // handle the local tree also...