History

make view frustum oversend and don't remove oversend in client

ZappoMan committed 13 years ago

Commit 0c70a051 parent 86a27c53 files · +16 −5Browse files

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

Unified · Split

interface/src/VoxelSystem.cpp+10−4
@@ -1416,7 +1416,7 @@ void VoxelSystem::falseColorizeDistanceFromView() { · 1415 unmodified lines
14161416 class removeOutOfViewArgs {
14171417 public:
14181418 VoxelSystem* thisVoxelSystem;
1419− ViewFrustum* thisViewFrustum;
1419+ ViewFrustum thisViewFrustum;
14201420 VoxelNodeBag dontRecurseBag;
14211421 unsigned long nodesScanned;
14221422 unsigned long nodesRemoved;
@@ -1426,14 +1426,20 @@ public: · 3 unmodified lines
14261426
14271427 removeOutOfViewArgs(VoxelSystem* voxelSystem) :
14281428 thisVoxelSystem(voxelSystem),
1429− thisViewFrustum(voxelSystem->getViewFrustum()),
1429+ thisViewFrustum(*voxelSystem->getViewFrustum()),
14301430 dontRecurseBag(),
14311431 nodesScanned(0),
14321432 nodesRemoved(0),
14331433 nodesInside(0),
14341434 nodesIntersect(0),
14351435 nodesOutside(0)
1436− { }
1436+ {
1437+ // Widen the FOV for trimming
1438+ float originalFOV = thisViewFrustum.getFieldOfView();
1439+ float wideFOV = originalFOV + VIEW_FRUSTUM_FOV_OVERSEND;
1440+ thisViewFrustum.setFieldOfView(wideFOV); // hack
1441+ thisViewFrustum.calculate();
1442+ }
14371443 };
14381444
14391445 void VoxelSystem::cancelImport() {
@@ -1459,7 +1465,7 @@ bool VoxelSystem::removeOutOfViewOperation(VoxelNode* node, void* extraData) { · 19 unmodified lines
14591465 for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
14601466 VoxelNode* childNode = node->getChildAtIndex(i);
14611467 if (childNode) {
1462− ViewFrustum::location inFrustum = childNode->inFrustum(*args->thisViewFrustum);
1468+ ViewFrustum::location inFrustum = childNode->inFrustum(args->thisViewFrustum);
14631469 switch (inFrustum) {
14641470 case ViewFrustum::OUTSIDE: {
14651471 args->nodesOutside++;

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