Fixed spaces added everywhere

examples/editVoxels.js

@@ -8,10 +8,10 @@
 //  Captures mouse clicks and edits voxels accordingly.
 //
 //  click = create a new voxel on this face, same color as old (default color picker state)
-//  right click or control + click = delete this voxel
+//  right click or control + click = delete this voxel 
 //  shift + click = recolor this voxel
 //  1 - 8 = pick new color from palette
-//  9 = create a new voxel in front of the camera
+//  9 = create a new voxel in front of the camera 
 //
 //  Click and drag to create more new voxels in the same direction
 //
@@ -36,19 +36,19 @@ var previewLineWidth = 1.5;
 
 var oldMode = Camera.getMode();
 
-var isAdding = false;
+var isAdding = false; 
-var isExtruding = 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 touchPointsToPan = 3; 
 var orbitAzimuth = 0.0;
 var orbitAltitude = 0.0;
 var orbitCenter = { x: 0, y: 0, z: 0 };
 var orbitPosition = { x: 0, y: 0, z: 0 };
-var torsoToEyeVector = { x: 0, y: 0, z: 0 };
+var torsoToEyeVector = { x: 0, y: 0, z: 0 }; 
 var orbitRadius = 0.0;
 var extrudeDirection = { x: 0, y: 0, z: 0 };
 var extrudeScale = 0.0;
@@ -60,7 +60,7 @@ var wheelPixelsMoved = 0;
 
 
 var mouseX = 0;
-var mouseY = 0;
+var mouseY = 0; 
 
 //  Create a table of the different colors you can choose
 var colors = new Array();
@@ -76,7 +76,7 @@ colors[8] = { red: 31,  green: 64,  blue: 64 };
 var numColors = 9;
 var whichColor = -1;            //  Starting color is 'Copy' mode
 
-//  Create sounds for adding, deleting, recoloring voxels
+//  Create sounds for adding, deleting, recoloring voxels 
 var addSound1 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Voxels/voxel+create+2.raw");
 var addSound2 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Voxels/voxel+create+3.raw");
 var addSound3 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Voxels/voxel+create+4.raw");
@@ -93,7 +93,7 @@ var editToolsOn = true; // starts out off
 
 // previewAsVoxel - by default, we will preview adds/deletes/recolors as just 4 lines on the intersecting face. But if you
 //                  the preview to show a full voxel then set this to true and the voxel will be displayed for voxel editing
