merge + few efficiency ameliorations to importDialog

atlante45 committed 13 years ago

Commit 3eb5ace2 parents 24531fd 86f2cbe27 files · +603 −97Browse files

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

Unified · Split

     _dataSourceID = UNKNOWN_NODE_ID;
     _voxelServerCount = 0;
+    _viewFrustum = Application::getInstance()->getViewFrustum();
     connect(_tree, SIGNAL(importSize(float,float,float)), SIGNAL(importSize(float,float,float)));
     connect(_tree, SIGNAL(importProgress(int)), SIGNAL(importProgress(int)));
 }
     int   voxelsUpdated   = 0;
     bool  shouldRender    = false; // assume we don't need to render it
     // if it's colored, we might need to render it!
-    shouldRender = node->calculateShouldRender(Application::getInstance()->getViewFrustum());
+    shouldRender = node->calculateShouldRender(_viewFrustum);
     node->setShouldRender(shouldRender);
     // let children figure out their renderness
     }
     // if we got to the end of the array, and we're in an active dirty segment...
     if (inSegment) {
         updateVBOSegment(segmentStart, _voxelsInReadArrays - 1);
         inSegment = false;
     }
 }
 void VoxelSystem::falseColorizeInView() {
-    ViewFrustum* viewFrustum = Application::getInstance()->getViewFrustum();
     _nodeCount = 0;
-    _tree->recurseTreeWithOperation(falseColorizeInViewOperation,(void*)viewFrustum);
+    _tree->recurseTreeWithOperation(falseColorizeInViewOperation,(void*)_viewFrustum);
     qDebug("setting in view false color for %d nodes\n", _nodeCount);
     _tree->setDirtyBit();
     setupNewVoxelsForDrawing();
 }
 void VoxelSystem::falseColorizeDistanceFromView() {
-    ViewFrustum* viewFrustum = Application::getInstance()->getViewFrustum();
     _nodeCount = 0;
     _maxDistance = 0.0;
     _minDistance = FLT_MAX;
-    _tree->recurseTreeWithOperation(getDistanceFromViewRangeOperation, (void*) viewFrustum);
+    _tree->recurseTreeWithOperation(getDistanceFromViewRangeOperation, (void*) _viewFrustum);
     qDebug("determining distance range for %d nodes\n", _nodeCount);
     _nodeCount = 0;
-    _tree->recurseTreeWithOperation(falseColorizeDistanceFromViewOperation, (void*) viewFrustum);
+    _tree->recurseTreeWithOperation(falseColorizeDistanceFromViewOperation, (void*) _viewFrustum);
     qDebug("setting in distance false color for %d nodes\n", _nodeCount);
     _tree->setDirtyBit();
     setupNewVoxelsForDrawing();
 class removeOutOfViewArgs {
 public:
     VoxelSystem*    thisVoxelSystem;
+    ViewFrustum*    thisViewFrustum;
     VoxelNodeBag    dontRecurseBag;
     unsigned long   nodesScanned;
     unsigned long   nodesRemoved;
     removeOutOfViewArgs(VoxelSystem* voxelSystem) :
         thisVoxelSystem(voxelSystem),
+        thisViewFrustum(voxelSystem->getViewFrustum()),
         dontRecurseBag(),
         nodesScanned(0),
         nodesRemoved(0),
     for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
         VoxelNode* childNode = node->getChildAtIndex(i);
         if (childNode) {
-            ViewFrustum::location inFrustum = childNode->inFrustum(*Application::getInstance()->getViewFrustum());
+            ViewFrustum::location inFrustum = childNode->inFrustum(*args->thisViewFrustum);
             switch (inFrustum) {
                 case ViewFrustum::OUTSIDE: {
                     args->nodesOutside++;
     bool result = false; // assume the best
     // If our viewFrustum has changed since our _lastKnowViewFrustum
-    if (!_lastKnowViewFrustum.matches(Application::getInstance()->getViewFrustum())) {
+    if (!_lastKnowViewFrustum.matches(_viewFrustum)) {
         result = true;
-        _lastKnowViewFrustum = *Application::getInstance()->getViewFrustum(); // save last known
+        _lastKnowViewFrustum = *_viewFrustum; // save last known
     }
     return result;
 }
     }
     // If our viewFrustum has changed since our _lastKnowViewFrustum
-    if (!_lastStableViewFrustum.matches(Application::getInstance()->getViewFrustum())) {
+    if (!_lastStableViewFrustum.matches(_viewFrustum)) {
         result = true;
-        _lastStableViewFrustum = *Application::getInstance()->getViewFrustum(); // save last stable
+        _lastStableViewFrustum = *_viewFrustum; // save last stable
     }
     return result;
 }
     setupNewVoxelsForDrawing();
 };
+void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelSystem* destinationTree, bool rebaseToRoot) {
+    _tree->copySubTreeIntoNewTree(startNode, destinationTree->_tree, rebaseToRoot);
+}
 void VoxelSystem::copySubTreeIntoNewTree(VoxelNode* startNode, VoxelTree* destinationTree, bool rebaseToRoot) {
     _tree->copySubTreeIntoNewTree(startNode, destinationTree, rebaseToRoot);
 }
     _tree->copyFromTreeIntoSubTree(sourceTree, destinationNode);
 }
+void VoxelSystem::recurseTreeWithOperation(RecurseVoxelTreeOperation operation, void* extraData) {
+    _tree->recurseTreeWithOperation(operation, extraData);
+}
 struct FalseColorizeOccludedArgs {
     ViewFrustum* viewFrustum;
     CoverageMap* map;
     myCoverageMap.erase();
     FalseColorizeOccludedArgs args;
-    args.viewFrustum = Application::getInstance()->getViewFrustum();
+    args.viewFrustum = _viewFrustum;
     args.map = &myCoverageMap;
     args.totalVoxels = 0;
     args.coloredVoxels = 0;
     VoxelProjectedPolygon::intersects_calls = 0;
     FalseColorizeOccludedArgs args;
-    args.viewFrustum = Application::getInstance()->getViewFrustum();
+    args.viewFrustum = _viewFrustum;
     args.mapV2 = &myCoverageMapV2;
     args.totalVoxels = 0;
     args.coloredVoxels = 0;