History

latest cut at occlusion culling

ZappoMan committed 13 years ago

Commit e2d22a81 parent b3ef9869 files · +114 −7Browse files

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

Unified · Split

interface/src/VoxelSystem.cpp+33−2
@@ -22,6 +22,7 @@ · 21 unmodified lines
22#include "Application.h"22#include "Application.h"
23#include "Log.h"23#include "Log.h"
24#include "VoxelConstants.h"24#include "VoxelConstants.h"
25#include "CoverageMap.h"
25#include "InterfaceConfig.h"26#include "InterfaceConfig.h"
26#include "renderer/ProgramObject.h"27#include "renderer/ProgramObject.h"
27 28
@@ -1159,9 +1160,10 @@ void VoxelSystem::copyFromTreeIntoSubTree(VoxelTree* sourceTree, VoxelNode* dest · 1131 unmodified lines
1159struct FalseColorizeOccludedArgs {1160struct FalseColorizeOccludedArgs {
1160 VoxelProjectedShadow occluder;1161 VoxelProjectedShadow occluder;
1161 ViewFrustum* viewFrustum;1162 ViewFrustum* viewFrustum;
1163 CoverageMap* map;
1162};1164};
1163 1165
1164bool VoxelSystem::falseColorizeOccludedOperation(VoxelNode* node, void* extraData) {1166bool VoxelSystem::falseColorizeTestOccludedOperation(VoxelNode* node, void* extraData) {
1165 FalseColorizeOccludedArgs* args = (FalseColorizeOccludedArgs*) extraData;1167 FalseColorizeOccludedArgs* args = (FalseColorizeOccludedArgs*) extraData;
1166 if (node->isColored()) {1168 if (node->isColored()) {
1167 AABox voxelBox = node->getAABox();1169 AABox voxelBox = node->getAABox();
@@ -1174,15 +1176,44 @@ bool VoxelSystem::falseColorizeOccludedOperation(VoxelNode* node, void* extraDat · 6 unmodified lines
1174 return true; // keep going!1176 return true; // keep going!
1175}1177}
1176 1178
1179void VoxelSystem::falseColorizeTestOccluded() {
1180 FalseColorizeOccludedArgs args;
1181 args.viewFrustum = Application::getInstance()->getViewFrustum();
1182
1183 AABox box(glm::vec3(0.0125,0,0.025), 0.0125);
1184 box.scale(TREE_SCALE);
1185 args.occluder = args.viewFrustum->getProjectedShadow(box);
1186
1187 _tree->recurseTreeWithOperation(falseColorizeTestOccludedOperation,(void*)&args);
1188 setupNewVoxelsForDrawing();
1189}
1190
1191bool VoxelSystem::falseColorizeOccludedOperation(VoxelNode* node, void* extraData) {
1192 FalseColorizeOccludedArgs* args = (FalseColorizeOccludedArgs*) extraData;
1193 if (node->isColored() && node->isLeaf()) {
1194 AABox voxelBox = node->getAABox();
1195 voxelBox.scale(TREE_SCALE);
1196 VoxelProjectedShadow* voxelShadow = new VoxelProjectedShadow(args->viewFrustum->getProjectedShadow(voxelBox));
1197 CoverageMap::StorageResult result = args->map->storeInMap(voxelShadow);
1198 if (result == CoverageMap::OCCLUDED) {
1199 node->setFalseColor(255, 0, 0);
1200 }
1201 }
1202 return true; // keep going!
1203}
1204
1177void VoxelSystem::falseColorizeOccluded() {1205void VoxelSystem::falseColorizeOccluded() {
1206 CoverageMap map(BoundingBox(glm::vec2(-1.f,-1.f), glm::vec2(2.f,2.f)), true);
1178 FalseColorizeOccludedArgs args;1207 FalseColorizeOccludedArgs args;
1179 args.viewFrustum = Application::getInstance()->getViewFrustum();1208 args.viewFrustum = Application::getInstance()->getViewFrustum();
1209 args.map = ↦
1180 1210
1181 AABox box(glm::vec3(0.0125,0,0.025), 0.0125);1211 AABox box(glm::vec3(0.0125,0,0.025), 0.0125);
1182 box.scale(TREE_SCALE);1212 box.scale(TREE_SCALE);
1183 args.occluder = args.viewFrustum->getProjectedShadow(box);1213 args.occluder = args.viewFrustum->getProjectedShadow(box);
1184 1214
1185 _tree->recurseTreeWithOperation(falseColorizeOccludedOperation,(void*)&args);1215 _tree->recurseTreeWithOperationDistanceSorted(falseColorizeOccludedOperation,
1216 args.viewFrustum->getPosition(), (void*)&args);
1186 setupNewVoxelsForDrawing();1217 setupNewVoxelsForDrawing();
1187}1218}
1188 1219

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