From bdabe709af4c98592d9e61f6637dd59e5e50835f Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 5 Aug 2013 11:11:10 -0700 Subject: [PATCH 1/2] added more color groups for false colorization from source --- interface/src/VoxelSystem.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index fbc6760665..0ff8a38f8a 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -860,12 +860,16 @@ bool VoxelSystem::falseColorizeBySourceOperation(VoxelNode* node, void* extraDat void VoxelSystem::falseColorizeBySource() { _nodeCount = 0; colorizeBySourceArgs args; - const int NUMBER_OF_COLOR_GROUPS = 3; + const int NUMBER_OF_COLOR_GROUPS = 6; const unsigned char MIN_COLOR = 128; int voxelServerCount = 0; - groupColor groupColors[NUMBER_OF_COLOR_GROUPS] = { groupColor(255, 0, 0), - groupColor(0, 255, 0), - groupColor(0, 0, 255)}; + groupColor groupColors[NUMBER_OF_COLOR_GROUPS] = { groupColor(255, 0, 0), + groupColor( 0, 255, 0), + groupColor( 0, 0, 255), + groupColor(255, 0, 255), + groupColor( 0, 255, 255), + groupColor(255, 255, 255) + }; // create a bunch of colors we'll use during colorization NodeList* nodeList = NodeList::getInstance(); From 92f6fe6bd8f9e1300aba2b81714bf0ff286b0f1d Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 5 Aug 2013 11:14:30 -0700 Subject: [PATCH 2/2] CR feedback --- interface/src/VoxelSystem.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 0ff8a38f8a..65d819eddc 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -863,14 +863,15 @@ void VoxelSystem::falseColorizeBySource() { const int NUMBER_OF_COLOR_GROUPS = 6; const unsigned char MIN_COLOR = 128; int voxelServerCount = 0; - groupColor groupColors[NUMBER_OF_COLOR_GROUPS] = { groupColor(255, 0, 0), - groupColor( 0, 255, 0), - groupColor( 0, 0, 255), - groupColor(255, 0, 255), - groupColor( 0, 255, 255), - groupColor(255, 255, 255) - }; - + groupColor groupColors[NUMBER_OF_COLOR_GROUPS] = { + groupColor(255, 0, 0), + groupColor( 0, 255, 0), + groupColor( 0, 0, 255), + groupColor(255, 0, 255), + groupColor( 0, 255, 255), + groupColor(255, 255, 255) + }; + // create a bunch of colors we'll use during colorization NodeList* nodeList = NodeList::getInstance(); for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {