From 3b464094d9113bff5a3f2a1ff866f34c02063098 Mon Sep 17 00:00:00 2001
From: LionTurtle <peng.markv@gmail.com>
Date: Tue, 10 Sep 2013 11:09:50 -0700
Subject: [PATCH] Remove magic numbers, fix spacing, and other code clean up in
 nudge code.

---
 interface/src/Application.cpp      |  2 +-
 interface/src/Util.cpp             |  6 +++---
 interface/src/Util.h               |  4 ++--
 interface/src/VoxelSystem.h        |  1 -
 libraries/voxels/src/VoxelTree.cpp | 11 ++++-------
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index e14bfa7714..20889ab117 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1299,7 +1299,7 @@ void Application::nudgeVoxels() {
         VoxelNode* nodeToNudge = _voxels.getVoxelAt(_nudgeVoxel.x, _nudgeVoxel.y, _nudgeVoxel.z, _nudgeVoxel.s);
 
         if (nodeToNudge) {
-            _voxels.getVoxelTree()->nudgeSubTree(nodeToNudge, nudgeVec, _voxelEditSender);
+            _voxels.getTree()->nudgeSubTree(nodeToNudge, nudgeVec, _voxelEditSender);
             _finishedNudge = true;
         }
     }
diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index 05a68cc5a5..8898ab9eab 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -414,7 +414,7 @@ void renderMouseVoxelGrid(const float& mouseVoxelX, const float& mouseVoxelY, co
     glEnd();
 }
 
-void renderNudgeGrid(const float& voxelX, const float& voxelY, const float& voxelZ, const float& voxelS, const float& voxelPrecision) {
+void renderNudgeGrid(float voxelX, float voxelY, float voxelZ, float voxelS, float voxelPrecision) {
     glm::vec3 origin = glm::vec3(voxelX, voxelY, voxelZ);
 
     glLineWidth(1.0);
@@ -438,7 +438,7 @@ void renderNudgeGrid(const float& voxelX, const float& voxelY, const float& voxe
         glVertex3f(origin.x + xz * voxelPrecision, 0, origin.z - (GRID_DIMENSIONS - 1) * voxelS);
     }
     glEnd();
-    
+
     glColor3f(1.0f,1.0f,1.0f);
     
     glBegin(GL_POLYGON);//begin drawing of square
@@ -449,7 +449,7 @@ void renderNudgeGrid(const float& voxelX, const float& voxelY, const float& voxe
     glEnd();//end drawing of polygon
 }
 
-void renderNudgeGuide(const float& voxelX, const float& voxelY, const float& voxelZ, const float& voxelS) {
+void renderNudgeGuide(float voxelX, float voxelY, float voxelZ, float voxelS) {
     glm::vec3 origin = glm::vec3(voxelX, voxelY, voxelZ);
 
     glLineWidth(3.0);
diff --git a/interface/src/Util.h b/interface/src/Util.h
index 9401ca2e9a..3039ab1a31 100644
--- a/interface/src/Util.h
+++ b/interface/src/Util.h
@@ -61,9 +61,9 @@ void renderGroundPlaneGrid(float size, float impact);
 
 void renderMouseVoxelGrid(const float& mouseVoxelX, const float& mouseVoxelY, const float& mouseVoxelZ, const float& mouseVoxelS);
 
-void renderNudgeGrid(const float& voxelX, const float& voxelY, const float& voxelZ, const float& voxelS, const float& voxelPrecision);
+void renderNudgeGrid(float voxelX, float voxelY, float voxelZ, float voxelS, float voxelPrecision);
 
-void renderNudgeGuide(const float& voxelX, const float& voxelY, const float& voxelZ, const float& voxelS);
+void renderNudgeGuide(float voxelX, float voxelY, float voxelZ, float voxelS);
 
 void renderCollisionOverlay(int width, int height, float magnitude);
 
diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h
index 45c0a5fee7..5ac5310b76 100644
--- a/interface/src/VoxelSystem.h
+++ b/interface/src/VoxelSystem.h
@@ -62,7 +62,6 @@ public:
     float getVoxelsCreatedPerSecondAverage();
     float getVoxelsColoredPerSecondAverage();
     float getVoxelsBytesReadPerSecondAverage();
-    VoxelTree* getVoxelTree() {return _tree;}
 
     void killLocalVoxels();
 
diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp
index 3ca3ff90e6..2e4fbdf26e 100644
--- a/libraries/voxels/src/VoxelTree.cpp
+++ b/libraries/voxels/src/VoxelTree.cpp
@@ -1864,8 +1864,6 @@ public:
     float ancestorSize;
     glm::vec3 nudgeVec;
     VoxelEditPacketSender* voxelEditSenderPtr;
-
-    int colorIndex;
 };
 
 float findNewLeafSize(const glm::vec3& nudgeAmount, float leafSize) {
@@ -1949,14 +1947,14 @@ void VoxelTree::nudgeLeaf(VoxelNode* node, void* extraData) {
     voxelDetails.y = unNudgedDetails.y;
     voxelDetails.z = unNudgedDetails.z;
     voxelDetails.s = unNudgedDetails.s;
-    voxelDetails.red = node->getColor()[0];
-    voxelDetails.green = node->getColor()[1];
-    voxelDetails.blue = node->getColor()[2];
+    voxelDetails.red = node->getColor()[RED_INDEX];
+    voxelDetails.green = node->getColor()[GREEN_INDEX];
+    voxelDetails.blue = node->getColor()[BLUE_INDEX];
     glm::vec3 nudge = args->nudgeVec;
 
     // delete the old node
     // if the nudge replaces the node in an area outside of the ancestor node
-    if ((fabs(nudge.x) >= args->ancestorSize || fabs(nudge.y) >= args->ancestorSize || fabs(nudge.z) >= args->ancestorSize)) {
+    if (fabs(nudge.x) >= args->ancestorSize || fabs(nudge.y) >= args->ancestorSize || fabs(nudge.z) >= args->ancestorSize) {
         args->voxelEditSenderPtr->sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, voxelDetails);
     }
 
@@ -1986,7 +1984,6 @@ void VoxelTree::nudgeSubTree(VoxelNode* nodeToNudge, const glm::vec3& nudgeAmoun
     args.ancestorSize = ancestorDetails.s;
     args.nudgeVec = nudgeAmount;
     args.voxelEditSenderPtr = &voxelEditSender;
-    args.colorIndex = 0;
 
     recurseNodeWithOperation(nodeToNudge, nudgeCheck, &args);
 }