Changeset 469 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

12/16/05 18:52:33 (19 years ago)

Author:

mattausch

Message:

updated view cells, view cell manager. changed rendersimulator

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -324 +324 @@
                 
                 leaf->SetViewCell(viewCell);
-                viewCell->mBspLeaves.push_back(leaf);
+                viewCell->mLeaves.push_back(leaf);
 
                 //-- add pvs
@@ -1262 +1262 @@
                                         stat.minPvs = pvsSize;
 
-                                if ((int)viewCell->mBspLeaves.size() > stat.maxLeaves)
-                                        stat.maxLeaves = (int)viewCell->mBspLeaves.size();              
+                                if ((int)viewCell->mLeaves.size() > stat.maxLeaves)
+                                        stat.maxLeaves = (int)viewCell->mLeaves.size();         
                         }
                 }
@@ -1461 +1461 @@
 void VspBspTree::ConstructGeometry(BspViewCell *vc, PolygonContainer &vcGeom) const
 {
-        vector<BspLeaf *> leaves = vc->mBspLeaves;
+        vector<BspLeaf *> leaves = vc->mLeaves;
 
         vector<BspLeaf *>::const_iterator it, it_end = leaves.end();
@@ -1712 +1712 @@
 
 
-int
-VspBspTree::CastLineSegment(const Vector3 &origin,
-                                                 const Vector3 &termination,
-                                                 vector<ViewCell *> &viewcells
-                                                 )
-{
-  int hits = 0;
-  stack<BspRayTraversalData> tStack;
+int VspBspTree::CastLineSegment(const Vector3 &origin,
+                                                                const Vector3 &termination,
+                                                                vector<ViewCell *> &viewcells)
+{
+        int hits = 0;
+        stack<BspRayTraversalData> tStack;
   
-  float mint = 0.0f, maxt = 1.0f;
+        float mint = 0.0f, maxt = 1.0f;
   
-  Intersectable::NewMail();
+        Intersectable::NewMail();
   
-  Vector3 entp = origin;
-  Vector3 extp = termination;
+        Vector3 entp = origin;
+        Vector3 extp = termination;
   
-  BspNode *node = mRoot;
-  BspNode *farChild = NULL;
+        BspNode *node = mRoot;
+        BspNode *farChild = NULL;
   
-  while (1) {
-        if (!node->IsLeaf())  {
-          BspInterior *in = dynamic_cast<BspInterior *>(node);
+        while (1) 
+        {
+                if (!node->IsLeaf())  
+                {
+                        BspInterior *in = dynamic_cast<BspInterior *>(node);
           
-          Plane3 splitPlane = in->GetPlane();
-          const int entSide = splitPlane.Side(entp);
-          const int extSide = splitPlane.Side(extp);
+                        Plane3 splitPlane = in->GetPlane();
+                        const int entSide = splitPlane.Side(entp);
+                        const int extSide = splitPlane.Side(extp);
           
-          if (entSide < 0) {
-                node = in->GetBack();
-                
-                if(extSide <= 0) // plane does not split ray => no far child
-                  continue;
-                
-                farChild = in->GetFront(); // plane splits ray
-                
-          } else
-                if (entSide > 0) {
-                  node = in->GetFront();
+                        if (entSide < 0) 
+                        {
+                                node = in->GetBack();
+                
+                                if(extSide <= 0) // plane does not split ray => no far child
+                                        continue;
+                
+                                farChild = in->GetFront(); // plane splits ray
+                        } else if (entSide > 0) 
+                        {
+                                node = in->GetFront();
                   
-                  if (extSide >= 0) // plane does not split ray => no far child
-                        continue;
+                                if (extSide >= 0) // plane does not split ray => no far child
+                                        continue;
                   
-                  farChild = in->GetBack(); // plane splits ray                 
-                }
-                else // ray and plane are coincident
-                  {
-                        // WHAT TO DO IN THIS CASE ?
-                        //break;
-                        node = in->GetFront();
-                        continue;
-                  }
+                                farChild = in->GetBack(); // plane splits ray                   
+                        }
+                        else // ray and plane are coincident
+                        {
+                                // WHAT TO DO IN THIS CASE ?
+                                //break;
+                                node = in->GetFront();
+                                continue;
+                        }
           
-          // push data for far child
-          tStack.push(BspRayTraversalData(farChild, extp, maxt));
+                        // push data for far child
+                        tStack.push(BspRayTraversalData(farChild, extp, maxt));
           
-          // find intersection of ray segment with plane
-          float t;
-          extp = splitPlane.FindIntersection(origin, extp, &t);
-          maxt *= t;
+                        // find intersection of ray segment with plane
+                        float t;
+                        extp = splitPlane.FindIntersection(origin, extp, &t);
+                        maxt *= t;
           
-        } else {
-          // reached leaf => intersection with view cell
-          BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                } else 
+                {
+                        // reached leaf => intersection with view cell
+                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
           
-          if (!leaf->GetViewCell()->Mailed()) {
-                viewcells.push_back(leaf->GetViewCell());
-                leaf->GetViewCell()->Mail();
-                hits++;
-          }
+                        if (!leaf->GetViewCell()->Mailed()) 
+                        {
+                                viewcells.push_back(leaf->GetViewCell());
+                                leaf->GetViewCell()->Mail();
+                                ++ hits;
+                        }
           
-          //-- fetch the next far child from the stack
-          if (tStack.empty())
-                break;
+                        //-- fetch the next far child from the stack
+                        if (tStack.empty())
+                                break;
       
-          entp = extp;
-          mint = maxt; // NOTE: need this?
+                        entp = extp;
+                        mint = maxt; // NOTE: need this?
           
-          BspRayTraversalData &s = tStack.top();
+                        
+                        BspRayTraversalData &s = tStack.top();
+            
+                        node = s.mNode;
+                        extp = s.mExitPoint;
+                        maxt = s.mMaxT;
           
-          node = s.mNode;
-          extp = s.mExitPoint;
-          maxt = s.mMaxT;
-          
-          tStack.pop();
-        }
-  }
-  return hits;
-}
+                        tStack.pop();
+                }
+        }
+        return hits;
+}