History

cleanup Node types, closes #1726

Stephen Birarda committed 12 years ago

Commit 4de270b1 parent fe410ae44 files · +176 −184Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 44 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+3−3
@@ -1591,7 +1591,7 @@ void VoxelSystem::falseColorizeBySource() { · 1590 unmodified lines
15911591 // create a bunch of colors we'll use during colorization
15921592
15931593 foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
1594− if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
1594+ if (node->getType() == NodeType::VoxelServer) {
15951595 uint16_t nodeID = VoxelTreeElement::getSourceNodeUUIDKey(node->getUUID());
15961596 int groupColor = voxelServerCount % NUMBER_OF_COLOR_GROUPS;
15971597 args.colors[nodeID] = groupColors[groupColor];
@@ -2663,7 +2663,7 @@ void VoxelSystem::falseColorizeOccludedV2() { · 1065 unmodified lines
26632663 }
26642664
26652665 void VoxelSystem::nodeAdded(SharedNodePointer node) {
2666− if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
2666+ if (node->getType() == NodeType::VoxelServer) {
26672667 qDebug("VoxelSystem... voxel server %s added...", node->getUUID().toString().toLocal8Bit().constData());
26682668 _voxelServerCount++;
26692669 }
@@ -2684,7 +2684,7 @@ bool VoxelSystem::killSourceVoxelsOperation(OctreeElement* element, void* extraD · 14 unmodified lines
26842684 }
26852685
26862686 void VoxelSystem::nodeKilled(SharedNodePointer node) {
2687− if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
2687+ if (node->getType() == NodeType::VoxelServer) {
26882688 _voxelServerCount--;
26892689 QUuid nodeUUID = node->getUUID();
26902690 qDebug("VoxelSystem... voxel server %s removed...", nodeUUID.toString().toLocal8Bit().constData());