From 7026436dee33e332f49ba315746f0c6a7bfc00da Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 20 Feb 2014 17:32:59 -0800
Subject: [PATCH 01/14] first cut at touch support for orbit and pan, skeleton
 support for pan

---
 examples/editVoxels.js | 409 +++++++++++++++++++++++++++++++----------
 1 file changed, 310 insertions(+), 99 deletions(-)

diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index 81e3000566..59cb56fab6 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -31,6 +31,11 @@ var key_shift = false;
 var isAdding = false; 
 var isExtruding = false; 
 var isOrbiting = false;
+var isOrbitingFromTouch = false;
+var isPanning = false;
+var isPanningFromTouch = false;
+var touchPointsToOrbit = 2; // you can change these, but be mindful that on some track pads 2 touch points = right click+drag
+var touchPointsToPan = 3; 
 var orbitAzimuth = 0.0;
 var orbitAltitude = 0.0;
 var orbitCenter = { x: 0, y: 0, z: 0 };
@@ -68,6 +73,7 @@ var changeColorSound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelit
 var clickSound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Switches+and+sliders/toggle+switch+-+medium.raw");
 var audioOptions = new AudioInjectionOptions();

 audioOptions.volume = 0.5;
+audioOptions.position = Vec3.sum(MyAvatar.position, { x: 0, y: 1, z: 0 }  ); // start with audio slightly above the avatar
 
 var editToolsOn = false; // starts out off
 
@@ -326,7 +332,7 @@ var trackLastMouseY = 0;
 var trackAsDelete = false;
 var trackAsRecolor = false;
 var trackAsEyedropper = false;
-var trackAsOrbit = false;
+var trackAsOrbitOrPan = false;
 
 function calculateVoxelFromIntersection(intersection, operation) {
     //print("calculateVoxelFromIntersection() operation="+operation);
@@ -477,7 +483,7 @@ function showPreviewVoxel() {
                 solid: true,
                 alpha: 0.8
             });