-var previewAsVoxel = true;
+var previewAsVoxel = false; 
 
 var voxelPreview = Overlays.addOverlay("cube", {
                     position: { x: 0, y: 0, z: 0},
@@ -104,7 +104,7 @@ var voxelPreview = Overlays.addOverlay("cube", {
                     visible: false,
                     lineWidth: 4
                 });
-
+                
 var linePreviewTop = Overlays.addOverlay("line3d", {
                     position: { x: 0, y: 0, z: 0},
                     end: { x: 0, y: 0, z: 0},
@@ -228,7 +228,7 @@ var eyedropperTool = Overlays.addOverlay("image", {
                     visible: false,
                     alpha: 0.9
                 });
-
+                
 // This will create a couple of image overlays that make a "slider", we will demonstrate how to trap mouse messages to
 // move the slider
 
@@ -392,7 +392,7 @@ function calcScaleFromThumb(newThumbX) {
 
     // now reset the display accordingly...
     calcThumbFromScale(pointerVoxelScale);
-
+    
     // if the user moved the thumb, then they are fixing the voxel scale
     pointerVoxelScaleSet = true;
 }
@@ -466,27 +466,27 @@ function calculateVoxelFromIntersection(intersection, operation) {
 
     var wantDebug = false;
     if (wantDebug) {
-        print(">>>>> calculateVoxelFromIntersection().... intersection voxel.red/green/blue=" + intersection.voxel.red + ", "
+        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 + ", "
+        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 + ", "
+        print("   intersection intersection.x/y/z=" + intersection.intersection.x + ", " 
                                 + intersection.intersection.y + ", " + intersection.intersection.z);
     }
-
+    
     var voxelSize;
     if (pointerVoxelScaleSet) {
-        voxelSize = pointerVoxelScale;
+        voxelSize = pointerVoxelScale; 
     } else {
-        voxelSize = intersection.voxel.s;
+        voxelSize = intersection.voxel.s; 
     }
 
     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) {
@@ -527,7 +527,7 @@ function calculateVoxelFromIntersection(intersection, operation) {
         if (wantAddAdjust) {
             resultVoxel.x -= 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 };
@@ -551,7 +551,7 @@ function calculateVoxelFromIntersection(intersection, operation) {
         if (wantAddAdjust) {
             resultVoxel.y -= 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 };
@@ -563,7 +563,7 @@ function calculateVoxelFromIntersection(intersection, operation) {
         if (wantAddAdjust) {
             resultVoxel.y += 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};
@@ -575,7 +575,7 @@ function calculateVoxelFromIntersection(intersection, operation) {
         if (wantAddAdjust) {
             resultVoxel.z -= voxelSize;
         }
-
+        
         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 };
@@ -594,7 +594,7 @@ function calculateVoxelFromIntersection(intersection, operation) {
         resultVoxel.topRight = {x: highlightAt.x + voxelSize - zFightingSizeAdjust, y: highlightAt.y + voxelSize - zFightingSizeAdjust, z: highlightAt.z};
 
     }
-
+    
     return resultVoxel;
 }
 
@@ -604,7 +604,7 @@ function showPreviewVoxel() {
     var pickRay = Camera.computePickRay(trackLastMouseX, trackLastMouseY);
     var intersection = Voxels.findRayIntersection(pickRay);
 
-    // if the user hasn't updated the
+    // if the user hasn't updated the 
     if (!pointerVoxelScaleSet) {
         calcThumbFromScale(intersection.voxel.s);
     }
@@ -668,10 +668,10 @@ function showPreviewLines() {
     }
 
     var intersection = Voxels.findRayIntersection(pickRay);
-
+    
     if (intersection.intersects) {
 
-        // if the user hasn't updated the
+        // if the user hasn't updated the 
         if (!pointerVoxelScaleSet) {
             calcThumbFromScale(intersection.voxel.s);
         }
@@ -788,14 +788,14 @@ function trackKeyReleaseEvent(event) {
             trackAsOrbitOrPan = false;
             moveTools();
         }
-
+        
         // on F1 toggle the preview mode between cubes and lines
         if (event.text == "F1") {
             previewAsVoxel = !previewAsVoxel;
         }
 
         showPreviewGuides();
-    }
+    }    
 }
 
 function startOrbitMode(event) {
@@ -804,7 +804,7 @@ function startOrbitMode(event) {
     var pickRay = Camera.computePickRay(event.x, event.y);
     var intersection = Voxels.findRayIntersection(pickRay);
 
-    // start orbit camera!
+    // start orbit camera! 
     var cameraPosition = Camera.getPosition();
     torsoToEyeVector = Vec3.subtract(cameraPosition, MyAvatar.position);
     torsoToEyeVector.x = 0.0;
@@ -813,12 +813,12 @@ function startOrbitMode(event) {
     Camera.setMode("independent");
     Camera.keepLookingAt(intersection.intersection);
     // get position for initial azimuth, elevation
-    orbitCenter = intersection.intersection;
+    orbitCenter = intersection.intersection; 
     var orbitVector = Vec3.subtract(cameraPosition, orbitCenter);
-    orbitRadius = Vec3.length(orbitVector);
+    orbitRadius = Vec3.length(orbitVector); 
     orbitAzimuth = Math.atan2(orbitVector.z, orbitVector.x);
     orbitAltitude = Math.asin(orbitVector.y / Vec3.length(orbitVector));
-
+    
     //print("startOrbitMode...");
 }
 
@@ -826,17 +826,17 @@ function handleOrbitingMove(event) {
     var cameraOrientation = Camera.getOrientation();
     var origEulers = Quat.safeEulerAngles(cameraOrientation);
     var newEulers = fixEulerAngles(Quat.safeEulerAngles(cameraOrientation));
-    var dx = event.x - mouseX;
+    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,
+     var orbitVector = { x:(Math.cos(orbitAltitude) * Math.cos(orbitAzimuth)) * orbitRadius, 
                         y:Math.sin(orbitAltitude) * orbitRadius,
-                        z:(Math.cos(orbitAltitude) * Math.sin(orbitAzimuth)) * orbitRadius };
+                        z:(Math.cos(orbitAltitude) * Math.sin(orbitAzimuth)) * orbitRadius }; 
     orbitPosition = Vec3.sum(orbitCenter, orbitVector);
     Camera.setPosition(orbitPosition);
 
-    mouseX = event.x;
+    mouseX = event.x; 
     mouseY = event.y;
     //print("handleOrbitingMove...");
 }
@@ -852,7 +852,7 @@ function endOrbitMode(event) {
 }
 
 function startPanMode(event, intersection) {
-    // start pan camera!
+    // start pan camera! 
     print("handle PAN mode!!!");
 }
 
@@ -870,14 +870,14 @@ function mousePressEvent(event) {
 
     // if our tools are off, then don't do anything
     if (!editToolsOn) {
-        return;
+        return; 
     }
-
+    
-    // Normally, if we're panning or orbiting from touch, ignore these... because our touch takes precedence.
+    // 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
+    // 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
@@ -894,15 +894,15 @@ function mousePressEvent(event) {
             }
             // let things fall through
         } else {
-            return;
+            return; 
         }
     }
-
+    
     // no clicking on overlays while in panning mode
     if (!trackAsOrbitOrPan) {
         var clickedOnSomething = 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) {
@@ -959,7 +959,7 @@ function mousePressEvent(event) {
             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;
@@ -985,11 +985,11 @@ function mousePressEvent(event) {
     }
 
     if (intersection.intersects) {
-        // if the user hasn't updated the
+        // if the user hasn't updated the 
         if (!pointerVoxelScaleSet) {
             calcThumbFromScale(intersection.voxel.s);
         }
-
+        
         // 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)) {
@@ -1013,14 +1013,14 @@ function mousePressEvent(event) {
                 colors[whichColor].blue = intersection.voxel.blue;
                 moveTools();
             }
-
+            
         } else if (recolorToolSelected || trackAsRecolor) {
             //  Recolor Voxel
             voxelDetails = calculateVoxelFromIntersection(intersection,"recolor");
 
             // doing this erase then set will make sure we only recolor just the target voxel
             Voxels.eraseVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s);
-            Voxels.setVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s,
+            Voxels.setVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s, 
                             colors[whichColor].red, colors[whichColor].green, colors[whichColor].blue);
             Audio.playSound(changeColorSound, audioOptions);
             Overlays.editOverlay(voxelPreview, { visible: false });
@@ -1028,17 +1028,17 @@ function mousePressEvent(event) {
             //  Add voxel on face
             if (whichColor == -1) {
                 //  Copy mode - use clicked voxel color
-                newColor = {
+                newColor = {    
                     red: intersection.voxel.red,
                     green: intersection.voxel.green,
                     blue: intersection.voxel.blue };
             } else {
-                newColor = {
+                newColor = {    
                     red: colors[whichColor].red,
                     green: colors[whichColor].green,
                     blue: colors[whichColor].blue };
             }
-
+                    
             voxelDetails = calculateVoxelFromIntersection(intersection,"add");
             Voxels.eraseVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s);
             Voxels.setVoxel(voxelDetails.x, voxelDetails.y, voxelDetails.z, voxelDetails.s,
@@ -1048,11 +1048,11 @@ function mousePressEvent(event) {
             lastVoxelScale = voxelDetails.s;
 
             playRandomAddSound(audioOptions);
-
+            
             Overlays.editOverlay(voxelPreview, { visible: false });
             dragStart = { x: event.x, y: event.y };
             isAdding = true;
-        }
+        } 
     }
 }
 
@@ -1071,14 +1071,14 @@ function keyPressEvent(event) {
             Audio.playSound(clickSound, audioOptions);
             moveTools();
         } else if (event.text == "0") {
-            // Create a brand new 1 meter voxel in front of your avatar
+            // Create a brand new 1 meter voxel in front of your avatar 
-            var color = whichColor;
+            var color = whichColor; 
             if (color == -1) color = 0;
             var newPosition = getNewVoxelPosition();
-            var newVoxel = {
+            var newVoxel = {    
                         x: newPosition.x,
                         y: newPosition.y ,
-                        z: newPosition.z,
+                        z: newPosition.z,    
                         s: NEW_VOXEL_SIZE,
                         red: colors[color].red,
                         green: colors[color].green,
@@ -1089,7 +1089,7 @@ function keyPressEvent(event) {
             playRandomAddSound(audioOptions);
         }
     }
-
+    
     trackKeyPressEvent(event); // used by preview support
 }
 
@@ -1167,7 +1167,7 @@ function menuItemEvent(menuItem) {
                 Clipboard.deleteVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s);
             }
         }
-
+    
         if (menuItem == "Export Voxels") {
             print("export");
             Clipboard.exportVoxel(selectedVoxel.x, selectedVoxel.y, selectedVoxel.z, selectedVoxel.s);
@@ -1191,11 +1191,11 @@ function mouseMoveEvent(event) {
         return;
     }
 
-    // if we're panning or orbiting from touch, ignore these... because our touch takes precedence.
+    // if we're panning or orbiting from touch, ignore these... because our touch takes precedence. 
     if (isOrbitingFromTouch || isPanningFromTouch) {
-        return;
+        return; 
     }
-
+    
     // double check that we didn't accidentally miss a pan or orbit click request
     if (trackAsOrbitOrPan && !isPanning && !isOrbiting) {
         if (event.isLeftButton && !event.isRightButton) {
@@ -1217,7 +1217,7 @@ function mouseMoveEvent(event) {
             thumbX = maxThumbX;
         }
         calcScaleFromThumb(thumbX);
-
+        
     } else if (isOrbiting) {
         handleOrbitingMove(event);
     } else if (isPanning) {
@@ -1226,8 +1226,8 @@ function mouseMoveEvent(event) {
         //  Watch the drag direction to tell which way to 'extrude' this voxel
         if (!isExtruding) {
             var pickRay = Camera.computePickRay(event.x, event.y);
-            var lastVoxelDistance = { x: pickRay.origin.x - lastVoxelPosition.x,
+            var lastVoxelDistance = { x: pickRay.origin.x - lastVoxelPosition.x, 
-                                    y: pickRay.origin.y - lastVoxelPosition.y,
+                                    y: pickRay.origin.y - lastVoxelPosition.y, 
                                     z: pickRay.origin.z - lastVoxelPosition.z };
             var distance = Vec3.length(lastVoxelDistance);
             var mouseSpot = { x: pickRay.direction.x * distance, y: pickRay.direction.y * distance, z: pickRay.direction.z * distance };
@@ -1246,22 +1246,22 @@ function mouseMoveEvent(event) {
             else if (dy < -lastVoxelScale) extrudeDirection.y = -extrudeScale;
             else if (dz > lastVoxelScale) extrudeDirection.z = extrudeScale;
             else if (dz < -lastVoxelScale) extrudeDirection.z = -extrudeScale;
-            else isExtruding = false;
+            else isExtruding = false; 
         } else {
             //  We have got an extrusion direction, now look for mouse move beyond threshold to add new voxel
-            var dx = event.x - mouseX;
+            var dx = event.x - mouseX; 
             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,
+                Voxels.setVoxel(lastVoxelPosition.x, lastVoxelPosition.y, lastVoxelPosition.z, 
                             extrudeScale, lastVoxelColor.red, lastVoxelColor.green, lastVoxelColor.blue);
                 mouseX = event.x;
                 mouseY = event.y;
             }
         }
     }
-
+    
     // update the add voxel/delete voxel overlay preview
     trackMouseEvent(event);
 }
@@ -1269,13 +1269,13 @@ function mouseMoveEvent(event) {
 function mouseReleaseEvent(event) {
     // if our tools are off, then don't do anything
     if (!editToolsOn) {
-        return;
+        return; 
     }
 
     if (isMovingSlider) {
         isMovingSlider = false;
     }
-
+    
     if (isOrbiting) {
         endOrbitMode(event);
         isOrbiting = false;
@@ -1286,7 +1286,7 @@ function mouseReleaseEvent(event) {
         isPanning = false;
     }
     isAdding = false;
-    isExtruding = false;
+    isExtruding = false; 
 }
 
 function moveTools() {
@@ -1314,7 +1314,7 @@ function moveTools() {
 	    if (s == (numColors - 1)) {
 	        extraWidth = swatchExtraPadding;
 	    }
-
+		
         Overlays.editOverlay(swatches[s], {
                         x: swatchX,
                         y: swatchesY,
@@ -1378,16 +1378,16 @@ 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...
+            // come in as 2 then 3 touches... 
             if (isPanningFromTouch) {
                 print("touchBeginEvent... calling endPanMode()");
                 endPanMode(event);
@@ -1397,7 +1397,7 @@ function touchBeginEvent(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...
+            // come in as 2 then 3 touches... 
             if (isOrbitingFromTouch) {
                 endOrbitMode(event);
                 isOrbitingFromTouch = false;
@@ -1416,11 +1416,11 @@ function touchUpdateEvent(event) {
     // 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...
+        // come in as 2 then 3 touches... 
         if (event.touchPoints == touchPointsToPan) {
             //print("we now have touchPointsToPan touches... switch to pan...");
             endOrbitMode(event);
@@ -1434,7 +1434,7 @@ function touchUpdateEvent(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...
+        // come in as 2 then 3 touches... 
         if (event.touchPoints == touchPointsToOrbit) {
             //print("we now have touchPointsToOrbit touches... switch to orbit...");
             //print("touchUpdateEvent... calling endPanMode()");
@@ -1457,8 +1457,8 @@ function touchEndEvent(event) {
     // 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;
@@ -1476,10 +1476,10 @@ var lastFingerDeleteVoxel = { x: -1, y: -1, z: -1}; // off of the build-able are
 function checkControllers() {
     var controllersPerPalm = 2; // palm and finger
     for (var palm = 0; palm < 2; palm++) {
-        var palmController = palm * controllersPerPalm;
+        var palmController = palm * controllersPerPalm; 
-        var fingerTipController = palmController + 1;
+        var fingerTipController = palmController + 1; 
         var fingerTipPosition = Controller.getSpatialControlPosition(fingerTipController);
-
+        
         var BUTTON_COUNT = 6;
         var BUTTON_BASE = palm * BUTTON_COUNT;
         var BUTTON_1 = BUTTON_BASE + 1;
@@ -1497,7 +1497,7 @@ function checkControllers() {
                 Voxels.eraseVoxel(fingerTipPosition.x, fingerTipPosition.y, fingerTipPosition.z, FINGERTIP_VOXEL_SIZE);
                 Voxels.setVoxel(fingerTipPosition.x, fingerTipPosition.y, fingerTipPosition.z, FINGERTIP_VOXEL_SIZE,
                     newColor.red, newColor.green, newColor.blue);
-
+                
                 lastFingerAddVoxel = fingerTipPosition;
             }
         } else if (Controller.isButtonPressed(BUTTON_2)) {
@@ -1546,7 +1546,7 @@ function wheelEvent(event) {
             pointerVoxelScale /= 2.0;
             if (pointerVoxelScale < MIN_VOXEL_SCALE) {
                 pointerVoxelScale = MIN_VOXEL_SCALE;
-            }
+            }  
         } else {
             pointerVoxelScale *= 2.0;
             if (pointerVoxelScale > MAX_VOXEL_SCALE) {