History

naming cleanup and some optimizations

ZappoMan committed 13 years ago

Commit 1284f9d1 parent 6755dfd6 files · +74 −65Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 6 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+10−10
@@ -1202,19 +1202,19 @@ bool VoxelSystem::falseColorizeOccludedOperation(VoxelNode* node, void* extraDat · 1201 unmodified lines
12021202
12031203 AABox voxelBox = node->getAABox();
12041204 voxelBox.scale(TREE_SCALE);
1205− VoxelProjectedPolygon* voxelShadow = new VoxelProjectedPolygon(args->viewFrustum->getProjectedShadow(voxelBox));
1205+ VoxelProjectedPolygon* voxelPolygon = new VoxelProjectedPolygon(args->viewFrustum->getProjectedPolygon(voxelBox));
12061206
12071207 // If we're not all in view, then ignore it, and just return. But keep searching...
1208− if (!voxelShadow->getAllInView()) {
1208+ if (!voxelPolygon->getAllInView()) {
12091209 args->nonLeavesOutOfView++;
1210− delete voxelShadow;
1210+ delete voxelPolygon;
12111211 return true;
12121212 }
12131213
1214− CoverageMap::StorageResult result = args->map->checkMap(voxelShadow, false);
1214+ CoverageMap::StorageResult result = args->map->checkMap(voxelPolygon, false);
12151215 if (result == CoverageMap::OCCLUDED) {
12161216 args->nonLeavesOccluded++;
1217− delete voxelShadow;
1217+ delete voxelPolygon;
12181218
12191219 FalseColorizeSubTreeOperationArgs subArgs;
12201220 subArgs.color[0] = 0;
@@ -1230,7 +1230,7 @@ bool VoxelSystem::falseColorizeOccludedOperation(VoxelNode* node, void* extraDat · 9 unmodified lines
12301230 return false;
12311231 }
12321232
1233− delete voxelShadow;
1233+ delete voxelPolygon;
12341234 return true; // keep looking...
12351235 }
12361236
@@ -1239,16 +1239,16 @@ bool VoxelSystem::falseColorizeOccludedOperation(VoxelNode* node, void* extraDat · 2 unmodified lines
12391239
12401240 AABox voxelBox = node->getAABox();
12411241 voxelBox.scale(TREE_SCALE);
1242− VoxelProjectedPolygon* voxelShadow = new VoxelProjectedPolygon(args->viewFrustum->getProjectedShadow(voxelBox));
1242+ VoxelProjectedPolygon* voxelPolygon = new VoxelProjectedPolygon(args->viewFrustum->getProjectedPolygon(voxelBox));
12431243
12441244 // If we're not all in view, then ignore it, and just return. But keep searching...
1245− if (!voxelShadow->getAllInView()) {
1245+ if (!voxelPolygon->getAllInView()) {
12461246 args->outOfView++;
1247− delete voxelShadow;
1247+ delete voxelPolygon;
12481248 return true;
12491249 }
12501250
1251− CoverageMap::StorageResult result = args->map->checkMap(voxelShadow, true);
1251+ CoverageMap::StorageResult result = args->map->checkMap(voxelPolygon, true);
12521252 if (result == CoverageMap::OCCLUDED) {
12531253 node->setFalseColor(255, 0, 0);
12541254 args->occludedVoxels++;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t