-    } else if (trackAsOrbit) {
+    } else if (trackAsOrbitOrPan) {
         Overlays.editOverlay(voxelPreview, { visible: false });
     } else if (!isExtruding) {
         guidePosition = calculateVoxelFromIntersection(intersection,"add");
@@ -548,16 +554,22 @@ function showPreviewGuides() {
 }
 
 function trackMouseEvent(event) {
-    trackLastMouseX = event.x;
-    trackLastMouseY = event.y;
-    trackAsDelete = event.isControl;
-    trackAsRecolor = event.isShifted;
-    trackAsEyedropper = event.isMeta;
-    trackAsOrbit = event.isAlt;
-    showPreviewGuides();
+    if (!trackAsOrbitOrPan) {
+        trackLastMouseX = event.x;
+        trackLastMouseY = event.y;
+        trackAsDelete = event.isControl;
+        trackAsRecolor = event.isShifted;
+        trackAsEyedropper = event.isMeta;
+        trackAsOrbitOrPan = event.isAlt; // TODO: double check this...??
+        showPreviewGuides();
+    }
 }
 
 function trackKeyPressEvent(event) {
+    if (!editToolsOn) {
+        return;
+    }
+
     if (event.text == "CONTROL") {
         trackAsDelete = true;
         moveTools();
@@ -571,41 +583,13 @@ function trackKeyPressEvent(event) {
         moveTools();
     }
     if (event.text == "ALT") {
-        trackAsOrbit = true;
+        trackAsOrbitOrPan = true;
         moveTools();
     }
     showPreviewGuides();
 }
 
 function trackKeyReleaseEvent(event) {
-    if (event.text == "ESC") {
-        pointerVoxelScaleSet = false;
-    }
-    if (event.text == "-") {
-        thumbX -= thumbDeltaPerStep;
-        calcScaleFromThumb(thumbX);
-    }
-    if (event.text == "+") {
-        thumbX += thumbDeltaPerStep;
-        calcScaleFromThumb(thumbX);
-    }
-    if (event.text == "CONTROL") {
-        trackAsDelete = false;
-        moveTools();
-    }
-    if (event.text == "SHIFT") {
-        trackAsRecolor = false;
-        moveTools();
-    }
-    if (event.text == "META") {
-        trackAsEyedropper = false;
-        moveTools();
-    }
-    if (event.text == "ALT") {
-        trackAsOrbit = false;
-        moveTools();
-    }
-    
     // on TAB release, toggle our tool state
     if (event.text == "TAB") {
         editToolsOn = !editToolsOn;
@@ -613,14 +597,108 @@ function trackKeyReleaseEvent(event) {
         Audio.playSound(clickSound, audioOptions);
     }
 
-    // on F1 toggle the preview mode between cubes and lines
-    if (event.text == "F1") {
-        previewAsVoxel = !previewAsVoxel;
-    }
+    if (editToolsOn) {
+        if (event.text == "ESC") {
+            pointerVoxelScaleSet = false;
+        }
+        if (event.text == "-") {
+            thumbX -= thumbDeltaPerStep;
+            calcScaleFromThumb(thumbX);
+        }
+        if (event.text == "+") {
+            thumbX += thumbDeltaPerStep;
+            calcScaleFromThumb(thumbX);
+        }
+        if (event.text == "CONTROL") {
+            trackAsDelete = false;
+            moveTools();
+        }
+        if (event.text == "SHIFT") {
+            trackAsRecolor = false;
+            moveTools();
+        }
+        if (event.text == "META") {
+            trackAsEyedropper = false;
+            moveTools();
+        }
+        if (event.text == "ALT") {
+            trackAsOrbitOrPan = false;
+            moveTools();
+        }
+        
+        // on F1 toggle the preview mode between cubes and lines
+        if (event.text == "F1") {
+            previewAsVoxel = !previewAsVoxel;
+        }
 
-    showPreviewGuides();
+        showPreviewGuides();
+    }    
 }
 
+function startOrbitMode(event) {
+    mouseX = event.x;
+    mouseY = event.y;
+    var pickRay = Camera.computePickRay(event.x, event.y);
+    var intersection = Voxels.findRayIntersection(pickRay);
+
+    // start orbit camera! 
+    var cameraPosition = Camera.getPosition();
+    oldMode = Camera.getMode();
+    Camera.setMode("independent");
+    Camera.keepLookingAt(intersection.intersection);
+    // get position for initial azimuth, elevation
+    orbitCenter = intersection.intersection; 
+    var orbitVector = Vec3.subtract(cameraPosition, orbitCenter);
+    orbitRadius = Vec3.length(orbitVector); 
+    orbitAzimuth = Math.atan2(orbitVector.z, orbitVector.x);
+    orbitAltitude = Math.asin(orbitVector.y / Vec3.length(orbitVector));
+    
+    print("startOrbitMode...");
+}
+
+function handleOrbitingMove(event) {
+    var cameraOrientation = Camera.getOrientation();
+    var origEulers = Quat.safeEulerAngles(cameraOrientation);
+    var newEulers = fixEulerAngles(Quat.safeEulerAngles(cameraOrientation));
+    var dx = event.x - mouseX; 
+    var dy = event.y - mouseY;
+    orbitAzimuth += dx / ORBIT_RATE_AZIMUTH;
+    orbitAltitude += dy / ORBIT_RATE_ALTITUDE;
+     var orbitVector = { x:(Math.cos(orbitAltitude) * Math.cos(orbitAzimuth)) * orbitRadius, 
+                        y:Math.sin(orbitAltitude) * orbitRadius,
+                        z:(Math.cos(orbitAltitude) * Math.sin(orbitAzimuth)) * orbitRadius }; 
+    orbitPosition = Vec3.sum(orbitCenter, orbitVector);
+    Camera.setPosition(orbitPosition);
+    mouseX = event.x; 
+    mouseY = event.y;
+    print("handleOrbitingMove...");
+}
+
+function endOrbitMode(event) {
+    var cameraOrientation = Camera.getOrientation();
+    var eulers = Quat.safeEulerAngles(cameraOrientation);
+    MyAvatar.position = Camera.getPosition();
+    MyAvatar.orientation = cameraOrientation;
+    Camera.stopLooking();
+    Camera.setMode(oldMode);
+    Camera.setOrientation(cameraOrientation);
+    print("endOrbitMode...");
+}
+
+function startPanMode(event, intersection) {
+    // start pan camera! 
+    print("handle PAN mode!!!");
+}
+
+function handlePanMove(event) {
+    print("PANNING mode!!! isPanning="+isPanning + " inPanningFromTouch="+isPanningFromTouch + " trackAsOrbitOrPan="+trackAsOrbitOrPan);
+}
+
+function endPanMode(event) {
+    print("ending PAN mode!!!");
+}
+
+
 function mousePressEvent(event) {
 
     // if our tools are off, then don't do anything
@@ -628,29 +706,58 @@ function mousePressEvent(event) {
         return; 
     }
     
-    var clickedOnSwatch = false;
-    var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y});
-
-    // If the user clicked on the thumb, handle the slider logic
-    if (clickedOverlay == thumb) {
-        isMovingSlider = true;
-        thumbClickOffsetX = event.x - (sliderX + thumbX); // this should be the position of the mouse relative to the thumb
-        return; // no further processing
-    } else {
-        // if the user clicked on one of the color swatches, update the selectedSwatch
-        for (s = 0; s < numColors; s++) {
-            if (clickedOverlay == swatches[s]) {
-                whichColor = s;
-                moveTools();
-                clickedOnSwatch = true;
+    // Normally, if we're panning or orbiting from touch, ignore these... because our touch takes precedence. 
+    // but In the case of a button="RIGHT" click, we may get some touch messages first, and we actually want to 
+    // cancel any touch mode, and then let the right-click through
+    if (isOrbitingFromTouch || isPanningFromTouch) {
+    
+        // if the user is holding the ALT key AND they are clicking the RIGHT button (or on multi-touch doing a two
+        // finger touch, then we want to let the new panning behavior take over.
+        // if it's any other case we still want to bail
+        if (event.button == "RIGHT" && trackAsOrbitOrPan) {
+            // cancel our current multitouch operation...
+            if (isOrbitingFromTouch) {
+                endOrbitMode(event);
+                isOrbitingFromTouch = false;
             }
+            if (isPanningFromTouch) {
+                //print("mousePressEvent... calling endPanMode()");
+                endPanMode(event);
+                isPanningFromTouch = false;
+            }
+            // let things fall through
+        } else {
+            return; 
         }
-        if (clickedOnSwatch) {
+    }
+    
+    // no clicking on overlays while in panning mode
+    if (!trackAsOrbitOrPan) {
+        var clickedOnSwatch = false;
+        var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y});
+
+        // If the user clicked on the thumb, handle the slider logic
+        if (clickedOverlay == thumb) {
+            isMovingSlider = true;
+            thumbClickOffsetX = event.x - (sliderX + thumbX); // this should be the position of the mouse relative to the thumb
             return; // no further processing
+        } else {
+            // if the user clicked on one of the color swatches, update the selectedSwatch
+            for (s = 0; s < numColors; s++) {
+                if (clickedOverlay == swatches[s]) {
+                    whichColor = s;
+                    moveTools();
+                    clickedOnSwatch = true;
+                }
+            }
+            if (clickedOnSwatch) {
+                return; // no further processing
+            }
         }
     }
     
 
+    // TODO: does any of this stuff need to execute if we're panning or orbiting?
     trackMouseEvent(event); // used by preview support
     mouseX = event.x;
     mouseY = event.y;
@@ -663,20 +770,16 @@ function mousePressEvent(event) {
             calcThumbFromScale(intersection.voxel.s);
         }
         
-        if (event.isAlt) {
-            // start orbit camera! 
-            var cameraPosition = Camera.getPosition();
-            oldMode = Camera.getMode();
-            Camera.setMode("independent");
-            isOrbiting = true;
-            Camera.keepLookingAt(intersection.intersection);
-            // get position for initial azimuth, elevation
-            orbitCenter = intersection.intersection; 
-            var orbitVector = Vec3.subtract(cameraPosition, orbitCenter);
-            orbitRadius = Vec3.length(orbitVector); 
-            orbitAzimuth = Math.atan2(orbitVector.z, orbitVector.x);
-            orbitAltitude = Math.asin(orbitVector.y / Vec3.length(orbitVector));
-
+        // Note: touch and mouse events can cross paths, so we want to ignore any mouse events that would
+        // start a pan or orbit if we're already doing a pan or orbit via touch...
+        if ((event.isAlt || trackAsOrbitOrPan) && !(isOrbitingFromTouch || isPanningFromTouch)) {
+            if (event.isLeftButton && !event.isRightButton) {
+                startOrbitMode(event);
+                isOrbiting = true;
+            } else if (event.isRightButton && !event.isLeftButton) {
+                startPanMode(event);
+                isPanning = true;
+            }
         } else if (trackAsDelete || (event.isRightButton && !trackAsEyedropper)) {
             //  Delete voxel
             voxelDetails = calculateVoxelFromIntersection(intersection,"delete");
@@ -784,7 +887,28 @@ function keyReleaseEvent(event) {
 
 
 function mouseMoveEvent(event) {
-    if (isMovingSlider) {
+    if (!editToolsOn) {
+        return;
+    }
+
+    // if we're panning or orbiting from touch, ignore these... because our touch takes precedence. 
+    if (isOrbitingFromTouch || isPanningFromTouch) {
+        return; 
+    }
+    
+    // double check that we didn't accidentally miss a pan or orbit click request
+    if (trackAsOrbitOrPan && !isPanning && !isOrbiting) {
+        if (event.isLeftButton && !event.isRightButton) {
+            startOrbitMode(event);
+            isOrbiting = true;
+        }
+        if (!event.isLeftButton && event.isRightButton) {
+            startPanMode(event);
+            isPanning = true;
+        }
+    }
+
+    if (!trackAsOrbitOrPan && isMovingSlider) {
         thumbX = (event.x - thumbClickOffsetX) - sliderX;
         if (thumbX < minThumbX) {
             thumbX = minThumbX;
@@ -795,21 +919,10 @@ function mouseMoveEvent(event) {
         calcScaleFromThumb(thumbX);
         
     } else if (isOrbiting) {
-        var cameraOrientation = Camera.getOrientation();
-        var origEulers = Quat.safeEulerAngles(cameraOrientation);
-        var newEulers = fixEulerAngles(Quat.safeEulerAngles(cameraOrientation));
-        var dx = event.x - mouseX; 
-        var dy = event.y - mouseY;
-        orbitAzimuth += dx / ORBIT_RATE_AZIMUTH;
-        orbitAltitude += dy / ORBIT_RATE_ALTITUDE;
-         var orbitVector = { x:(Math.cos(orbitAltitude) * Math.cos(orbitAzimuth)) * orbitRadius, 
-                            y:Math.sin(orbitAltitude) * orbitRadius,
-                            z:(Math.cos(orbitAltitude) * Math.sin(orbitAzimuth)) * orbitRadius }; 
-        orbitPosition = Vec3.sum(orbitCenter, orbitVector);
-        Camera.setPosition(orbitPosition);
-        mouseX = event.x; 
-        mouseY = event.y;
-    } else if (isAdding) {
+        handleOrbitingMove(event);
+    } else if (isPanning) {
+        handlePanMove(event);
+    } else if (!trackAsOrbitOrPan && isAdding) {
         //  Watch the drag direction to tell which way to 'extrude' this voxel
         if (!isExtruding) {
             var pickRay = Camera.computePickRay(event.x, event.y);
@@ -861,18 +974,17 @@ function mouseReleaseEvent(event) {
     if (isMovingSlider) {
         isMovingSlider = false;
     }
-
+    
     if (isOrbiting) {
-        var cameraOrientation = Camera.getOrientation();
-        var eulers = Quat.safeEulerAngles(cameraOrientation);
-        MyAvatar.position = Camera.getPosition();
-        MyAvatar.orientation = cameraOrientation;
-        Camera.stopLooking();
-        Camera.setMode(oldMode);
-        Camera.setOrientation(cameraOrientation);
+        endOrbitMode(event);
+        isOrbiting = false;
+    }
+    if (isPanning) {
+        print("mouseReleaseEvent... calling endPanMode()");
+        endPanMode(event);
+        isPanning = false;
     }
     isAdding = false;
-    isOrbiting = false; 
     isExtruding = false; 
 }
 
@@ -915,7 +1027,7 @@ function moveTools() {
         recolorToolColor = toolSelectedColor;
     } else if (trackAsEyedropper) {
         eyedropperToolColor = toolSelectedColor;
-    } else if (trackAsOrbit) {
+    } else if (trackAsOrbitOrPan) {
         // nothing gets selected in this case...
     } else {
         addToolColor = toolSelectedColor;
@@ -962,6 +1074,101 @@ function moveTools() {
 
 }
 
+function touchBeginEvent(event) {
+    if (!editToolsOn) {
+        return;
+    }
+    
+    // if we're already in the middle of orbiting or panning, then ignore these multi-touch events...
+    if (isOrbiting || isPanning) {
+        return;
+    }    
+    
+    if (event.isAlt || trackAsOrbitOrPan) {
+        if (event.touchPoints == touchPointsToOrbit) {
+            // we need to double check that we didn't start an orbit, because the touch events will sometimes
+            // come in as 2 then 3 touches... 
+            if (isPanningFromTouch) {
+                print("touchBeginEvent... calling endPanMode()");
+                endPanMode(event);
+                isPanningFromTouch = false;
+            }
+            startOrbitMode(event);
+            isOrbitingFromTouch = true;
+        } else if (event.touchPoints == touchPointsToPan) {
+            // we need to double check that we didn't start an orbit, because the touch events will sometimes
+            // come in as 2 then 3 touches... 
+            if (isOrbitingFromTouch) {
+                endOrbitMode(event);
+                isOrbitingFromTouch = false;
+            }
+            startPanMode(event);
+            isPanningFromTouch = true;
+        }
+    }
+}
+
+function touchUpdateEvent(event) {
+    if (!editToolsOn) {
+        return;
+    }
+
+    // if we're already in the middle of orbiting or panning, then ignore these multi-touch events...
+    if (isOrbiting || isPanning) {
+        return;
+    }    
+    
+    if (isOrbitingFromTouch) {
+        // we need to double check that we didn't start an orbit, because the touch events will sometimes
+        // come in as 2 then 3 touches... 
+        if (event.touchPoints == touchPointsToPan) {
+            //print("we now have touchPointsToPan touches... switch to pan...");
+            endOrbitMode(event);
+            isOrbitingFromTouch = false;
+            startPanMode(event);
+            isPanningFromTouch = true;
+        } else {
+            handleOrbitingMove(event);
+        }
+    }
+    if (isPanningFromTouch) {
+        //print("touchUpdateEvent... isPanningFromTouch... event.touchPoints=" + event.touchPoints);
+        // we need to double check that we didn't start an orbit, because the touch events will sometimes
+        // come in as 2 then 3 touches... 
+        if (event.touchPoints == touchPointsToOrbit) {
+            //print("we now have touchPointsToOrbit touches... switch to orbit...");
+            //print("touchUpdateEvent... calling endPanMode()");
+            endPanMode(event);
+            isPanningFromTouch = false;
+            startOrbitMode(event);
+            isOrbitingFromTouch = true;
+            handleOrbitingMove(event);
+        } else {
+            handlePanMove(event);
+        }
+    }
+}
+
+function touchEndEvent(event) {
+    if (!editToolsOn) {
+        return;
+    }
+
+    // if we're already in the middle of orbiting or panning, then ignore these multi-touch events...
+    if (isOrbiting || isPanning) {
+        return;
+    }    
+    
+    if (isOrbitingFromTouch) {
+        endOrbitMode(event);
+        isOrbitingFromTouch = false;
+    }
+    if (isPanningFromTouch) {
+        print("touchEndEvent... calling endPanMode()");
+        endPanMode(event);
+        isPanningFromTouch = false;
+    }
+}
 
 function update() {
     var newWindowDimensions = Controller.getViewportDimensions();
@@ -976,6 +1183,10 @@ Controller.mouseReleaseEvent.connect(mouseReleaseEvent);
 Controller.mouseMoveEvent.connect(mouseMoveEvent);
 Controller.keyPressEvent.connect(keyPressEvent);
 Controller.keyReleaseEvent.connect(keyReleaseEvent);
+Controller.touchBeginEvent.connect(touchBeginEvent);
+Controller.touchUpdateEvent.connect(touchUpdateEvent);
+Controller.touchEndEvent.connect(touchEndEvent);
+
 
 function scriptEnding() {
     Overlays.deleteOverlay(voxelPreview);

From fb06512e67d88abbebb3fc7d27ff433378ce1efc Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 20 Feb 2014 23:47:46 -0800
Subject: [PATCH 02/14] improve z fighting adjust for preview voxels and
 highlights

---
 examples/editVoxels.js | 77 ++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index 59cb56fab6..4e1dff008b 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -24,6 +24,9 @@ var ORBIT_RATE_ALTITUDE = 200.0;
 var ORBIT_RATE_AZIMUTH = 90.0;
 var PIXELS_PER_EXTRUDE_VOXEL = 16;
 
+var zFightingSizeAdjust = 0.002; // used to adjust preview voxels to prevent z fighting
+var previewLineWidth = 1.5;
+
 var oldMode = Camera.getMode();
 
 var key_alt = false;
@@ -98,7 +101,7 @@ var linePreviewTop = Overlays.addOverlay("line3d", {
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1,
                     visible: false,
-                    lineWidth: 1
+                    lineWidth: previewLineWidth
                 });
 
 var linePreviewBottom = Overlays.addOverlay("line3d", {
@@ -107,7 +110,7 @@ var linePreviewBottom = Overlays.addOverlay("line3d", {
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1,
                     visible: false,
-                    lineWidth: 1
+                    lineWidth: previewLineWidth
                 });
 
 var linePreviewLeft = Overlays.addOverlay("line3d", {
@@ -116,7 +119,7 @@ var linePreviewLeft = Overlays.addOverlay("line3d", {
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1,
                     visible: false,
-                    lineWidth: 1
+                    lineWidth: previewLineWidth
                 });
 
 var linePreviewRight = Overlays.addOverlay("line3d", {
@@ -125,7 +128,7 @@ var linePreviewRight = Overlays.addOverlay("line3d", {
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1,
                     visible: false,
-                    lineWidth: 1
+                    lineWidth: previewLineWidth
                 });
 
 
@@ -356,82 +359,82 @@ function calculateVoxelFromIntersection(intersection, operation) {
 
     // now we also want to calculate the "edge square" for the face for this voxel
     if (intersection.face == "MIN_X_FACE") {
-        highlightAt.x = intersection.voxel.x;
+        highlightAt.x = intersection.voxel.x - zFightingSizeAdjust;
         resultVoxel.x = intersection.voxel.x;
         if (operation == "add") {
             resultVoxel.x -= voxelSize;
         }
         
-        resultVoxel.bottomLeft = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z };
-        resultVoxel.bottomRight = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z + voxelSize };
-        resultVoxel.topLeft = {x: highlightAt.x, y: highlightAt.y + voxelSize, z: highlightAt.z };
-        resultVoxel.topRight = {x: highlightAt.x, y: highlightAt.y + voxelSize, z: highlightAt.z + voxelSize };
+        resultVoxel.bottomLeft = {x: highlightAt.x, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z + zFightingSizeAdjust };
+        resultVoxel.bottomRight = {x: highlightAt.x, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z + voxelSize - zFightingSizeAdjust };
+        resultVoxel.topLeft = {x: highlightAt.x, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z + zFightingSizeAdjust };
+        resultVoxel.topRight = {x: highlightAt.x, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z + voxelSize - zFightingSizeAdjust };
 
     } else if (intersection.face == "MAX_X_FACE") {
-        highlightAt.x = intersection.voxel.x + intersection.voxel.s;
+        highlightAt.x = intersection.voxel.x + intersection.voxel.s + zFightingSizeAdjust;
         resultVoxel.x = intersection.voxel.x + intersection.voxel.s;
         if (operation != "add") {
             resultVoxel.x -= voxelSize;
         }
 
-        resultVoxel.bottomLeft = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z };
-        resultVoxel.bottomRight = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z + voxelSize };
-        resultVoxel.topLeft = {x: highlightAt.x, y: highlightAt.y + voxelSize, z: highlightAt.z };
-        resultVoxel.topRight = {x: highlightAt.x, y: highlightAt.y + voxelSize, z: highlightAt.z + voxelSize };
+        resultVoxel.bottomRight = {x: highlightAt.x, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z + zFightingSizeAdjust };
+        resultVoxel.bottomLeft = {x: highlightAt.x, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z + voxelSize - zFightingSizeAdjust };
+        resultVoxel.topRight = {x: highlightAt.x, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z + zFightingSizeAdjust };
+        resultVoxel.topLeft = {x: highlightAt.x, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z + voxelSize - zFightingSizeAdjust };
 
     } else if (intersection.face == "MIN_Y_FACE") {
 
-        highlightAt.y = intersection.voxel.y;
+        highlightAt.y = intersection.voxel.y - zFightingSizeAdjust;
         resultVoxel.y = intersection.voxel.y;
         
         if (operation == "add") {
             resultVoxel.y -= voxelSize;
         }
         
-        resultVoxel.bottomLeft = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z };
-        resultVoxel.bottomRight = {x: highlightAt.x + voxelSize , y: highlightAt.y, z: highlightAt.z};
-        resultVoxel.topLeft = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z  + voxelSize };
-        resultVoxel.topRight = {x: highlightAt.x + voxelSize , y: highlightAt.y, z: highlightAt.z + voxelSize};
+        resultVoxel.topRight = {x: highlightAt.x + zFightingSizeAdjust , y: highlightAt.y, z: highlightAt.z + zFightingSizeAdjust  };
+        resultVoxel.topLeft = {x: highlightAt.x + voxelSize - zFightingSizeAdjust, y: highlightAt.y, z: highlightAt.z + zFightingSizeAdjust };
+        resultVoxel.bottomRight = {x: highlightAt.x + zFightingSizeAdjust , y: highlightAt.y, z: highlightAt.z  + voxelSize - zFightingSizeAdjust };
+        resultVoxel.bottomLeft = {x: highlightAt.x + voxelSize - zFightingSizeAdjust , y: highlightAt.y, z: highlightAt.z + voxelSize - zFightingSizeAdjust };
 
     } else if (intersection.face == "MAX_Y_FACE") {
 
-        highlightAt.y = intersection.voxel.y + intersection.voxel.s;
+        highlightAt.y = intersection.voxel.y + intersection.voxel.s + zFightingSizeAdjust;
         resultVoxel.y = intersection.voxel.y + intersection.voxel.s;
         if (operation != "add") {
             resultVoxel.y -= voxelSize;
         }
         
-        resultVoxel.bottomLeft = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z };
-        resultVoxel.bottomRight = {x: highlightAt.x + voxelSize , y: highlightAt.y, z: highlightAt.z};
-        resultVoxel.topLeft = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z  + voxelSize };
-        resultVoxel.topRight = {x: highlightAt.x + voxelSize , y: highlightAt.y, z: highlightAt.z + voxelSize};
+        resultVoxel.bottomRight = {x: highlightAt.x + zFightingSizeAdjust, y: highlightAt.y, z: highlightAt.z + zFightingSizeAdjust };
+        resultVoxel.bottomLeft = {x: highlightAt.x + voxelSize - zFightingSizeAdjust, y: highlightAt.y, z: highlightAt.z + zFightingSizeAdjust};
+        resultVoxel.topRight = {x: highlightAt.x + zFightingSizeAdjust, y: highlightAt.y, z: highlightAt.z  + voxelSize - zFightingSizeAdjust};
+        resultVoxel.topLeft = {x: highlightAt.x + voxelSize - zFightingSizeAdjust, y: highlightAt.y, z: highlightAt.z + voxelSize - zFightingSizeAdjust};
 
     } else if (intersection.face == "MIN_Z_FACE") {
 
-        highlightAt.z = intersection.voxel.z;
+        highlightAt.z = intersection.voxel.z - zFightingSizeAdjust;
         resultVoxel.z = intersection.voxel.z;
         
         if (operation == "add") {
             resultVoxel.z -= voxelSize;
         }
         
-        resultVoxel.bottomLeft = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z };
-        resultVoxel.bottomRight = {x: highlightAt.x + voxelSize , y: highlightAt.y, z: highlightAt.z};
-        resultVoxel.topLeft = {x: highlightAt.x, y: highlightAt.y + voxelSize, z: highlightAt.z };
-        resultVoxel.topRight = {x: highlightAt.x + voxelSize , y: highlightAt.y + voxelSize, z: highlightAt.z};
+        resultVoxel.bottomRight = {x: highlightAt.x + zFightingSizeAdjust, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z };
+        resultVoxel.bottomLeft = {x: highlightAt.x + voxelSize - zFightingSizeAdjust, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z};
+        resultVoxel.topRight = {x: highlightAt.x + zFightingSizeAdjust, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z };
+        resultVoxel.topLeft = {x: highlightAt.x + voxelSize - zFightingSizeAdjust, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z};
 
     } else if (intersection.face == "MAX_Z_FACE") {
 
-        highlightAt.z = intersection.voxel.z + intersection.voxel.s;
+        highlightAt.z = intersection.voxel.z + intersection.voxel.s + zFightingSizeAdjust;
         resultVoxel.z = intersection.voxel.z + intersection.voxel.s;
         if (operation != "add") {
             resultVoxel.z -= voxelSize;
         }
 
-        resultVoxel.bottomLeft = {x: highlightAt.x, y: highlightAt.y, z: highlightAt.z };
-        resultVoxel.bottomRight = {x: highlightAt.x + voxelSize , y: highlightAt.y, z: highlightAt.z};
-        resultVoxel.topLeft = {x: highlightAt.x, y: highlightAt.y + voxelSize, z: highlightAt.z };
-        resultVoxel.topRight = {x: highlightAt.x + voxelSize , y: highlightAt.y + voxelSize, z: highlightAt.z};
+        resultVoxel.bottomLeft = {x: highlightAt.x + zFightingSizeAdjust, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z };
+        resultVoxel.bottomRight = {x: highlightAt.x + voxelSize - zFightingSizeAdjust, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z};
+        resultVoxel.topLeft = {x: highlightAt.x + zFightingSizeAdjust, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z };
+        resultVoxel.topRight = {x: highlightAt.x + voxelSize - zFightingSizeAdjust, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z};
 
     }
     
@@ -466,7 +469,7 @@ function showPreviewVoxel() {
         guidePosition = calculateVoxelFromIntersection(intersection,"delete");
         Overlays.editOverlay(voxelPreview, { 
                 position: guidePosition,
-                size: guidePosition.s,
+                size: guidePosition.s + zFightingSizeAdjust,
                 visible: true,
                 color: { red: 255, green: 0, blue: 0 },
                 solid: false,
@@ -477,7 +480,7 @@ function showPreviewVoxel() {
 
         Overlays.editOverlay(voxelPreview, { 
                 position: guidePosition,
-                size: guidePosition.s + 0.002,
+                size: guidePosition.s + zFightingSizeAdjust,
                 visible: true,
                 color: voxelColor,
                 solid: true,
@@ -490,7 +493,7 @@ function showPreviewVoxel() {
 
         Overlays.editOverlay(voxelPreview, { 
                 position: guidePosition,
-                size: guidePosition.s,
+                size: (guidePosition.s - zFightingSizeAdjust),
                 visible: true,
                 color: voxelColor,
                 solid: true,

From 8dac269c3cd0437f010be41944abde6a799b02e6 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Fri, 21 Feb 2014 00:27:40 -0800
Subject: [PATCH 03/14] added selectable tools to the tool palette

---
 examples/editVoxels.js | 140 +++++++++++++++++++++++++++++------------
 1 file changed, 101 insertions(+), 39 deletions(-)

diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index 4e1dff008b..0ab94918c0 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -29,8 +29,6 @@ var previewLineWidth = 1.5;
 
 var oldMode = Camera.getMode();
 
-var key_alt = false;
-var key_shift = false;
 var isAdding = false; 
 var isExtruding = false; 
 var isOrbiting = false;
@@ -54,8 +52,6 @@ var dragStart = { x: 0, y: 0 };
 var mouseX = 0;
 var mouseY = 0; 
 
-
-
 //  Create a table of the different colors you can choose
 var colors = new Array();
 colors[0] = { red: 237, green: 175, blue: 0 };
@@ -337,6 +333,12 @@ var trackAsRecolor = false;
 var trackAsEyedropper = false;
 var trackAsOrbitOrPan = false;
 
+var addToolSelected = true;
+var deleteToolSelected = false;
+var recolorToolSelected = false;
+var eyedropperToolSelected = false;
+var selectToolSelected = false;
+
 function calculateVoxelFromIntersection(intersection, operation) {
     //print("calculateVoxelFromIntersection() operation="+operation);
     var resultVoxel;
@@ -465,7 +467,7 @@ function showPreviewVoxel() {
 
     var guidePosition;
     
-    if (trackAsDelete) {
+    if (trackAsDelete || deleteToolSelected) {
         guidePosition = calculateVoxelFromIntersection(intersection,"delete");
         Overlays.editOverlay(voxelPreview, { 
                 position: guidePosition,
@@ -475,7 +477,17 @@ function showPreviewVoxel() {
                 solid: false,
                 alpha: 1
             });
-    } else if (trackAsRecolor || trackAsEyedropper) {
+    } 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, { 
@@ -488,7 +500,7 @@ function showPreviewVoxel() {
             });
     } else if (trackAsOrbitOrPan) {
         Overlays.editOverlay(voxelPreview, { visible: false });
-    } else if (!isExtruding) {
+    } else if (addToolSelected && !isExtruding) {
         guidePosition = calculateVoxelFromIntersection(intersection,"add");
 
         Overlays.editOverlay(voxelPreview, { 
@@ -517,12 +529,25 @@ function showPreviewLines() {
         }
 
         resultVoxel = calculateVoxelFromIntersection(intersection,"");
-        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 });
-
+        if (selectToolSelected) {
+            Overlays.editOverlay(voxelPreview, { 
+                    position: resultVoxel,
+                    size: resultVoxel.s + zFightingSizeAdjust,
+                    visible: true,
+                    color: { red: 255, green: 255, blue: 255 },
+                    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 {
+        Overlays.editOverlay(voxelPreview, { visible: false });
         Overlays.editOverlay(linePreviewTop, { visible: false });
         Overlays.editOverlay(linePreviewBottom, { visible: false });
         Overlays.editOverlay(linePreviewLeft, { visible: false });
@@ -542,9 +567,6 @@ function showPreviewGuides() {
             Overlays.editOverlay(linePreviewRight, { visible: false });
         } else {
             showPreviewLines();
-
-            // make sure alternative is hidden
-            Overlays.editOverlay(voxelPreview, { visible: false });
         }
     } else {
         // make sure all previews are off
@@ -656,7 +678,7 @@ function startOrbitMode(event) {
     orbitAzimuth = Math.atan2(orbitVector.z, orbitVector.x);
     orbitAltitude = Math.asin(orbitVector.y / Vec3.length(orbitVector));
     
-    print("startOrbitMode...");
+    //print("startOrbitMode...");
 }
 
 function handleOrbitingMove(event) {
@@ -674,7 +696,7 @@ function handleOrbitingMove(event) {
     Camera.setPosition(orbitPosition);
     mouseX = event.x; 
     mouseY = event.y;
-    print("handleOrbitingMove...");
+    //print("handleOrbitingMove...");
 }
 
 function endOrbitMode(event) {
@@ -685,7 +707,7 @@ function endOrbitMode(event) {
     Camera.stopLooking();
     Camera.setMode(oldMode);
     Camera.setOrientation(cameraOrientation);
-    print("endOrbitMode...");
+    //print("endOrbitMode...");
 }
 
 function startPanMode(event, intersection) {
@@ -694,7 +716,8 @@ function startPanMode(event, intersection) {
 }
 
 function handlePanMove(event) {
-    print("PANNING mode!!! isPanning="+isPanning + " inPanningFromTouch="+isPanningFromTouch + " trackAsOrbitOrPan="+trackAsOrbitOrPan);
+    print("PANNING mode!!! ");
+    //print("isPanning="+isPanning + " inPanningFromTouch="+isPanningFromTouch + " trackAsOrbitOrPan="+trackAsOrbitOrPan);
 }
 
 function endPanMode(event) {
@@ -736,30 +759,72 @@ function mousePressEvent(event) {
     
     // no clicking on overlays while in panning mode
     if (!trackAsOrbitOrPan) {
-        var clickedOnSwatch = false;
+        var clickedOnSomething = false;
         var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y});
+        
+print("clickedOverlay="+clickedOverlay);        
 
         // If the user clicked on the thumb, handle the slider logic
         if (clickedOverlay == thumb) {
             isMovingSlider = true;
             thumbClickOffsetX = event.x - (sliderX + thumbX); // this should be the position of the mouse relative to the thumb
-            return; // no further processing
+            clickedOnSomething = true;
+        } else if (clickedOverlay == addTool) {
+            addToolSelected = true;
+            deleteToolSelected = false;
+            recolorToolSelected = false;
+            eyedropperToolSelected = false;
+            selectToolSelected = false;
+            moveTools();
+            clickedOnSomething = true;
+        } else if (clickedOverlay == deleteTool) {
+            addToolSelected = false;
+            deleteToolSelected = true;
+            recolorToolSelected = false;
+            eyedropperToolSelected = false;
+            selectToolSelected = false;
+            moveTools();
+            clickedOnSomething = true;
+        } else if (clickedOverlay == recolorTool) {
+            addToolSelected = false;
+            deleteToolSelected = false;
+            recolorToolSelected = true;
+            eyedropperToolSelected = false;
+            selectToolSelected = false;
+            moveTools();
+            clickedOnSomething = true;
+        } else if (clickedOverlay == eyedropperTool) {
+            addToolSelected = false;
+            deleteToolSelected = false;
+            recolorToolSelected = false;
+            eyedropperToolSelected = true;
+            selectToolSelected = false;
+            moveTools();
+            clickedOnSomething = true;
+        } else if (clickedOverlay == selectTool) {
+            addToolSelected = false;
+            deleteToolSelected = false;
+            recolorToolSelected = false;
+            eyedropperToolSelected = false;
+            selectToolSelected = true;
+            moveTools();
+            clickedOnSomething = true;
         } else {
             // if the user clicked on one of the color swatches, update the selectedSwatch
             for (s = 0; s < numColors; s++) {
                 if (clickedOverlay == swatches[s]) {
                     whichColor = s;
                     moveTools();
-                    clickedOnSwatch = true;
+                    clickedOnSomething = true;
+                    break;
                 }
             }
-            if (clickedOnSwatch) {
-                return; // no further processing
-            }
+        }
+        if (clickedOnSomething) {
+            return; // no further processing
         }
     }
     
-
     // TODO: does any of this stuff need to execute if we're panning or orbiting?
     trackMouseEvent(event); // used by preview support
     mouseX = event.x;
@@ -783,13 +848,13 @@ function mousePressEvent(event) {
                 startPanMode(event);
                 isPanning = true;
             }
-        } else if (trackAsDelete || (event.isRightButton && !trackAsEyedropper)) {
+        } else if (deleteToolSelected || trackAsDelete || (event.isRightButton && !trackAsEyedropper)) {
             //  Delete voxel
             voxelDetails = calculateVoxelFromIntersection(intersection,"delete");
             Voxels.eraseVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s);
             Audio.playSound(deleteSound, audioOptions);
             Overlays.editOverlay(voxelPreview, { visible: false });
-        } else if (trackAsEyedropper) {
+        } else if (eyedropperToolSelected || trackAsEyedropper) {
             if (whichColor != -1) {
                 colors[whichColor].red = intersection.voxel.red;
                 colors[whichColor].green = intersection.voxel.green;
@@ -797,7 +862,7 @@ function mousePressEvent(event) {
                 moveTools();
             }
             
-        } else if (trackAsRecolor) {
+        } else if (recolorToolSelected || trackAsRecolor) {
             //  Recolor Voxel
             voxelDetails = calculateVoxelFromIntersection(intersection,"recolor");
 
@@ -807,7 +872,7 @@ function mousePressEvent(event) {
                             colors[whichColor].red, colors[whichColor].green, colors[whichColor].blue);
             Audio.playSound(changeColorSound, audioOptions);
             Overlays.editOverlay(voxelPreview, { visible: false });
-        } else {
+        } else if (addToolSelected) {
             //  Add voxel on face
             if (whichColor == -1) {
                 //  Copy mode - use clicked voxel color
@@ -833,15 +898,13 @@ function mousePressEvent(event) {
             Overlays.editOverlay(voxelPreview, { visible: false });
             dragStart = { x: event.x, y: event.y };
             isAdding = true;
-        }       
+        } 
     }
 }
 
 function keyPressEvent(event) {
     // if our tools are off, then don't do anything
     if (editToolsOn) {
-        key_alt = event.isAlt;
-        key_shift = event.isShifted;
         var nVal = parseInt(event.text);
         if (event.text == "0") {
             print("Color = Copy");
@@ -884,8 +947,6 @@ function keyPressEvent(event) {
 
 function keyReleaseEvent(event) {
     trackKeyReleaseEvent(event); // used by preview support
-    key_alt = false;
-    key_shift = false; 
 }
 
 
@@ -1024,12 +1085,14 @@ function moveTools() {
     eyedropperToolColor = notSelectedColor;
     selectToolColor = notSelectedColor;
 
-    if (trackAsDelete) {
+    if (trackAsDelete || deleteToolSelected) {
         deleteToolColor = toolSelectedColor;
-    } else if (trackAsRecolor) {
+    } else if (trackAsRecolor || recolorToolSelected) {
         recolorToolColor = toolSelectedColor;
-    } else if (trackAsEyedropper) {
+    } else if (trackAsEyedropper || eyedropperToolSelected) {
         eyedropperToolColor = toolSelectedColor;
+    } else if (selectToolSelected) {
+        selectToolColor = toolSelectedColor;
     } else if (trackAsOrbitOrPan) {
         // nothing gets selected in this case...
     } else {
@@ -1066,7 +1129,6 @@ function moveTools() {
                     visible: editToolsOn
                 });
 
-
     sliderX = swatchesX + swatchesWidth;
     sliderY = windowDimensions.y - sliderHeight;
     Overlays.editOverlay(slider, { x: sliderX, y: sliderY, visible: editToolsOn });

From 03d6173c90d7c80b5dc1287be32811f1cd70a8bd Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 11:38:23 -0800
Subject: [PATCH 04/14] add Voxels.getFaceVector() to JS

---
 .../voxels/src/VoxelsScriptingInterface.cpp    | 18 ++++++++++++++++++
 .../voxels/src/VoxelsScriptingInterface.h      |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/libraries/voxels/src/VoxelsScriptingInterface.cpp b/libraries/voxels/src/VoxelsScriptingInterface.cpp
index c0468ccca6..bc9639f6a9 100644
--- a/libraries/voxels/src/VoxelsScriptingInterface.cpp
+++ b/libraries/voxels/src/VoxelsScriptingInterface.cpp
@@ -64,3 +64,21 @@ RayToVoxelIntersectionResult VoxelsScriptingInterface::findRayIntersection(const
     }
     return result;
 }
+
+glm::vec3 VoxelsScriptingInterface::getFaceVector(const QString& face) {
+    if (face == "MIN_X_FACE") {
+        return glm::vec3(-1, 0, 0);
+    } else if (face == "MAX_X_FACE") {
+        return glm::vec3(1, 0, 0);
+    } else if (face == "MIN_Y_FACE") {
+        return glm::vec3(0, -1, 0);
+    } else if (face == "MAX_Y_FACE") {
+        return glm::vec3(0, 1, 0);
+    } else if (face == "MIN_Z_FACE") {
+        return glm::vec3(0, 0, -1);
+    } else if (face == "MAX_Z_FACE") {
+        return glm::vec3(0, 0, 1);
+    }
+    return glm::vec3(0, 0, 0); //error case
+}
+
diff --git a/libraries/voxels/src/VoxelsScriptingInterface.h b/libraries/voxels/src/VoxelsScriptingInterface.h
index f87e8d0a4c..88363bef39 100644
--- a/libraries/voxels/src/VoxelsScriptingInterface.h
+++ b/libraries/voxels/src/VoxelsScriptingInterface.h
@@ -60,6 +60,9 @@ public slots:
     /// If the scripting context has visible voxels, this will determine a ray intersection
     RayToVoxelIntersectionResult findRayIntersection(const PickRay& ray);
 
+    /// returns a voxel space axis aligned vector for the face, useful in doing voxel math
+    glm::vec3 getFaceVector(const QString& face);
+
 private:
     void queueVoxelAdd(PacketType addPacketType, VoxelDetail& addVoxelDetails);
     VoxelTree* _tree;

From 9831fb57971c446d35a0acba4cb48a493f397268 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 12:09:53 -0800
Subject: [PATCH 05/14] fix calculateVoxelFromIntersection() in editVoxels.js
 to work same as C++ code for voxel sizes larger than intersecting voxel

---
 examples/editVoxels.js | 100 ++++++++++++++++++++++++++++-------------
 1 file changed, 69 insertions(+), 31 deletions(-)

diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index 0ab94918c0..219589f78d 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -25,7 +25,7 @@ var ORBIT_RATE_AZIMUTH = 90.0;
 var PIXELS_PER_EXTRUDE_VOXEL = 16;
 
 var zFightingSizeAdjust = 0.002; // used to adjust preview voxels to prevent z fighting
-var previewLineWidth = 1.5;
+var previewLineWidth = 3; // 1.5;
 
 var oldMode = Camera.getMode();
 
@@ -339,9 +339,22 @@ var recolorToolSelected = false;
 var eyedropperToolSelected = false;
 var selectToolSelected = false;
 
+
 function calculateVoxelFromIntersection(intersection, operation) {
     //print("calculateVoxelFromIntersection() operation="+operation);
     var resultVoxel;
+
+    var wantDebug = false;
+    if (wantDebug) {
+        print(">>>>> calculateVoxelFromIntersection().... intersection voxel.red/green/blue=" + intersection.voxel.red + ", " 
+                                + intersection.voxel.green + ", " + intersection.voxel.blue);
+        print("   intersection voxel.x/y/z/s=" + intersection.voxel.x + ", " 
+                                + intersection.voxel.y + ", " + intersection.voxel.z+ ": " + intersection.voxel.s);
+        print("   intersection face=" + intersection.face);
+        print("   intersection distance=" + intersection.distance);
+        print("   intersection intersection.x/y/z=" + intersection.intersection.x + ", " 
+                                + intersection.intersection.y + ", " + intersection.intersection.z);
+    }
     
     var voxelSize;
     if (pointerVoxelScaleSet) {
@@ -350,20 +363,48 @@ function calculateVoxelFromIntersection(intersection, operation) {
         voxelSize = intersection.voxel.s; 
     }
 
-    // first, calculate the enclosed voxel of size voxelSize that the intersection point falls inside of.
-    // if you have a voxelSize that's smaller than the voxel you're intersecting, this calculation will result
-    // in the subvoxel that the intersection point falls in
-    var x = Math.floor(intersection.intersection.x / voxelSize) * voxelSize;
-    var y = Math.floor(intersection.intersection.y / voxelSize) * voxelSize;
-    var z = Math.floor(intersection.intersection.z / voxelSize) * voxelSize;
+    var x;
+    var y;
+    var z;
+    
+    // if our "target voxel size" is larger than the voxel we intersected with, then we need to find the closest
+    // ancestor voxel of our target size that contains our intersected voxel.
+    if (voxelSize > intersection.voxel.s) {
+        if (wantDebug) {
+            print("voxelSize > intersection.voxel.s.... choose the larger voxel that encompasses the one selected");
+        }
+        x = Math.floor(intersection.voxel.x / voxelSize) * voxelSize;
+        y = Math.floor(intersection.voxel.y / voxelSize) * voxelSize;
+        z = Math.floor(intersection.voxel.z / voxelSize) * voxelSize;
+    } else {
+        // otherwise, calculate the enclosed voxel of size voxelSize that the intersection point falls inside of.
+        // if you have a voxelSize that's smaller than the voxel you're intersecting, this calculation will result
+        // in the subvoxel that the intersection point falls in, if the target voxelSize matches the intersecting
+        // voxel this still works and results in returning the intersecting voxel which is what we want
+        var adjustToCenter = Vec3.multiply(Voxels.getFaceVector(intersection.face), (voxelSize * -0.5));
+        if (wantDebug) {
+            print("adjustToCenter=" + adjustToCenter.x + "," + adjustToCenter.y + "," + adjustToCenter.z);
+        }
+        var centerOfIntersectingVoxel = Vec3.sum(intersection.intersection, adjustToCenter);
+        x = Math.floor(centerOfIntersectingVoxel.x / voxelSize) * voxelSize;
+        y = Math.floor(centerOfIntersectingVoxel.y / voxelSize) * voxelSize;
+        z = Math.floor(centerOfIntersectingVoxel.z / voxelSize) * voxelSize;
+    }
     resultVoxel = { x: x, y: y, z: z, s: voxelSize };
     highlightAt = { x: x, y: y, z: z, s: voxelSize };
 
+    // we only do the "add to the face we're pointing at" adjustment, if the operation is an add
+    // operation, and the target voxel size is equal to or smaller than the intersecting voxel.
+    var wantAddAdjust = (operation == "add" && (voxelSize <= intersection.voxel.s));
+    if (wantDebug) {
+        print("wantAddAdjust="+wantAddAdjust);
+    }
+
     // now we also want to calculate the "edge square" for the face for this voxel
     if (intersection.face == "MIN_X_FACE") {
-        highlightAt.x = intersection.voxel.x - zFightingSizeAdjust;
-        resultVoxel.x = intersection.voxel.x;
-        if (operation == "add") {
+
+        highlightAt.x = x - zFightingSizeAdjust;
+        if (wantAddAdjust) {
             resultVoxel.x -= voxelSize;
         }
         
@@ -373,10 +414,10 @@ function calculateVoxelFromIntersection(intersection, operation) {
         resultVoxel.topRight = {x: highlightAt.x, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z + voxelSize - zFightingSizeAdjust };
 
     } else if (intersection.face == "MAX_X_FACE") {
-        highlightAt.x = intersection.voxel.x + intersection.voxel.s + zFightingSizeAdjust;
-        resultVoxel.x = intersection.voxel.x + intersection.voxel.s;
-        if (operation != "add") {
-            resultVoxel.x -= voxelSize;
+
+        highlightAt.x = x + voxelSize + zFightingSizeAdjust;
+        if (wantAddAdjust) {
+            resultVoxel.x += resultVoxel.s;
         }
 
         resultVoxel.bottomRight = {x: highlightAt.x, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z + zFightingSizeAdjust };
@@ -386,10 +427,8 @@ function calculateVoxelFromIntersection(intersection, operation) {
 
     } else if (intersection.face == "MIN_Y_FACE") {
 
-        highlightAt.y = intersection.voxel.y - zFightingSizeAdjust;
-        resultVoxel.y = intersection.voxel.y;
-        
-        if (operation == "add") {
+        highlightAt.y = y - zFightingSizeAdjust;
+        if (wantAddAdjust) {
             resultVoxel.y -= voxelSize;
         }
         
@@ -400,10 +439,9 @@ function calculateVoxelFromIntersection(intersection, operation) {
 
     } else if (intersection.face == "MAX_Y_FACE") {
 
-        highlightAt.y = intersection.voxel.y + intersection.voxel.s + zFightingSizeAdjust;
-        resultVoxel.y = intersection.voxel.y + intersection.voxel.s;
-        if (operation != "add") {
-            resultVoxel.y -= voxelSize;
+        highlightAt.y = y + voxelSize + zFightingSizeAdjust;
+        if (wantAddAdjust) {
+            resultVoxel.y += voxelSize;
         }
         
         resultVoxel.bottomRight = {x: highlightAt.x + zFightingSizeAdjust, y: highlightAt.y, z: highlightAt.z + zFightingSizeAdjust };
@@ -413,10 +451,8 @@ function calculateVoxelFromIntersection(intersection, operation) {
 
     } else if (intersection.face == "MIN_Z_FACE") {
 
-        highlightAt.z = intersection.voxel.z - zFightingSizeAdjust;
-        resultVoxel.z = intersection.voxel.z;
-        
-        if (operation == "add") {
+        highlightAt.z = z - zFightingSizeAdjust;
+        if (wantAddAdjust) {
             resultVoxel.z -= voxelSize;
         }
         
@@ -427,10 +463,9 @@ function calculateVoxelFromIntersection(intersection, operation) {
 
     } else if (intersection.face == "MAX_Z_FACE") {
 
-        highlightAt.z = intersection.voxel.z + intersection.voxel.s + zFightingSizeAdjust;
-        resultVoxel.z = intersection.voxel.z + intersection.voxel.s;
-        if (operation != "add") {
-            resultVoxel.z -= voxelSize;
+        highlightAt.z = z + voxelSize + zFightingSizeAdjust;
+        if (wantAddAdjust) {
+            resultVoxel.z += voxelSize;
         }
 
         resultVoxel.bottomLeft = {x: highlightAt.x + zFightingSizeAdjust, y: highlightAt.y + zFightingSizeAdjust, z: highlightAt.z };
@@ -534,7 +569,7 @@ function showPreviewLines() {
                     position: resultVoxel,
                     size: resultVoxel.s + zFightingSizeAdjust,
                     visible: true,
-                    color: { red: 255, green: 255, blue: 255 },
+                    color: { red: 0, green: 255, blue: 0 },
                     lineWidth: previewLineWidth,
                     solid: false,
                     alpha: 1
@@ -888,6 +923,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 };
@@ -929,6 +965,7 @@ function keyPressEvent(event) {
                         red: colors[color].red,
                         green: colors[color].green,
                         blue: colors[color].blue };
+            Voxels.eraseVoxel(newVoxel.x, newVoxel.y, newVoxel.z, newVoxel.s);
             Voxels.setVoxel(newVoxel.x, newVoxel.y, newVoxel.z, newVoxel.s, newVoxel.red, newVoxel.green, newVoxel.blue);
             setAudioPosition();
             Audio.playSound(addSound, audioOptions);
@@ -1017,6 +1054,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(lastVoxelPosition.x, lastVoxelPosition.y, lastVoxelPosition.z,extrudeScale);
                 Voxels.setVoxel(lastVoxelPosition.x, lastVoxelPosition.y, lastVoxelPosition.z, 
                             extrudeScale, lastVoxelColor.red, lastVoxelColor.green, lastVoxelColor.blue);
                 mouseX = event.x;

From f1577d12a018d7ee31f314aa5236f79f9e9811f0 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 12:36:38 -0800
Subject: [PATCH 06/14] make changes to local tree in Voxels JS interface

---
 examples/editVoxels.js                        |  3 ---
 .../voxels/src/VoxelsScriptingInterface.cpp   | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index 219589f78d..31a8e7a787 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -923,7 +923,6 @@ 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 };
@@ -965,7 +964,6 @@ function keyPressEvent(event) {
                         red: colors[color].red,
                         green: colors[color].green,
                         blue: colors[color].blue };
-            Voxels.eraseVoxel(newVoxel.x, newVoxel.y, newVoxel.z, newVoxel.s);
             Voxels.setVoxel(newVoxel.x, newVoxel.y, newVoxel.z, newVoxel.s, newVoxel.red, newVoxel.green, newVoxel.blue);
             setAudioPosition();
             Audio.playSound(addSound, audioOptions);
@@ -1054,7 +1052,6 @@ 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(lastVoxelPosition.x, lastVoxelPosition.y, lastVoxelPosition.z,extrudeScale);
                 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 bc9639f6a9..719df8dccf 100644
--- a/libraries/voxels/src/VoxelsScriptingInterface.cpp
+++ b/libraries/voxels/src/VoxelsScriptingInterface.cpp
@@ -20,6 +20,13 @@ void VoxelsScriptingInterface::setVoxelNonDestructive(float x, float y, float z,
 
     // queue the packet
     queueVoxelAdd(PacketTypeVoxelSet, addVoxelDetail);
+    
+    // handle the local tree also...
+    if (_tree) {
+        _tree->lockForWrite();
+        _tree->createVoxel(addVoxelDetail.x, addVoxelDetail.y, addVoxelDetail.z, addVoxelDetail.s, red, green, blue, false);
+        _tree->unlock();
+    }
 }
 
 void VoxelsScriptingInterface::setVoxel(float x, float y, float z, float scale,
@@ -30,6 +37,13 @@ void VoxelsScriptingInterface::setVoxel(float x, float y, float z, float scale,
 
     // queue the destructive add
     queueVoxelAdd(PacketTypeVoxelSetDestructive, addVoxelDetail);
+
+    // handle the local tree also...
+    if (_tree) {
+        _tree->lockForWrite();
+        _tree->createVoxel(addVoxelDetail.x, addVoxelDetail.y, addVoxelDetail.z, addVoxelDetail.s, red, green, blue, true);
+        _tree->unlock();
+    }
 }
 
 void VoxelsScriptingInterface::eraseVoxel(float x, float y, float z, float scale) {
@@ -39,6 +53,13 @@ void VoxelsScriptingInterface::eraseVoxel(float x, float y, float z, float scale
                                         scale / (float)TREE_SCALE, 0, 0, 0};
 
     getVoxelPacketSender()->queueVoxelEditMessages(PacketTypeVoxelErase, 1, &deleteVoxelDetail);
+
+    // handle the local tree also...
+    if (_tree) {
+        _tree->lockForWrite();
+        _tree->deleteVoxelAt(deleteVoxelDetail.x, deleteVoxelDetail.y, deleteVoxelDetail.z, deleteVoxelDetail.s);
+        _tree->unlock();
+    }
 }
 
 

From 78de562f4164ad47c9b3619df461182632c07ea4 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 12:52:41 -0800
Subject: [PATCH 07/14] added clipboard support to editVoxels.js

---
 examples/editVoxels.js | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index 31a8e7a787..fa0f130fd7 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -982,6 +982,44 @@ function keyPressEvent(event) {
 
 function keyReleaseEvent(event) {
     trackKeyReleaseEvent(event); // used by preview support
+
+    // handle clipboard items
+    if (selectToolSelected) {
+        var pickRay = Camera.computePickRay(trackLastMouseX, trackLastMouseY);
+        var intersection = Voxels.findRayIntersection(pickRay);
+        selectedVoxel = calculateVoxelFromIntersection(intersection,"select");
+    
+        // Note: this sample uses Alt+ as the key codes for these clipboard items
+        if ((event.key == 199 || event.key == 67 || event.text == "C" || event.text == "c") && event.isAlt) {
+            print("the Alt+C key was pressed... copy");
+            Clipboard.copyVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s);
+        }
+        if ((event.key == 8776 || event.key == 88 || event.text == "X" || event.text == "x") && event.isAlt) {
+            print("the Alt+X key was pressed... cut");
+            Clipboard.cutVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s);
+        }
+        if ((event.key == 8730 || event.key == 86 || event.text == "V" || event.text == "v") && event.isAlt) {
+            print("the Alt+V key was pressed... paste");
+            Clipboard.pasteVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s);
+        }
+        if (event.text == "DELETE" || event.text == "BACKSPACE") {
+            print("the DELETE/BACKSPACE key was pressed... delete");
+            Clipboard.deleteVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s);
+        }
+    
+        if ((event.text == "E" || event.text == "e") && event.isMeta) {
+            print("the Ctl+E key was pressed... export");
+            Clipboard.exportVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s);
+        }
+        if ((event.text == "I" || event.text == "i") && event.isMeta) {
+            print("the Ctl+I key was pressed... import");
+            Clipboard.importVoxels();
+        }
+        if ((event.key == 78 || event.text == "N" || event.text == "n") && event.isMeta) {
+            print("the Ctl+N key was pressed, nudging to left 1 meter... nudge");
+            Clipboard.nudgeVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s, { x: -1, y: 0, z: 0 });
+        }
+    }
 }
 
 
@@ -1286,6 +1324,8 @@ Controller.keyReleaseEvent.connect(keyReleaseEvent);
 Controller.touchBeginEvent.connect(touchBeginEvent);
 Controller.touchUpdateEvent.connect(touchUpdateEvent);
 Controller.touchEndEvent.connect(touchEndEvent);
+Controller.captureKeyEvents({ text: "+" });
+Controller.captureKeyEvents({ text: "-" });
 
 
 function scriptEnding() {
@@ -1302,6 +1342,8 @@ function scriptEnding() {
     Overlays.deleteOverlay(recolorTool);
     Overlays.deleteOverlay(eyedropperTool);
     Overlays.deleteOverlay(selectTool);
+    Controller.releaseKeyEvents({ text: "+" });
+    Controller.releaseKeyEvents({ text: "-" });
 }
 Script.scriptEnding.connect(scriptEnding);
 

From a8b34ae756d21337876a8c9444bac42cb0c5155f Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 12:58:20 -0800
Subject: [PATCH 08/14] removed some debug settings

---
 examples/editVoxels.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index fa0f130fd7..ce444885af 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -25,7 +25,7 @@ var ORBIT_RATE_AZIMUTH = 90.0;
 var PIXELS_PER_EXTRUDE_VOXEL = 16;
 
 var zFightingSizeAdjust = 0.002; // used to adjust preview voxels to prevent z fighting
-var previewLineWidth = 3; // 1.5;
+var previewLineWidth = 1.5;
 
 var oldMode = Camera.getMode();
 
@@ -569,7 +569,7 @@ function showPreviewLines() {
                     position: resultVoxel,
                     size: resultVoxel.s + zFightingSizeAdjust,
                     visible: true,
-                    color: { red: 0, green: 255, blue: 0 },
+                    color: { red: 255, green: 255, blue: 0 },
                     lineWidth: previewLineWidth,
                     solid: false,
                     alpha: 1

From 892cc01dd95652b014d64c40815367639f2cb342 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 13:18:36 -0800
Subject: [PATCH 09/14] added Voxels.getVoxelAt() to inspect local tree

---
 examples/rayPickExample.js                    |  6 +++++
 .../voxels/src/VoxelsScriptingInterface.cpp   | 24 +++++++++++++++++++
 .../voxels/src/VoxelsScriptingInterface.h     |  8 +++++++
 3 files changed, 38 insertions(+)

diff --git a/examples/rayPickExample.js b/examples/rayPickExample.js
index 39dc910e78..9c34cca1de 100644
--- a/examples/rayPickExample.js
+++ b/examples/rayPickExample.js
@@ -26,6 +26,12 @@ function mouseMoveEvent(event) {
         print("intersection distance=" + intersection.distance);
         print("intersection intersection.x/y/z=" + intersection.intersection.x + ", " 
                     + intersection.intersection.y + ", " + intersection.intersection.z);
+
+        // also test the getVoxelAt() api which should find and return same voxel
+
+        var voxelAt = Voxels.getVoxelAt(intersection.voxel.x, intersection.voxel.y, intersection.voxel.z, intersection.voxel.s);
+        print("voxelAt.x/y/z/s=" + voxelAt.x + ", " + voxelAt.y + ", " + voxelAt.z + ": " + voxelAt.s);
+        print("voxelAt.red/green/blue=" + voxelAt.red + ", " + voxelAt.green + ", " + voxelAt.blue);
     }
 }
 
diff --git a/libraries/voxels/src/VoxelsScriptingInterface.cpp b/libraries/voxels/src/VoxelsScriptingInterface.cpp
index 719df8dccf..1a0a234e0a 100644
--- a/libraries/voxels/src/VoxelsScriptingInterface.cpp
+++ b/libraries/voxels/src/VoxelsScriptingInterface.cpp
@@ -12,6 +12,30 @@ void VoxelsScriptingInterface::queueVoxelAdd(PacketType addPacketType, VoxelDeta
     getVoxelPacketSender()->queueVoxelEditMessages(addPacketType, 1, &addVoxelDetails);
 }
 
+VoxelDetail VoxelsScriptingInterface::getVoxelAt(float x, float y, float z, float scale) {
+    // setup a VoxelDetail struct with the data
+    VoxelDetail result = {0,0,0,0,0,0,0};
+
+    if (_tree) {
+        _tree->lockForRead();
+
+        VoxelTreeElement* voxel = static_cast<VoxelTreeElement*>(_tree->getOctreeElementAt(x / (float)TREE_SCALE, y / (float)TREE_SCALE, 
+                                                    z / (float)TREE_SCALE, scale / (float)TREE_SCALE));
+        _tree->unlock();
+        if (voxel) {
+             // Note: these need to be in voxel space because the VoxelDetail -> js converter will upscale
+            result.x = voxel->getCorner().x;
+            result.y = voxel->getCorner().y;
+            result.z = voxel->getCorner().z;
+            result.s = voxel->getScale();
+            result.red = voxel->getColor()[RED_INDEX];
+            result.green = voxel->getColor()[GREEN_INDEX];
+            result.blue = voxel->getColor()[BLUE_INDEX];
+        }
+    }
+    return result;
+}
+
 void VoxelsScriptingInterface::setVoxelNonDestructive(float x, float y, float z, float scale, 
                                                         uchar red, uchar green, uchar blue) {
     // setup a VoxelDetail struct with the data
diff --git a/libraries/voxels/src/VoxelsScriptingInterface.h b/libraries/voxels/src/VoxelsScriptingInterface.h
index 88363bef39..fb0bd6ab03 100644
--- a/libraries/voxels/src/VoxelsScriptingInterface.h
+++ b/libraries/voxels/src/VoxelsScriptingInterface.h
@@ -30,6 +30,14 @@ public:
     void setVoxelTree(VoxelTree* tree) { _tree = tree; }
 
 public slots:
+
+    /// checks the local voxel tree for a voxel at the specified location and scale
+    /// \param x the x-coordinate of the voxel (in meter units)
+    /// \param y the y-coordinate of the voxel (in meter units)
+    /// \param z the z-coordinate of the voxel (in meter units)
+    /// \param scale the scale of the voxel (in meter units)
+    VoxelDetail getVoxelAt(float x, float y, float z, float scale);
+
     /// queues the creation of a voxel which will be sent by calling process on the PacketSender
     /// \param x the x-coordinate of the voxel (in meter units)
     /// \param y the y-coordinate of the voxel (in meter units)

From 43f63781fcb08c0e76b52c14cdff5b30a7c7b64b Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 18:35:39 -0800
Subject: [PATCH 10/14] removed files we don't need

---
 examples/alternate-gameoflife.js          | 137 -----------------
 examples/cubes.svo                        | Bin 145 -> 0 bytes
 examples/invader.svo                      | Bin 130 -> 0 bytes
 examples/invader2.svo                     | Bin 130 -> 0 bytes
 examples/slider.jpg                       | Bin 8797 -> 0 bytes
 examples/slider.png                       | Bin 10738 -> 0 bytes
 examples/swatches.svg                     |  20 ---
 examples/testing-hifi-interface-tools.svg | 177 ----------------------
 examples/testing-swatches                 |  20 ---
 examples/testing-swatches.svg             |  20 ---
 examples/thumb.jpg                        | Bin 5221 -> 0 bytes
 examples/thumb.png                        | Bin 5198 -> 0 bytes
 12 files changed, 374 deletions(-)
 delete mode 100644 examples/alternate-gameoflife.js
 delete mode 100644 examples/cubes.svo
 delete mode 100644 examples/invader.svo
 delete mode 100644 examples/invader2.svo
 delete mode 100644 examples/slider.jpg
 delete mode 100644 examples/slider.png
 delete mode 100644 examples/swatches.svg
 delete mode 100644 examples/testing-hifi-interface-tools.svg
 delete mode 100644 examples/testing-swatches
 delete mode 100644 examples/testing-swatches.svg
 delete mode 100644 examples/thumb.jpg
 delete mode 100644 examples/thumb.png

diff --git a/examples/alternate-gameoflife.js b/examples/alternate-gameoflife.js
deleted file mode 100644
index 8ab992138a..0000000000
--- a/examples/alternate-gameoflife.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// Add your JavaScript for assignment below this line 
-
-// The following is an example of Conway's Game of Life (http://en.wikipedia.org/wiki/Conway's_Game_of_Life)
-
-var gameZ = 100;
-var NUMBER_OF_CELLS_EACH_DIMENSION = 64;
-var NUMBER_OF_CELLS = NUMBER_OF_CELLS_EACH_DIMENSION * NUMBER_OF_CELLS_EACH_DIMENSION;
-
-var currentCells = [];
-var nextCells = [];
-
-var METER_LENGTH = 1;
-var cellScale = (NUMBER_OF_CELLS_EACH_DIMENSION * METER_LENGTH) / NUMBER_OF_CELLS_EACH_DIMENSION; 
-
-// randomly populate the cell start values
-for (var i = 0; i < NUMBER_OF_CELLS_EACH_DIMENSION; i++) {
-  // create the array to hold this row
-  currentCells[i] = [];
-  
-  // create the array to hold this row in the nextCells array
-  nextCells[i] = [];
-  
-  for (var j = 0; j < NUMBER_OF_CELLS_EACH_DIMENSION; j++) {
-     currentCells[i][j] = Math.floor(Math.random() * 2);
-     
-     // put the same value in the nextCells array for first board draw
-     nextCells[i][j] = currentCells[i][j];
-  }
-}
-
-function isNeighbourAlive(i, j) {
-  if (i < 0 || i >= NUMBER_OF_CELLS_EACH_DIMENSION 
-      || i < 0 || j >= NUMBER_OF_CELLS_EACH_DIMENSION) {
-    return 0;
-  } else {
-    return currentCells[i][j];
-  }
-}
-
-function updateCells() {
-  var i = 0;
-  var j = 0;
-  
-  for (i = 0; i < NUMBER_OF_CELLS_EACH_DIMENSION; i++) {
-    for (j = 0; j < NUMBER_OF_CELLS_EACH_DIMENSION; j++) {
-      // figure out the number of live neighbours for the i-j cell
-      var liveNeighbours = 
-        isNeighbourAlive(i + 1, j - 1) + isNeighbourAlive(i + 1, j) + isNeighbourAlive(i + 1, j + 1) +
-        isNeighbourAlive(i, j - 1) + isNeighbourAlive(i, j + 1) +
-        isNeighbourAlive(i - 1, j - 1) + isNeighbourAlive(i - 1, j) + isNeighbourAlive(i - 1, j + 1);
-      
-      if (currentCells[i][j]) {
-        // live cell
-        
-        if (liveNeighbours < 2) {
-          // rule #1 - under-population - this cell will die
-          // mark it zero to mark the change
-          nextCells[i][j] = 0;
-        } else if (liveNeighbours < 4) {
-          // rule #2 - this cell lives
-          // mark it -1 to mark no change
-          nextCells[i][j] = -1;
-        } else {
-          // rule #3 - overcrowding - this cell dies
-          // mark it zero to mark the change
-          nextCells[i][j] = 0;
-        }
-      } else {
-        // dead cell
-        if (liveNeighbours == 3) {
-          // rule #4 - reproduction - this cell revives
-          // mark it one to mark the change
-          nextCells[i][j] = 1;
-        } else {
-          // this cell stays dead
-          // mark it -1 for no change
-          nextCells[i][j] = -1;
-        }
-      }    
-      
-      if (Math.random() < 0.001) {
-        //  Random mutation to keep things interesting in there. 
-        nextCells[i][j] = 1;
-      }
-    }
-  }
-  
-  for (i = 0; i < NUMBER_OF_CELLS_EACH_DIMENSION; i++) {
-    for (j = 0; j < NUMBER_OF_CELLS_EACH_DIMENSION; j++) {
-      if (nextCells[i][j] != -1) {
-        // there has been a change to this cell, change the value in the currentCells array
-        currentCells[i][j] = nextCells[i][j];
-      }
-    }
-  }
-}
-
-function sendNextCells() {
-  for (var i = 0; i < NUMBER_OF_CELLS_EACH_DIMENSION; i++) {
-    for (var j = 0; j < NUMBER_OF_CELLS_EACH_DIMENSION; j++) {
-      if (nextCells[i][j] != -1) {
-        // there has been a change to the state of this cell, send it
-        
-        // find the x and y position for this voxel, z = 0
-        var x = j * cellScale;
-        var y = i * cellScale;
-
-        // queue a packet to add a voxel for the new cell
-        var color = (nextCells[i][j] == 1) ? 255 : 1;
-        if (color == 255) {
-            Voxels.setVoxel(x, y, gameZ, cellScale, color, color, color);
-        } else {
-            Voxels.setVoxel(x, y, gameZ, cellScale, 255, 0, 0);
-        }
-      }
-    }
-  } 
-}
-
-var sentFirstBoard = false;
-
-function step() {
-  if (sentFirstBoard) {
-    // we've already sent the first full board, perform a step in time
-    updateCells();
-  } else {
-    // this will be our first board send
-    sentFirstBoard = true;
-  }
-  
-  sendNextCells();  
-}
-
-print("here");
-//Script.willSendVisualDataCallback.connect(step);
-Voxels.setPacketsPerSecond(200);
-print("now here");
diff --git a/examples/cubes.svo b/examples/cubes.svo
deleted file mode 100644
index dee8f428d5f8ce33d9aacca999b1bd4c92b414a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmZQr#ef7>1u`%&yj>4M4(A~>GRfeIkp7G;0bw%)K%^c1V3BiRU|?{t$0EV7%J#Cy
P+w}~_XU_aLb7cSk!{<B)

diff --git a/examples/invader.svo b/examples/invader.svo
deleted file mode 100644
index 638bfc782fd81f3ed37682d43992ee58793f1077..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmZQr#ef7>1-@O+06`At;Y>J#!4=MQ_zY*l84Ljsro$h&5S+o_@OC|egFT!NXD|Q&
DBSAZq

diff --git a/examples/invader2.svo b/examples/invader2.svo
deleted file mode 100644
index bacabfe662ec646e704b899a0a5c0cf609664d27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmZQr#ef7>1u`%&yj>4M4(A~>GRfeIkp7G;0bw%)K%^c1V3BiRU|?{t$07j$Zi6)>

diff --git a/examples/slider.jpg b/examples/slider.jpg
deleted file mode 100644
index 0d9652d212edf69e3bb95b05b8da3335e85738e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8797
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

diff --git a/examples/slider.png b/examples/slider.png
deleted file mode 100644
index b4ba7d90b827130d4c78576b337ebc951de7d158..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10738
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
R`uE;d;jOAn`5V*E{|6%+f)M}!

diff --git a/examples/swatches.svg b/examples/swatches.svg
deleted file mode 100644
index ee144170c5..0000000000
--- a/examples/swatches.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 270 109" enable-background="new 0 0 270 109" xml:space="preserve">
-
-<rect fill="#FFFFFF" x="0" y="0" width="270" height="109"/>
-<g> 
-<path fill="#1E1E1E" d="M0,0v54h270V0H0z M39,39H15V15h24V39z M66,39H42V15h24V39z M93,39H69V15h24V39z M120,39H96V15h24V39z
-	 M147,39h-24V15h24V39z M174,39h-24V15h24V39z M201,39h-24V15h24V39z M228,39h-24V15h24V39z M255,39h-24V15h24V39z"/>
-</g>
-	 
-<g>	 
-<path fill="#1E1E1E" d="M0,55v54h270V55H0z M39,94H15V70h6.2l5.8,5.8l5.8-5.8H39V94z M66,94H42V70h6.2l5.8,5.8l5.8-5.8H66V94z
-	 M93,94H69V70h6.2l5.8,5.8l5.8-5.8H93V94z M120,94H96V70h6.2l5.8,5.8l5.8-5.8h6.2V94z M147,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z
-	 M174,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z M201,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z M228,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2
-	V94z M255,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z"/>
-</g>	
-	
-</svg>
diff --git a/examples/testing-hifi-interface-tools.svg b/examples/testing-hifi-interface-tools.svg
deleted file mode 100644
index b7bdbbcb58..0000000000
--- a/examples/testing-hifi-interface-tools.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="124px" height="400px" viewBox="-0.5 0.5 124 400" enable-background="new -0.5 0.5 124 400" xml:space="preserve">
-<g>
-	<g>
-		<rect x="-0.5" y="120.382" width="62" height="40"/>
-	</g>
-	<g>
-		<g>
-			<path fill="#999999" d="M13.77,149.864c0.296,0.296,0.665,0.102,0.665,0.102s0.527-0.615,1.101-0.328
-				c0.811,0.405,1.315-0.113,1.315-0.113l10.611-10.611l-1.419-1.419l-1.161-1.161l-10.61,10.61c0,0-0.575,0.449-0.169,1.261
-				c0.287,0.573-0.384,1.045-0.384,1.045S13.474,149.569,13.77,149.864"/>
-		</g>
-		<g>
-			<path fill="#CCCCCC" d="M25.913,135.042l2.173-2.173c0,0,1.898-1.905,3.256-0.547c0.68,0.68,1.083,1.627-0.546,3.257
-				c-1.549,1.548-2.173,2.172-2.173,2.172L25.913,135.042z"/>
-		</g>
-		<g>
-			
-				<rect x="22.984" y="135.651" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -52.0828 253.0143)" fill="#CCCCCC" width="6.751" height="3.285"/>
-		</g>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M46.482,138.915h3.697v4.617c-1.004,0.344-2.107,0.516-3.311,0.516c-1.32,0-2.341-0.383-3.062-1.148
-			s-1.081-1.857-1.081-3.275c0-1.383,0.395-2.459,1.184-3.229s1.895-1.154,3.316-1.154c0.539,0,1.048,0.051,1.526,0.152
-			s0.896,0.23,1.251,0.387l-0.732,1.816c-0.617-0.305-1.295-0.457-2.033-0.457c-0.676,0-1.198,0.22-1.567,0.659
-			s-0.554,1.067-0.554,1.884c0,0.801,0.167,1.411,0.501,1.831s0.815,0.63,1.444,0.63c0.344,0,0.66-0.033,0.949-0.1v-1.342h-1.529
-			L46.482,138.915L46.482,138.915z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<rect x="-0.5" y="80.5" width="62" height="40"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M43.84,96.434h2.988c1.164,0,2.028,0.173,2.593,0.519s0.847,0.884,0.847,1.614
-			c0,0.48-0.123,0.891-0.369,1.23s-0.57,0.559-0.973,0.656v0.059c0.531,0.141,0.916,0.375,1.154,0.703s0.357,0.754,0.357,1.277
-			c0,0.777-0.292,1.39-0.876,1.837S48.182,105,47.174,105H43.84V96.434z M46.154,99.721h0.697c0.332,0,0.589-0.068,0.771-0.205
-			s0.272-0.34,0.272-0.609c0-0.48-0.363-0.721-1.09-0.721h-0.65C46.154,98.186,46.154,99.721,46.154,99.721z M46.154,101.414v1.799
-			h0.814c0.723,0,1.084-0.305,1.084-0.914c0-0.285-0.097-0.504-0.29-0.656s-0.474-0.229-0.841-0.229
-			C46.921,101.414,46.154,101.414,46.154,101.414z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M18,106.06c-3,1-3,3-7,3c2,1,8,4,9,0C20.47,107.181,18,106.06,18,106.06z"/>
-		<path fill="#CCCCCC" d="M19,105.06l2,2c0,0,3.952-4.712,7-9c3.048-4.287,7.32-10.785,3-7C28.399,93.338,22.048,100.772,19,105.06z
-			"/>
-	</g>
-</g>
-<g>
-	<g>
-		<rect x="-0.5" y="40.5" width="62" height="40" fill="#888888"/>
-	</g>
-	<g>
-		<g>
-			<g>
-				<polygon fill="#A5A5A5" points="26,58.63 39,53.893 39,67.213 26,72.394 				"/>
-			</g>
-			<g>
-				<g>
-					<path fill="#333333" d="M38,54.5v12.59l-12,5.032V58.757l12.204-4.468 M39,53.63l-13,4.873v14.162l13-5.33V53.63L39,53.63z"/>
-				</g>
-			</g>
-		</g>
-		<g>
-			<g>
-				<polygon fill="#BFBFBF" points="13,67.213 13,53.893 25,58.63 25,72.394 				"/>
-			</g>
-			<g>
-				<path fill="#BFBFBF" d="M12.887,54.289L25,58.757v13.365L13,67.09V54.5 M13,53.63v13.705l13,5.33V58.503L13,53.63L13,53.63z"/>
-			</g>
-		</g>
-		<g>
-			<g>
-				<polygon fill="#FFFFFF" points="13.173,53.63 25.746,48.952 38.318,53.63 25.746,58.309 				"/>
-			</g>
-			<g>
-				<path fill="#333333" d="M25.746,49.146l12.049,4.483l-12.049,4.483L13.697,53.63L25.746,49.146 M25.746,48.758L12.65,53.63
-					l13.096,4.873l13.096-4.873L25.746,48.758L25.746,48.758z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M46.119,62.383V65.5h-2.314v-8.566h2.807c2.328,0,3.492,0.844,3.492,2.531c0,0.992-0.484,1.76-1.453,2.303
-			l2.495,3.732h-2.625l-1.816-3.117H46.119z M46.119,60.643h0.434c0.809,0,1.213-0.357,1.213-1.072c0-0.59-0.396-0.885-1.189-0.885
-			H46.12L46.119,60.643L46.119,60.643z"/>
-	</g>
-	<g>
-		<polygon fill="#333333" points="7,59.5 9,59.5 10,59.5 15,59.5 16,59.5 18,59.5 18,64.5 16,64.5 15,64.5 10,64.5 9,64.5 7,64.5 		
-			"/>
-		<g>
-			<g>
-				<rect x="8" y="60.5" fill="#FFFFFF" width="9" height="3"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<rect x="-0.5" y="0.5" width="62" height="40"/>
-</g>
-<g>
-	<g>
-		<g>
-			<polygon fill="#A5A5A5" points="26,18.63 39,13.893 39,27.213 26,32.394 			"/>
-		</g>
-		<g>
-			<g>
-				<path fill="#333333" d="M38,14.5v12.59l-12,5.032V18.757l12.204-4.468 M39,13.63l-13,4.873v14.162l13-5.33V13.63L39,13.63z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<g>
-			<polygon fill="#BFBFBF" points="13,27.213 13,13.893 25,18.63 25,32.394 			"/>
-		</g>
-		<g>
-			<path fill="#BFBFBF" d="M12.887,14.289L25,18.757v13.365L13,27.09V14.5 M13,13.63v13.705l13,5.33V18.503L13,13.63L13,13.63z"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<polygon fill="#FFFFFF" points="13.173,13.63 25.746,8.952 38.318,13.63 25.746,18.309 			"/>
-		</g>
-		<g>
-			<path fill="#333333" d="M25.746,9.146l12.049,4.483l-12.049,4.483L13.697,13.63L25.746,9.146 M25.746,8.758L12.65,13.63
-				l13.096,4.873l13.096-4.873L25.746,8.758L25.746,8.758z"/>
-		</g>
-	</g>
-</g>
-<g>
-	<path fill="#FFFFFF" d="M48.41,16.934H51L48.193,25.5h-2.725l-2.795-8.566h2.602l1.166,4.342c0.242,0.965,0.375,1.637,0.398,2.016
-		c0.027-0.273,0.082-0.615,0.164-1.025s0.154-0.732,0.217-0.967L48.41,16.934z"/>
-</g>
-<g>
-	<polygon fill="#333333" points="7,19.5 10,19.5 10,16.5 15,16.5 15,19.5 18,19.5 18,24.5 15,24.5 15,27.5 10,27.5 10,24.5 7,24.5 	
-		"/>
-	<g>
-		<g>
-			<rect x="11" y="17.5" fill="#FFFFFF" width="3" height="9"/>
-		</g>
-		<g>
-			<rect x="8" y="20.5" fill="#FFFFFF" width="9" height="3"/>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<rect x="-0.5" y="160.5" width="62" height="40"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M50.379,179.205c0,1.441-0.354,2.537-1.061,3.287s-1.742,1.125-3.105,1.125
-			c-1.344,0-2.374-0.377-3.091-1.131s-1.075-1.852-1.075-3.293c0-1.426,0.356-2.515,1.069-3.267s1.749-1.128,3.108-1.128
-			c1.363,0,2.396,0.373,3.1,1.119S50.379,177.76,50.379,179.205z M44.484,179.205c0,1.656,0.576,2.484,1.729,2.484
-			c0.586,0,1.021-0.201,1.304-0.604s0.425-1.029,0.425-1.881c0-0.855-0.144-1.487-0.431-1.896s-0.716-0.612-1.286-0.612
-			C45.064,176.697,44.484,177.533,44.484,179.205z"/>
-	</g>
-	<g>
-		<g>
-			<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" points="19.944,187.389 19.944,188.389 19.031,187.981 			"/>
-			
-				<line fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="1.9973,1.9973" x1="17.208" y1="187.166" x2="10.825" y2="184.315"/>
-			<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" points="9.913,183.908 9,183.5 9,182.5 			"/>
-			<line fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="2,2" x1="8.5" y1="180.5" x2="8.5" y2="173.5"/>
-			<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" points="9,172.5 9,171.5 9.927,171.876 			"/>
-			
-				<line fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="1.9625,1.9625" x1="11.745" y1="172.615" x2="18.109" y2="175.199"/>
-			<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" points="19.018,175.568 19.944,175.944 19.944,176.944 			"/>
-			<line fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="2,2" x1="19.5" y1="179.5" x2="19.5" y2="186.5"/>
-		</g>
-	</g>
-	<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="2,2" points="19.944,175.944 30,171.5 20,168.5 
-		9,171.5 	"/>
-	<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="2,2" points="20.333,188.611 29.5,183.5 
-		29.5,171.5 	"/>
-</g>
-</svg>
diff --git a/examples/testing-swatches b/examples/testing-swatches
deleted file mode 100644
index ee144170c5..0000000000
--- a/examples/testing-swatches
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 270 109" enable-background="new 0 0 270 109" xml:space="preserve">
-
-<rect fill="#FFFFFF" x="0" y="0" width="270" height="109"/>
-<g> 
-<path fill="#1E1E1E" d="M0,0v54h270V0H0z M39,39H15V15h24V39z M66,39H42V15h24V39z M93,39H69V15h24V39z M120,39H96V15h24V39z
-	 M147,39h-24V15h24V39z M174,39h-24V15h24V39z M201,39h-24V15h24V39z M228,39h-24V15h24V39z M255,39h-24V15h24V39z"/>
-</g>
-	 
-<g>	 
-<path fill="#1E1E1E" d="M0,55v54h270V55H0z M39,94H15V70h6.2l5.8,5.8l5.8-5.8H39V94z M66,94H42V70h6.2l5.8,5.8l5.8-5.8H66V94z
-	 M93,94H69V70h6.2l5.8,5.8l5.8-5.8H93V94z M120,94H96V70h6.2l5.8,5.8l5.8-5.8h6.2V94z M147,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z
-	 M174,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z M201,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z M228,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2
-	V94z M255,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z"/>
-</g>	
-	
-</svg>
diff --git a/examples/testing-swatches.svg b/examples/testing-swatches.svg
deleted file mode 100644
index ee144170c5..0000000000
--- a/examples/testing-swatches.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 270 109" enable-background="new 0 0 270 109" xml:space="preserve">
-
-<rect fill="#FFFFFF" x="0" y="0" width="270" height="109"/>
-<g> 
-<path fill="#1E1E1E" d="M0,0v54h270V0H0z M39,39H15V15h24V39z M66,39H42V15h24V39z M93,39H69V15h24V39z M120,39H96V15h24V39z
-	 M147,39h-24V15h24V39z M174,39h-24V15h24V39z M201,39h-24V15h24V39z M228,39h-24V15h24V39z M255,39h-24V15h24V39z"/>
-</g>
-	 
-<g>	 
-<path fill="#1E1E1E" d="M0,55v54h270V55H0z M39,94H15V70h6.2l5.8,5.8l5.8-5.8H39V94z M66,94H42V70h6.2l5.8,5.8l5.8-5.8H66V94z
-	 M93,94H69V70h6.2l5.8,5.8l5.8-5.8H93V94z M120,94H96V70h6.2l5.8,5.8l5.8-5.8h6.2V94z M147,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z
-	 M174,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z M201,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z M228,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2
-	V94z M255,94h-24V70h6.2l5.8,5.8l5.8-5.8h6.2V94z"/>
-</g>	
-	
-</svg>
diff --git a/examples/thumb.jpg b/examples/thumb.jpg
deleted file mode 100644
index ab33cec76416883592c39c1034b075f7528873dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5221
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
G{P3Ur<$c5e

diff --git a/examples/thumb.png b/examples/thumb.png
deleted file mode 100644
index fd5f87cacabe1e11989d4115aab0f73eb5e9d8e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5198
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


From 5b8d6ea3148f82cadb1a6b036355226ae09e0a42 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 18:52:15 -0800
Subject: [PATCH 11/14] removed unneeded code

---
 examples/editVoxels.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index 4e24f6021e..26090d2f49 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -736,7 +736,6 @@ function handleOrbitingMove(event) {
 
 function endOrbitMode(event) {
     var cameraOrientation = Camera.getOrientation();
-    var eulers = Quat.safeEulerAngles(cameraOrientation);
     MyAvatar.position = Camera.getPosition();
     MyAvatar.headOrientation = cameraOrientation;
     Camera.stopLooking();

From dad97cd52ea324f9d42b6df3de6028737962575d Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 23 Feb 2014 18:54:15 -0800
Subject: [PATCH 12/14] removed accidental code

---
 examples/hifi-interface-tools.svg | 177 ------------------------------
 examples/touchVsMouse.js          |  36 ------
 2 files changed, 213 deletions(-)
 delete mode 100644 examples/hifi-interface-tools.svg
 delete mode 100644 examples/touchVsMouse.js

diff --git a/examples/hifi-interface-tools.svg b/examples/hifi-interface-tools.svg
deleted file mode 100644
index 311514581f..0000000000
--- a/examples/hifi-interface-tools.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="124px" height="400px" viewBox="-0.5 0.5 124 400" enable-background="new -0.5 0.5 124 400" xml:space="preserve">
-<g>
-	<g>
-		<rect x="-0.5" y="120.382" width="62" height="40"/>
-	</g>
-	<g>
-		<g>
-			<path fill="#999999" d="M13.77,149.864c0.296,0.296,0.665,0.102,0.665,0.102s0.527-0.615,1.101-0.328
-				c0.811,0.405,1.315-0.113,1.315-0.113l10.611-10.611l-1.419-1.419l-1.161-1.161l-10.61,10.61c0,0-0.575,0.449-0.169,1.261
-				c0.287,0.573-0.384,1.045-0.384,1.045S13.474,149.569,13.77,149.864"/>
-		</g>
-		<g>
-			<path fill="#CCCCCC" d="M25.913,135.042l2.173-2.173c0,0,1.898-1.905,3.256-0.547c0.68,0.68,1.083,1.627-0.546,3.257
-				c-1.549,1.548-2.173,2.172-2.173,2.172L25.913,135.042z"/>
-		</g>
-		<g>
-			
-				<rect x="22.984" y="135.651" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -52.0828 253.0143)" fill="#CCCCCC" width="6.751" height="3.285"/>
-		</g>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M46.482,138.915h3.697v4.617c-1.004,0.344-2.107,0.516-3.311,0.516c-1.32,0-2.341-0.383-3.062-1.148
-			s-1.081-1.857-1.081-3.275c0-1.383,0.395-2.459,1.184-3.229s1.895-1.154,3.316-1.154c0.539,0,1.048,0.051,1.526,0.152
-			s0.896,0.23,1.251,0.387l-0.732,1.816c-0.617-0.305-1.295-0.457-2.033-0.457c-0.676,0-1.198,0.22-1.567,0.659
-			s-0.554,1.067-0.554,1.884c0,0.801,0.167,1.411,0.501,1.831s0.815,0.63,1.444,0.63c0.344,0,0.66-0.033,0.949-0.1v-1.342h-1.529
-			L46.482,138.915L46.482,138.915z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<rect x="-0.5" y="80.5" width="62" height="40"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M43.84,96.434h2.988c1.164,0,2.028,0.173,2.593,0.519s0.847,0.884,0.847,1.614
-			c0,0.48-0.123,0.891-0.369,1.23s-0.57,0.559-0.973,0.656v0.059c0.531,0.141,0.916,0.375,1.154,0.703s0.357,0.754,0.357,1.277
-			c0,0.777-0.292,1.39-0.876,1.837S48.182,105,47.174,105H43.84V96.434z M46.154,99.721h0.697c0.332,0,0.589-0.068,0.771-0.205
-			s0.272-0.34,0.272-0.609c0-0.48-0.363-0.721-1.09-0.721h-0.65C46.154,98.186,46.154,99.721,46.154,99.721z M46.154,101.414v1.799
-			h0.814c0.723,0,1.084-0.305,1.084-0.914c0-0.285-0.097-0.504-0.29-0.656s-0.474-0.229-0.841-0.229
-			C46.921,101.414,46.154,101.414,46.154,101.414z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M18,106.06c-3,1-3,3-7,3c2,1,8,4,9,0C20.47,107.181,18,106.06,18,106.06z"/>
-		<path fill="#CCCCCC" d="M19,105.06l2,2c0,0,3.952-4.712,7-9c3.048-4.287,7.32-10.785,3-7C28.399,93.338,22.048,100.772,19,105.06z
-			"/>
-	</g>
-</g>
-<g>
-	<g>
-		<rect x="-0.5" y="40.5" width="62" height="40"/>
-	</g>
-	<g>
-		<g>
-			<g>
-				<polygon fill="#A5A5A5" points="26,58.63 39,53.893 39,67.213 26,72.394 				"/>
-			</g>
-			<g>
-				<g>
-					<path fill="#333333" d="M38,54.5v12.59l-12,5.032V58.757l12.204-4.468 M39,53.63l-13,4.873v14.162l13-5.33V53.63L39,53.63z"/>
-				</g>
-			</g>
-		</g>
-		<g>
-			<g>
-				<polygon fill="#BFBFBF" points="13,67.213 13,53.893 25,58.63 25,72.394 				"/>
-			</g>
-			<g>
-				<path fill="#BFBFBF" d="M12.887,54.289L25,58.757v13.365L13,67.09V54.5 M13,53.63v13.705l13,5.33V58.503L13,53.63L13,53.63z"/>
-			</g>
-		</g>
-		<g>
-			<g>
-				<polygon fill="#FFFFFF" points="13.173,53.63 25.746,48.952 38.318,53.63 25.746,58.309 				"/>
-			</g>
-			<g>
-				<path fill="#333333" d="M25.746,49.146l12.049,4.483l-12.049,4.483L13.697,53.63L25.746,49.146 M25.746,48.758L12.65,53.63
-					l13.096,4.873l13.096-4.873L25.746,48.758L25.746,48.758z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M46.119,62.383V65.5h-2.314v-8.566h2.807c2.328,0,3.492,0.844,3.492,2.531c0,0.992-0.484,1.76-1.453,2.303
-			l2.495,3.732h-2.625l-1.816-3.117H46.119z M46.119,60.643h0.434c0.809,0,1.213-0.357,1.213-1.072c0-0.59-0.396-0.885-1.189-0.885
-			H46.12L46.119,60.643L46.119,60.643z"/>
-	</g>
-	<g>
-		<polygon fill="#333333" points="7,59.5 9,59.5 10,59.5 15,59.5 16,59.5 18,59.5 18,64.5 16,64.5 15,64.5 10,64.5 9,64.5 7,64.5 		
-			"/>
-		<g>
-			<g>
-				<rect x="8" y="60.5" fill="#FFFFFF" width="9" height="3"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<rect x="-0.5" y="0.5" width="62" height="40"/>
-</g>
-<g>
-	<g>
-		<g>
-			<polygon fill="#A5A5A5" points="26,18.63 39,13.893 39,27.213 26,32.394 			"/>
-		</g>
-		<g>
-			<g>
-				<path fill="#333333" d="M38,14.5v12.59l-12,5.032V18.757l12.204-4.468 M39,13.63l-13,4.873v14.162l13-5.33V13.63L39,13.63z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<g>
-			<polygon fill="#BFBFBF" points="13,27.213 13,13.893 25,18.63 25,32.394 			"/>
-		</g>
-		<g>
-			<path fill="#BFBFBF" d="M12.887,14.289L25,18.757v13.365L13,27.09V14.5 M13,13.63v13.705l13,5.33V18.503L13,13.63L13,13.63z"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<polygon fill="#FFFFFF" points="13.173,13.63 25.746,8.952 38.318,13.63 25.746,18.309 			"/>
-		</g>
-		<g>
-			<path fill="#333333" d="M25.746,9.146l12.049,4.483l-12.049,4.483L13.697,13.63L25.746,9.146 M25.746,8.758L12.65,13.63
-				l13.096,4.873l13.096-4.873L25.746,8.758L25.746,8.758z"/>
-		</g>
-	</g>
-</g>
-<g>
-	<path fill="#FFFFFF" d="M48.41,16.934H51L48.193,25.5h-2.725l-2.795-8.566h2.602l1.166,4.342c0.242,0.965,0.375,1.637,0.398,2.016
-		c0.027-0.273,0.082-0.615,0.164-1.025s0.154-0.732,0.217-0.967L48.41,16.934z"/>
-</g>
-<g>
-	<polygon fill="#333333" points="7,19.5 10,19.5 10,16.5 15,16.5 15,19.5 18,19.5 18,24.5 15,24.5 15,27.5 10,27.5 10,24.5 7,24.5 	
-		"/>
-	<g>
-		<g>
-			<rect x="11" y="17.5" fill="#FFFFFF" width="3" height="9"/>
-		</g>
-		<g>
-			<rect x="8" y="20.5" fill="#FFFFFF" width="9" height="3"/>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<rect x="-0.5" y="160.5" width="62" height="40"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M50.379,179.205c0,1.441-0.354,2.537-1.061,3.287s-1.742,1.125-3.105,1.125
-			c-1.344,0-2.374-0.377-3.091-1.131s-1.075-1.852-1.075-3.293c0-1.426,0.356-2.515,1.069-3.267s1.749-1.128,3.108-1.128
-			c1.363,0,2.396,0.373,3.1,1.119S50.379,177.76,50.379,179.205z M44.484,179.205c0,1.656,0.576,2.484,1.729,2.484
-			c0.586,0,1.021-0.201,1.304-0.604s0.425-1.029,0.425-1.881c0-0.855-0.144-1.487-0.431-1.896s-0.716-0.612-1.286-0.612
-			C45.064,176.697,44.484,177.533,44.484,179.205z"/>
-	</g>
-	<g>
-		<g>
-			<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" points="19.944,187.389 19.944,188.389 19.031,187.981 			"/>
-			
-				<line fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="1.9973,1.9973" x1="17.208" y1="187.166" x2="10.825" y2="184.315"/>
-			<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" points="9.913,183.908 9,183.5 9,182.5 			"/>
-			<line fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="2,2" x1="8.5" y1="180.5" x2="8.5" y2="173.5"/>
-			<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" points="9,172.5 9,171.5 9.927,171.876 			"/>
-			
-				<line fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="1.9625,1.9625" x1="11.745" y1="172.615" x2="18.109" y2="175.199"/>
-			<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" points="19.018,175.568 19.944,175.944 19.944,176.944 			"/>
-			<line fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="2,2" x1="19.5" y1="179.5" x2="19.5" y2="186.5"/>
-		</g>
-	</g>
-	<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="2,2" points="19.944,175.944 30,171.5 20,168.5 
-		9,171.5 	"/>
-	<polyline fill="none" stroke="#CCCCCC" stroke-miterlimit="10" stroke-dasharray="2,2" points="20.333,188.611 29.5,183.5 
-		29.5,171.5 	"/>
-</g>
-</svg>
diff --git a/examples/touchVsMouse.js b/examples/touchVsMouse.js
deleted file mode 100644
index c5007e076b..0000000000
--- a/examples/touchVsMouse.js
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  toucheVsMouse.js
-//  hifi
-//
-//  Created by Brad Hefta-Gaub on 1/28/14.
-//  Copyright (c) 2014 HighFidelity, Inc. All rights reserved.
-//
-//  This is an example script that demonstrates use of the Controller class
-//
-//
-
-function touchBeginEvent(event) {
-    print("touchBeginEvent event.x,y=" + event.x + ", " + event.y);
-}
-
-function touchEndEvent(event) {
-    print("touchEndEvent event.x,y=" + event.x + ", " + event.y);
-}
-
-function touchUpdateEvent(event) {
-    print("touchUpdateEvent event.x,y=" + event.x + ", " + event.y);
-}
-function mouseMoveEvent(event) {
-    print("mouseMoveEvent event.x,y=" + event.x + ", " + event.y);
-}
-
-// Map the mouse events to our functions
-Controller.touchBeginEvent.connect(touchBeginEvent);
-Controller.touchUpdateEvent.connect(touchUpdateEvent);
-Controller.touchEndEvent.connect(touchEndEvent);
-
-Controller.mouseMoveEvent.connect(mouseMoveEvent);
-
-function scriptEnding() {
-}
-Script.scriptEnding.connect(scriptEnding);

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 13/14] 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...

From f5fece5eb51adf07ec71393fc3f4828707677eef Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Sun, 23 Feb 2014 20:11:46 -0800
Subject: [PATCH 14/14] Fix for Xcode warnings.

---
 interface/src/renderer/Model.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp
index c3aae7146a..9513e45d60 100644
--- a/interface/src/renderer/Model.cpp
+++ b/interface/src/renderer/Model.cpp
@@ -52,8 +52,8 @@ bool Model::isLoadedWithTextures() const {
     }
     foreach (const NetworkMesh& mesh, _geometry->getMeshes()) {
         foreach (const NetworkMeshPart& part, mesh.parts) {
-            if (part.diffuseTexture && !part.diffuseTexture->isLoaded() ||
-                    part.normalTexture && !part.normalTexture->isLoaded()) {
+            if ((part.diffuseTexture && !part.diffuseTexture->isLoaded()) ||
+                    (part.normalTexture && !part.normalTexture->isLoaded())) {
                 return false;
             }
         }