Changeset 509 for trunk

Timestamp:

01/09/06 10:28:43 (19 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -833 +833 @@
         box.Initialize();
         
-#if 0
-        RayInfoContainer::const_iterator ri, ri_end = tData.mRays->end();
-
-        for(ri = tData.mRays->begin(); ri < ri_end; ++ ri)
-                box.Include((*ri).ExtrapTermination());
-#else
-        PolygonContainer::const_iterator it, it_end = tData.mGeometry->mPolys.end();
-
-        for(it = tData.mGeometry->mPolys.begin(); it < it_end; ++ it)
-                box.Include(*(*it));
-
-#endif
+        if (1 && mPvsUseArea)
+        {
+                PolygonContainer::const_iterator it, it_end = tData.mGeometry->mPolys.end();
+
+                for(it = tData.mGeometry->mPolys.begin(); it < it_end; ++ it)
+                        box.Include(*(*it));
+        }
+        else
+        {
+                RayInfoContainer::const_iterator ri, ri_end = tData.mRays->end();
+
+                for(ri = tData.mRays->begin(); ri < ri_end; ++ ri)
+                        box.Include((*ri).ExtrapTermination());
+        }
+
         int sAxis = box.Size().DrivingAxis();
 
@@ -2194 +2197 @@
         vector<BspLeaf *>::const_iterator it, it_end = leaves.end();
 
-        Debug << "mergequeue size: " << mMergeQueue.size() << endl;
+        int candidates = 0;
+
         // find merge candidates and push them into queue
         for (it = leaves.begin(); it != it_end; ++ it)
@@ -2217 +2221 @@
                 {
                         if ((*nit)->GetViewCell() != leaf->GetViewCell())
+                        {
                                 mMergeQueue.push(BspMergeCandidate(leaf, *nit));
-                }
-        }
-
-        Debug << "new mergequeue size: " << mMergeQueue.size() << endl;
+                                ++ candidates;
+                        }
+                }
+        }
+
+        Debug << "found " << candidates << " new merge candidates" << endl;
 
         return (int)leaves.size();