Changeset 304 for trunk

Timestamp:

10/03/05 18:05:31 (19 years ago)

Author:

mattausch

Message:

bsp candidate selection heuristics tryout

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (4 diffs)
• src/Preprocessor.cpp (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (11 diffs)
• src/ViewCellBsp.h (modified) (1 diff)
• src/main.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -8 +8 @@
 #       filename glasgow1.x3d
 #       filename vienna.x3d
-#       filename ../data/vienna/vienna-simple.x3d
-        filename ../data/vienna/viewcells-25-sel.x3d
+        filename ../data/vienna/vienna-simple.x3d
+#       filename ../data/vienna/viewcells-25-sel.x3d
 #       filename ../data/atlanta/atlanta2.x3d
 #       filename ../data/soda/soda.dat
@@ -15 +15 @@
 #       viewcells ../data/atlanta/atlanta_viewcells_large.x3d
 #       viewcells ../data/atlanta/atlanta_viewcells_large2.x3d
-        viewcells ../data/vienna/viewcells-25-sel.x3d
-#       viewcells ../data/vienna/viewcells-25.x3d
+#       viewcells ../data/vienna/viewcells-25-sel.x3d
+        viewcells ../data/vienna/viewcells-25.x3d
 #       viewcells ../data/vienna/viewcells-large-sel.x3d
 }
@@ -73 +73 @@
         # vertical axis        = 64
         
+        splitPlaneStrategy 4
         # least splits + balanced polygons
         #splitPlaneStrategy 12
-        splitPlaneStrategy 32
+        
         #axis aligned + vertical axis
         #splitPlaneStrategy 66
@@ -89 +90 @@
         
 #       constructionMethod rays
-#       constructionMethod viewCells
-        constructionMethod sceneGeometry
-        maxCandidates 25
+        constructionMethod viewCells
+#       constructionMethod sceneGeometry
+        maxCandidates 0
         maxViewCells 999999
         Termination {

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -102 +102 @@
                 break;
         case BspTree::SCENE_GEOMETRY:
-#if 0
                 CLEAR_CONTAINER(mViewCells); // we generate new view cells
                 mSceneGraph->CollectObjects(&objects);
                 mBspTree->Construct(objects, &mViewCells);
-#else
-                for (int i=0; i< mViewCells.size(); ++i)
-                        objects.push_back(mViewCells[i]);
-                
-                mBspTree->Construct(objects, &dummy);
-#endif
                 break;
         case BspTree::RAYS:

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -260 +260 @@
 mRoot(NULL), 
 mViewCell(viewCell),
-mStorePolys(true)
-//mStorePolys(false)
+mStoreSplitPolys(true)
+//mStoreSplitPolys(false)
 {
         Randomize(); // initialise random generator for heuristics
@@ -405 +405 @@
                                                                                 &coincident,
                                                                                 splits, 
-                                                                                mStorePolys);
+                                                                                mStoreSplitPolys);
                                 
                                 // extract view cells associated with the split polygons
@@ -422 +422 @@
 
                                 // don't need coincident polygons anymore
-                                interior->ProcessPolygons(&coincident, mStorePolys);
+                                interior->ProcessPolygons(&coincident, mStoreSplitPolys);
 
                                 //Debug << "split node on level " << tData.mDepth << " bk: " << backPolys->size() << " frnt: " << frontPolys->size() << endl;
@@ -542 +542 @@
         mStat.polys = Copy2PolygonSoup(objects, *polys);
 
-        bool tmpStorePolys = mStorePolys;
-        mStorePolys = false;
+        bool tmpStorePolys = mStoreSplitPolys;
+        mStoreSplitPolys = false;
 
         // construct tree from polygon soup
         Construct(polys, viewCells);
 
-        mStorePolys = tmpStorePolys;
+        mStoreSplitPolys = tmpStorePolys;
         // filter scene bounding box down the tree in order to store split polygons
-        if (mStorePolys)
+        if (mStoreSplitPolys)
         {
                 Mesh *polyMesh = new Mesh();
@@ -627 +627 @@
 
                 // remaining polygons are discarded or added to node
-                tData.mNode->ProcessPolygons(tData.mPolygons, mStorePolys);
+                tData.mNode->ProcessPolygons(tData.mPolygons, mStoreSplitPolys);
                 DEL_PTR(tData.mPolygons);
 
@@ -660 +660 @@
         
         // don't need coincident polygons anymore
-        interior->ProcessPolygons(&coincident, mStorePolys);
+        interior->ProcessPolygons(&coincident, mStoreSplitPolys);
 
         // push the children on the stack
@@ -721 +721 @@
         int splits = 0;
         
-        interior->SplitPolygons(polys, frontPolys, backPolys, coincident, splits, mStorePolys);
+        interior->SplitPolygons(polys, frontPolys, backPolys, coincident, splits, mStoreSplitPolys);
         
         mStat.splits += splits;
@@ -885 +885 @@
                 /*int axis = box.Size().DrivingAxis();
                 Vector3 norm(0,0,0); norm[axis] = 1;
-                Vector3 pt = (box.Min()[axis] + box.Max()[axis]) * 0.5f;*/
-                
-                //return Plane3(norm, pt);
+                Vector3 position = (box.Min()[axis] + box.Max()[axis]) * 0.5f;
+                return Plane3(norm, position);*/
         }
 
@@ -905 +904 @@
         int bestPlaneIdx = 0;
         
-        int limit = Min((int)polys.size(), maxTests);
+        int limit = maxTests > 0 ? Min((int)polys.size(), maxTests) : (int)polys.size();
+        
+        int candidateIdx = limit;
 
         for (int i = 0; i < limit; ++ i)
         {
-                int candidateIdx = GetNextCandidateIdx((int)polys.size());
+                candidateIdx = GetNextCandidateIdx(candidateIdx, polys, (int)polys.size() - i - i);
+
                 Plane3 candidatePlane = polys[candidateIdx]->GetSupportingPlane();
+                
                 
                 // evaluate current candidate
@@ -926 +929 @@
 }
 
-int BspTree::GetNextCandidateIdx(const int max) const
-{
-        return Random(max); // TODO: avoid testing same plane 2 times
+int BspTree::GetNextCandidateIdx(int currentIdx, PolygonContainer &polys, int max) const
+{
+#if 0
+        int candidateIdx = Random(max); // TODO: avoid testing same plane 2 times
+
+        // swap candidates
+        Polygon *p = polys[candidateIdx];
+        polys[candidateIdx] = polys[max];
+        polys[max] = p;
+
+        return max;
+#else
+        return ++ currentIdx;
+#endif
 }
 
@@ -1179 +1193 @@
 bool BspTree::StorePolys() const
 {
-        return mStorePolys;
+        return mStoreSplitPolys;
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -445 +445 @@
 
         /** returns next candidate index
+                @param the current candidate index
                 @param max the range of candidates
         */
-        inline int GetNextCandidateIdx(const int max) const;
+        inline int GetNextCandidateIdx(int currentIdx, const int max) const;
 
         /** Helper function which extracts a view cell on the front and the back

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -41 +41 @@
   // if BSP tree construction method needs predefined view cells
 
-  if (1)//(BspTree::sConstructionMethod == BspTree::VIEW_CELLS)
+  if (BspTree::sConstructionMethod == BspTree::VIEW_CELLS)
   {
           if (vcFilename != "")