diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index b06bce3426..aaf9b0a720 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -98,7 +98,7 @@ VoxelSystem::VoxelSystem(float treeScale, int maxVoxels) } -void VoxelSystem::nodeDeleted(VoxelNode* node) { +void VoxelSystem::voxelDeleted(VoxelNode* node) { if (node->isKnownBufferIndex() && (node->getVoxelSystem() == this)) { freeBufferIndex(node->getBufferIndex()); } diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h index f0d507c7ee..db167c0621 100644 --- a/interface/src/VoxelSystem.h +++ b/interface/src/VoxelSystem.h @@ -109,7 +109,7 @@ public: CoverageMapV2 myCoverageMapV2; CoverageMap myCoverageMap; - virtual void nodeDeleted(VoxelNode* node); + virtual void voxelDeleted(VoxelNode* node); virtual void nodeAdded(Node* node); virtual void nodeKilled(Node* node); diff --git a/libraries/voxels/src/VoxelNode.cpp b/libraries/voxels/src/VoxelNode.cpp index 72fb72d466..c4f56dd357 100644 --- a/libraries/voxels/src/VoxelNode.cpp +++ b/libraries/voxels/src/VoxelNode.cpp @@ -420,6 +420,6 @@ void VoxelNode::removeDeleteHook(VoxelNodeDeleteHook* hook) { void VoxelNode::notifyDeleteHooks() { for (int i = 0; i < _hooks.size(); i++) { - _hooks[i]->nodeDeleted(this); + _hooks[i]->voxelDeleted(this); } } \ No newline at end of file diff --git a/libraries/voxels/src/VoxelNode.h b/libraries/voxels/src/VoxelNode.h index 03a8fe3c57..140e4d9f9a 100644 --- a/libraries/voxels/src/VoxelNode.h +++ b/libraries/voxels/src/VoxelNode.h @@ -25,7 +25,7 @@ typedef unsigned char rgbColor[3]; // Callers who want delete hook callbacks should implement this class class VoxelNodeDeleteHook { public: - virtual void nodeDeleted(VoxelNode* node) = 0; + virtual void voxelDeleted(VoxelNode* node) = 0; }; class VoxelNode { diff --git a/libraries/voxels/src/VoxelNodeBag.cpp b/libraries/voxels/src/VoxelNodeBag.cpp index 6b69edd32c..60bf41d939 100644 --- a/libraries/voxels/src/VoxelNodeBag.cpp +++ b/libraries/voxels/src/VoxelNodeBag.cpp @@ -127,7 +127,7 @@ void VoxelNodeBag::remove(VoxelNode* node) { } -void VoxelNodeBag::nodeDeleted(VoxelNode* node) { +void VoxelNodeBag::voxelDeleted(VoxelNode* node) { remove(node); // note: remove can safely handle nodes that aren't in it, so we don't need to check contains() } diff --git a/libraries/voxels/src/VoxelNodeBag.h b/libraries/voxels/src/VoxelNodeBag.h index 01d7303165..9779302c59 100644 --- a/libraries/voxels/src/VoxelNodeBag.h +++ b/libraries/voxels/src/VoxelNodeBag.h @@ -34,7 +34,7 @@ public: static void voxelNodeDeleteHook(VoxelNode* node, void* extraData); - virtual void nodeDeleted(VoxelNode* node); + virtual void voxelDeleted(VoxelNode* node); private: