Showing the changes to interface/src/VoxelSystem.cpp (1 of 44 files). Show all
Unified · Split
| @@ -1604,13 +1604,13 @@ void VoxelSystem::falseColorizeBySource() { · 1603 unmodified lines | ||
| 1604 | 1604 | }; |
| 1605 | 1605 | |
| 1606 | 1606 | // create a bunch of colors we'll use during colorization |
| 1607 | − NodeList* nodeList = NodeList::getInstance(); | |
| 1608 | − for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) { | |
| 1607 | + | |
| 1608 | + foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { | |
| 1609 | 1609 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { |
| 1610 | 1610 | uint16_t nodeID = VoxelTreeElement::getSourceNodeUUIDKey(node->getUUID()); |
| 1611 | 1611 | int groupColor = voxelServerCount % NUMBER_OF_COLOR_GROUPS; |
| 1612 | 1612 | args.colors[nodeID] = groupColors[groupColor]; |
| 1613 | − | |
| 1613 | + | |
| 1614 | 1614 | if (groupColors[groupColor].red > 0) { |
| 1615 | 1615 | groupColors[groupColor].red = ((groupColors[groupColor].red - MIN_COLOR)/2) + MIN_COLOR; |
| 1616 | 1616 | } |
| @@ -1620,7 +1620,7 @@ void VoxelSystem::falseColorizeBySource() { · 3 unmodified lines | ||
| 1620 | 1620 | if (groupColors[groupColor].blue > 0) { |
| 1621 | 1621 | groupColors[groupColor].blue = ((groupColors[groupColor].blue - MIN_COLOR)/2) + MIN_COLOR; |
| 1622 | 1622 | } |
| 1623 | − | |
| 1623 | + | |
| 1624 | 1624 | voxelServerCount++; |
| 1625 | 1625 | } |
| 1626 | 1626 | } |
| @@ -2683,7 +2683,7 @@ void VoxelSystem::falseColorizeOccludedV2() { · 1056 unmodified lines | ||
| 2683 | 2683 | setupNewVoxelsForDrawing(); |
| 2684 | 2684 | } |
| 2685 | 2685 | |
| 2686 | −void VoxelSystem::nodeAdded(Node* node) { | |
| 2686 | +void VoxelSystem::nodeAdded(SharedNodePointer node) { | |
| 2687 | 2687 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { |
| 2688 | 2688 | qDebug("VoxelSystem... voxel server %s added...", node->getUUID().toString().toLocal8Bit().constData()); |
| 2689 | 2689 | _voxelServerCount++; |
| @@ -2704,7 +2704,7 @@ bool VoxelSystem::killSourceVoxelsOperation(OctreeElement* element, void* extraD · 14 unmodified lines | ||
| 2704 | 2704 | return true; |
| 2705 | 2705 | } |
| 2706 | 2706 | |
| 2707 | −void VoxelSystem::nodeKilled(Node* node) { | |
| 2707 | +void VoxelSystem::nodeKilled(SharedNodePointer node) { | |
| 2708 | 2708 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { |
| 2709 | 2709 | _voxelServerCount--; |
| 2710 | 2710 | QUuid nodeUUID = node->getUUID(); |