From 3af8a1b8f443555093697562f4b1043bf95dba94 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Fri, 10 May 2013 10:03:28 -0700
Subject: [PATCH] code review fixes

---
 interface/src/VoxelSystem.cpp      | 6 +++---
 libraries/voxels/src/VoxelNode.cpp | 2 +-
 libraries/voxels/src/VoxelNode.h   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp
index 592a70ca26..e473961c8e 100644
--- a/interface/src/VoxelSystem.cpp
+++ b/interface/src/VoxelSystem.cpp
@@ -232,7 +232,7 @@ int VoxelSystem::newTreeToArrays(VoxelNode* node) {
         bool  inChildBoundary = (distanceToNode <= childBoundary);
         shouldRender = (node->isLeaf() && inChildBoundary) || (inBoundary && !inChildBoundary);
     }
-    node->setShouldRender(shouldRender && !node->deleteMe());
+    node->setShouldRender(shouldRender && !node->isStagedForDeletion());
     // let children figure out their renderness
     for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
         if (node->getChildAtIndex(i)) {
@@ -249,7 +249,7 @@ int VoxelSystem::newTreeToArrays(VoxelNode* node) {
     // then it means our VBOs are "clean" and our vertices have been removed or not added. So we can now
     // safely remove the node from the tree and actually delete it.
     // otherwise honor our calculated shouldRender
-    if (node->deleteMe()) {
+    if (node->isStagedForDeletion()) {
         _tree->deleteVoxelCodeFromTree(node->getOctalCode());
     }
     
@@ -915,7 +915,7 @@ void VoxelSystem::deleteVoxelAt(float x, float y, float z, float s) {
     VoxelNode* node = _tree->getVoxelAt(x, y, z, s);
     if (node) {
         // tell the node we want it deleted
-        node->pleaseDeleteMe();
+        node->stageForDeletion();
         
         // tree is now dirty
         _tree->setDirtyBit();
diff --git a/libraries/voxels/src/VoxelNode.cpp b/libraries/voxels/src/VoxelNode.cpp
index 5070a6442d..19e6a12aa5 100644
--- a/libraries/voxels/src/VoxelNode.cpp
+++ b/libraries/voxels/src/VoxelNode.cpp
@@ -44,7 +44,7 @@ void VoxelNode::init(unsigned char * octalCode) {
     _glBufferIndex = GLBUFFER_INDEX_UNKNOWN;
     _isDirty = true;
     _shouldRender = false;
-    _deleteMe = false;
+    _isStagedForDeletion = false;
     
     calculateAABox();
 }
diff --git a/libraries/voxels/src/VoxelNode.h b/libraries/voxels/src/VoxelNode.h
index 4ac083bd0f..c07cb528e6 100644
--- a/libraries/voxels/src/VoxelNode.h
+++ b/libraries/voxels/src/VoxelNode.h
@@ -27,7 +27,7 @@ private:
     glBufferIndex _glBufferIndex;
     bool _isDirty;
     bool _shouldRender;
-    bool _deleteMe;
+    bool _isStagedForDeletion;
     AABox _box;
     unsigned char* _octalCode;
     VoxelNode* _children[8];
@@ -73,8 +73,8 @@ public:
     bool getShouldRender() const { return _shouldRender; }
 
     // Used by VoxelSystem to mark a node as to be deleted on next render pass
-    void pleaseDeleteMe() { _deleteMe = true; };
-    bool deleteMe() const { return _deleteMe; }
+    void stageForDeletion() { _isStagedForDeletion = true; };
+    bool isStagedForDeletion() const { return _isStagedForDeletion; }
 
 #ifndef NO_FALSE_COLOR // !NO_FALSE_COLOR means, does have false color
     void setFalseColor(colorPart red, colorPart green, colorPart blue);