Changeset 1563 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp

Timestamp:

10/03/06 22:03:58 (18 years ago)

Author:

mattausch

Message:

fixed bug with view space box

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp

@@ -171 +171 @@
 mTimeStamp(1),
 mViewCellsTree(NULL),
-mOutOfBoundsCellPartOfTree(false)
+mOutOfBoundsCellPartOfTree(false),
+mOutOfBoundsCell(NULL)
 {
         Randomize(); // initialise random generator for heuristics
@@ -956 +957 @@
         {
                 tData = tStack.top();
-
             tStack.pop();
 
@@ -1010 +1010 @@
                 if (!mUsePredefinedViewCells)
                 {       // generate new view cell for each leaf
-                        viewCell = new BspViewCell();
+                        viewCell = new BspViewCell();cout << "g";
                 }
                 else
-                {
+                {       
                         // add predefined view cell to leaf
                         viewCell = dynamic_cast<BspViewCell *>(tData.mViewCell);
-
                         // from now on out of bounds cell can be handled as any other cell,
                         // responsibility for deleting has been shifted
-                        if (viewCell == mOutOfBoundsCell)
+                        if (IsOutOfBounds(viewCell))
                         {
                                 mOutOfBoundsCellPartOfTree = true;
                         }
+                
                 }
 
@@ -1035 +1035 @@
                 else
                         viewCell->SetVolume(probability);
-
                 
                 ///////////
@@ -1049 +1048 @@
                 }
 
-                if (1)EvaluateLeafStats(tData);
-                
-
+                if (1) EvaluateLeafStats(tData);
+                
                 ////////
                 //-- clean up
@@ -2399 +2397 @@
         {
                 // per definition out of bounds cell has zero volume
-                if ((*it) == mOutOfBoundsCell)
+                if (IsOutOfBounds(*it))
                         continue;
 
@@ -3325 +3323 @@
 ViewCell *BspTree::GetViewCell(const Vector3 &point)
 {
-  if (mRoot == NULL)
-        return NULL;
-  
-
-  stack<BspNode *> nodeStack;
-  nodeStack.push(mRoot);
-  
-  ViewCellLeaf *viewcell = NULL;
-  
-  while (!nodeStack.empty())  {
-        BspNode *node = nodeStack.top();
-        nodeStack.pop();
-        
-        if (node->IsLeaf()) {
-          viewcell = dynamic_cast<BspLeaf *>(node)->mViewCell;
-          break;
-        } else {
-          
-          BspInterior *interior = dynamic_cast<BspInterior *>(node);
-                
-          // random decision
-          if (interior->GetPlane().Side(point) < 0)
-                nodeStack.push(interior->GetBack());
-          else
-                nodeStack.push(interior->GetFront());
-        }
-  }
-  
-  return viewcell;
+        if (mRoot == NULL)
+                return NULL;
+
+        stack<BspNode *> nodeStack;
+        nodeStack.push(mRoot);
+
+        ViewCellLeaf *viewcell = NULL;
+
+        while (!nodeStack.empty())  {
+                BspNode *node = nodeStack.top();
+                nodeStack.pop();
+
+                if (node->IsLeaf()) 
+                {
+                        viewcell = dynamic_cast<BspLeaf *>(node)->mViewCell;
+                        break;
+                } 
+                else 
+                {
+
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+
+                        // random decision
+                        if (interior->GetPlane().Side(point) < 0)
+                        {
+                                nodeStack.push(interior->GetBack());
+                        }
+                        else
+                        {
+                                nodeStack.push(interior->GetFront());
+                        }
+                }
+        }
+
+        return viewcell;
 }