Showing the changes to interface/src/VoxelSystem.cpp (1 of 2 files). Show all
Unified · Split
| @@ -11,7 +11,6 @@ · 10 unmodified lines | |||
| 11 | #include <cmath> | 11 | #include <cmath> |
| 12 | #include <iostream> // to load voxels from file | 12 | #include <iostream> // to load voxels from file |
| 13 | #include <fstream> // to load voxels from file | 13 | #include <fstream> // to load voxels from file |
| 14 | #include <pthread.h> | ||
| 15 | 14 | ||
| 16 | #include <OctalCode.h> | 15 | #include <OctalCode.h> |
| 17 | #include <PacketHeaders.h> | 16 | #include <PacketHeaders.h> |
| @@ -1594,13 +1593,13 @@ void VoxelSystem::falseColorizeBySource() { · 1576 unmodified lines | |||
| 1594 | }; | 1593 | }; |
| 1595 | 1594 | ||
| 1596 | // create a bunch of colors we'll use during colorization | 1595 | // create a bunch of colors we'll use during colorization |
| 1597 | 1596 | ||
| 1598 | foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { | 1597 | foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { |
| 1599 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { | 1598 | if (node->getType() == NODE_TYPE_VOXEL_SERVER) { |
| 1600 | uint16_t nodeID = VoxelTreeElement::getSourceNodeUUIDKey(node->getUUID()); | 1599 | uint16_t nodeID = VoxelTreeElement::getSourceNodeUUIDKey(node->getUUID()); |
| 1601 | int groupColor = voxelServerCount % NUMBER_OF_COLOR_GROUPS; | 1600 | int groupColor = voxelServerCount % NUMBER_OF_COLOR_GROUPS; |
| 1602 | args.colors[nodeID] = groupColors[groupColor]; | 1601 | args.colors[nodeID] = groupColors[groupColor]; |
| 1603 | 1602 | ||
| 1604 | if (groupColors[groupColor].red > 0) { | 1603 | if (groupColors[groupColor].red > 0) { |
| 1605 | groupColors[groupColor].red = ((groupColors[groupColor].red - MIN_COLOR)/2) + MIN_COLOR; | 1604 | groupColors[groupColor].red = ((groupColors[groupColor].red - MIN_COLOR)/2) + MIN_COLOR; |
| 1606 | } | 1605 | } |
| @@ -1610,7 +1609,7 @@ void VoxelSystem::falseColorizeBySource() { · 3 unmodified lines | |||
| 1610 | if (groupColors[groupColor].blue > 0) { | 1609 | if (groupColors[groupColor].blue > 0) { |
| 1611 | groupColors[groupColor].blue = ((groupColors[groupColor].blue - MIN_COLOR)/2) + MIN_COLOR; | 1610 | groupColors[groupColor].blue = ((groupColors[groupColor].blue - MIN_COLOR)/2) + MIN_COLOR; |
| 1612 | } | 1611 | } |
| 1613 | 1612 | ||
| 1614 | voxelServerCount++; | 1613 | voxelServerCount++; |
| 1615 | } | 1614 | } |
| 1616 | } | 1615 | } |