Showing the changes to interface/src/VoxelSystem.cpp (1 of 2 files). Show all
Unified · Split
| @@ -1189,21 +1189,29 @@ void VoxelSystem::falseColorizeTestOccluded() { · 1188 unmodified lines | ||
| 1189 | 1189 | } |
| 1190 | 1190 | |
| 1191 | 1191 | bool VoxelSystem::falseColorizeOccludedOperation(VoxelNode* node, void* extraData) { |
| 1192 | +//node->printDebugDetails(">>>>>>>>>>>>>>> falseColorizeOccludedOperation() BEGIN >>>>>>>>>>>>>>"); | |
| 1192 | 1193 | FalseColorizeOccludedArgs* args = (FalseColorizeOccludedArgs*) extraData; |
| 1193 | − if (node->isColored() && node->isLeaf()) { | |
| 1194 | + if (node->isColored() && node->isLeaf() && !node->isStagedForDeletion() && node->getShouldRender()) { | |
| 1195 | +//printLog("***** falseColorizeOccludedOperation() NODE is colored, etc, so consider it *****\n"); | |
| 1194 | 1196 | AABox voxelBox = node->getAABox(); |
| 1195 | 1197 | voxelBox.scale(TREE_SCALE); |
| 1196 | 1198 | VoxelProjectedShadow* voxelShadow = new VoxelProjectedShadow(args->viewFrustum->getProjectedShadow(voxelBox)); |
| 1197 | 1199 | CoverageMap::StorageResult result = args->map->storeInMap(voxelShadow); |
| 1198 | 1200 | if (result == CoverageMap::OCCLUDED) { |
| 1201 | +//printLog("***** falseColorizeOccludedOperation() NODE is OCCLUDED *****\n"); | |
| 1199 | 1202 | node->setFalseColor(255, 0, 0); |
| 1203 | + } else if (result == CoverageMap::STORED) { | |
| 1204 | +//printLog("***** falseColorizeOccludedOperation() NODE is STORED *****\n"); | |
| 1205 | + } else if (result == CoverageMap::DOESNT_FIT) { | |
| 1206 | +//printLog("***** falseColorizeOccludedOperation() NODE DOESNT_FIT???? *****\n"); | |
| 1200 | 1207 | } |
| 1201 | 1208 | } |
| 1209 | +//printLog("<<<<<<<<<<<<<<<<< falseColorizeOccludedOperation() END <<<<<<<<<<<<<<<<<\n"); | |
| 1202 | 1210 | return true; // keep going! |
| 1203 | 1211 | } |
| 1204 | 1212 | |
| 1205 | 1213 | void VoxelSystem::falseColorizeOccluded() { |
| 1206 | − CoverageMap map(BoundingBox(glm::vec2(-1.f,-1.f), glm::vec2(2.f,2.f)), true); | |
| 1214 | + CoverageMap map(BoundingBox(glm::vec2(-2.f,-2.f), glm::vec2(4.f,4.f)), true); | |
| 1207 | 1215 | FalseColorizeOccludedArgs args; |
| 1208 | 1216 | args.viewFrustum = Application::getInstance()->getViewFrustum(); |
| 1209 | 1217 | args.map = ↦ |