Showing the changes to interface/src/VoxelSystem.cpp (1 of 44 files). Show all
Unified · Split
| @@ -1591,7 +1591,7 @@ void VoxelSystem::falseColorizeBySource() { · 1590 unmodified lines | |||
| 1591 | // create a bunch of colors we'll use during colorization | 1591 | // create a bunch of colors we'll use during colorization |
| 1592 | 1592 | ||
| 1593 | foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { | 1593 | foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { |
| 1594 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { | 1594 | if (node->getType() == NodeType::VoxelServer) { |
| 1595 | uint16_t nodeID = VoxelTreeElement::getSourceNodeUUIDKey(node->getUUID()); | 1595 | uint16_t nodeID = VoxelTreeElement::getSourceNodeUUIDKey(node->getUUID()); |
| 1596 | int groupColor = voxelServerCount % NUMBER_OF_COLOR_GROUPS; | 1596 | int groupColor = voxelServerCount % NUMBER_OF_COLOR_GROUPS; |
| 1597 | args.colors[nodeID] = groupColors[groupColor]; | 1597 | args.colors[nodeID] = groupColors[groupColor]; |
| @@ -2663,7 +2663,7 @@ void VoxelSystem::falseColorizeOccludedV2() { · 1065 unmodified lines | |||
| 2663 | } | 2663 | } |
| 2664 | 2664 | ||
| 2665 | void VoxelSystem::nodeAdded(SharedNodePointer node) { | 2665 | void VoxelSystem::nodeAdded(SharedNodePointer node) { |
| 2666 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { | 2666 | if (node->getType() == NodeType::VoxelServer) { |
| 2667 | qDebug("VoxelSystem... voxel server %s added...", node->getUUID().toString().toLocal8Bit().constData()); | 2667 | qDebug("VoxelSystem... voxel server %s added...", node->getUUID().toString().toLocal8Bit().constData()); |
| 2668 | _voxelServerCount++; | 2668 | _voxelServerCount++; |
| 2669 | } | 2669 | } |
| @@ -2684,7 +2684,7 @@ bool VoxelSystem::killSourceVoxelsOperation(OctreeElement* element, void* extraD · 14 unmodified lines | |||
| 2684 | } | 2684 | } |
| 2685 | 2685 | ||
| 2686 | void VoxelSystem::nodeKilled(SharedNodePointer node) { | 2686 | void VoxelSystem::nodeKilled(SharedNodePointer node) { |
| 2687 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { | 2687 | if (node->getType() == NodeType::VoxelServer) { |
| 2688 | _voxelServerCount--; | 2688 | _voxelServerCount--; |
| 2689 | QUuid nodeUUID = node->getUUID(); | 2689 | QUuid nodeUUID = node->getUUID(); |
| 2690 | qDebug("VoxelSystem... voxel server %s removed...", nodeUUID.toString().toLocal8Bit().constData()); | 2690 | qDebug("VoxelSystem... voxel server %s removed...", nodeUUID.toString().toLocal8Bit().constData()); |