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

Timestamp:

01/13/06 17:39:43 (19 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -29 +29 @@
 const float VspBspTree::sBalancedRaysTable[] = {1, -1, 0, 0, 0};
 
+int BspMergeCandidate::sMaxPvsSize = 0;
 
 int VspBspTree::sFrontId = 0;
@@ -311 +312 @@
 
         mMaxPvs = (int)(mMaxPvsRatio * (float)numObj);
-        Debug << "maximal pvs where view cell is valid: " << mMaxPvs << endl;
+        
+        Debug << "maximal pvs (i.e., view cell considered as valid: " << mMaxPvs << endl;
         //-- store rays
         for (rit = sampleRays.begin(); rit != rit_end; ++ rit)
@@ -424 +426 @@
                  (data.mArea <= mTermMinArea) ||
                  (mStat.Leaves() >= mMaxViewCells) ||
-                 (data.GetAvgRayContribution() >= mTermMaxRayContribution) ||
+                 (data.GetAvgRayContribution() > mTermMaxRayContribution) ||
                  (data.mDepth >= mTermMaxDepth));
 }
@@ -2159 +2161 @@
 typedef pair<BspNode *, BspNodeGeometry *> bspNodePair;
 
+
 int VspBspTree::CastBeam(Beam &beam)
 {
@@ -2176 +2179 @@
                 
                 AxisAlignedBox3 box;
-                geom->ComputeBoundingBox(box);
-
-                int side = beam.ComputeIntersection(box);
+                box.Initialize();
+                geom->IncludeInBox(box);
+
+                Debug << "box:\n " << box << endl;;
+                const int side = beam.ComputeIntersection(box);
                 
                 switch (side) 
                 {
                 case -1:
+                        Debug << "here999" << endl;
                         CollectViewCells(node, beam.mViewCells, true);
                         break;
                 case 0:
+                        
                         if (node->IsLeaf())
                         {
-                                BspLeaf *leaf = dynamic_cast<BspLeaf *>(leaf);
+                                Debug << "here2" << endl;
+                                BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+                        
                                 if (!leaf->GetViewCell()->Mailed() && leaf->TreeValid())
+                                {
+                                        leaf->GetViewCell()->Mail();
                                         beam.mViewCells.push_back(leaf->GetViewCell());
+                                }
                         }
                         else 
                         {
+                                Debug << "here77" << endl;
                                 BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        
                                 BspNode *first = interior->GetBack();
                                 BspNode *second = interior->GetFront();
-                
+            
+                                BspNodeGeometry *firstGeom = new BspNodeGeometry();
+                                BspNodeGeometry *secondGeom = new BspNodeGeometry();
+
+                                ConstructGeometry(first, *firstGeom);
+                                ConstructGeometry(second, *secondGeom);
+
                                 // decide on the order of the nodes
                                 if (DotProd(beam.mPlanes[0].mNormal, 
@@ -2203 +2223 @@
                                 {
                                         swap(first, second);
+                                        swap(firstGeom, secondGeom);
                                 }
 
-                                BspNodeGeometry *leftGeom = new BspNodeGeometry();
-                                BspNodeGeometry *rightGeom = new BspNodeGeometry();
-
-                                ConstructGeometry(first, *leftGeom);
-                                ConstructGeometry(second, *rightGeom);
-
-                                nodeStack.push(bspNodePair(first, leftGeom));
-                                nodeStack.push(bspNodePair(second, rightGeom));
+                                nodeStack.push(bspNodePair(first, firstGeom));
+                                nodeStack.push(bspNodePair(second, secondGeom));
                         }
+                        
                         break;
+                        Debug << "culling!!" << endl;
                         // default: cull
                 }
+                Debug << "here4" << endl;
                 DEL_PTR(geom);
+                
         }
 
@@ -2471 +2490 @@
 int VspBspTree::MergeViewCells(const VssRayContainer &rays)
 {
+        BspMergeCandidate::sMaxPvsSize = mMaxPvs;
+
         MergeStatistics mergeStats;
         mergeStats.Start();
@@ -2866 +2887 @@
 
         mMergeCost = newCost - oldCost;
-//      if (vcPvs > sMaxPvsSize) // strong penalty if pvs size too large
-//              mMergeCost += 1.0;
+        if (newPvs > sMaxPvsSize) // strong penalty if pvs size too large
+                mMergeCost += 1.0;
 }