Changeset 305 for trunk/VUT

Timestamp:

10/03/05 18:57:58 (19 years ago)

Author:

mattausch

Message:

avoiding duplicate random planes

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (2 diffs)
• src/ViewCellBsp.cpp (modified) (6 diffs)
• src/ViewCellBsp.h (modified) (4 diffs)
• src/main.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -73 +73 @@
         # vertical axis        = 64
         
-        splitPlaneStrategy 4
+        splitPlaneStrategy 64
         # least splits + balanced polygons
         #splitPlaneStrategy 12
@@ -92 +92 @@
         constructionMethod viewCells
 #       constructionMethod sceneGeometry
-        maxCandidates 0
+        maxCandidates 25
         maxViewCells 999999
         Termination {
                 maxPolysForAxisAligned 50
-                maxPolygons 5
+                maxPolygons 0
                 maxDepth 100
         }

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -260 +260 @@
 mRoot(NULL), 
 mViewCell(viewCell),
-mStoreSplitPolys(true)
-//mStoreSplitPolys(false)
+//mStoreSplitPolys(true)
+mStoreSplitPolys(false)
 {
         Randomize(); // initialise random generator for heuristics
@@ -622 +622 @@
                 }
                 //-- add viewcell stored in split polygon
-                else if (leaf->GetViewCell())
+                else if (!leaf->GetViewCell())
                         leaf->SetViewCell(tData.mViewCell);
                 //else Debug << "Leaf already has view cell " << endl;
@@ -843 +843 @@
 }
 
-Plane3 BspTree::SelectPlane(BspLeaf *leaf, const PolygonContainer &polys)  const
+Plane3 BspTree::SelectPlane(BspLeaf *leaf, PolygonContainer &polys)
 {
         if (polys.size() == 0)
@@ -899 +899 @@
 }
 
-Plane3 BspTree::SelectPlaneHeuristics(const PolygonContainer &polys, int maxTests) const
+Plane3 BspTree::SelectPlaneHeuristics(PolygonContainer &polys, int maxTests)
 {
         float lowestCost = MAX_FLOAT;
@@ -907 +907 @@
         
         int candidateIdx = limit;
-
+        PolygonContainer debugPolys;bool dist = true;
         for (int i = 0; i < limit; ++ i)
         {
-                candidateIdx = GetNextCandidateIdx(candidateIdx, polys, (int)polys.size() - i - i);
+                candidateIdx = GetNextCandidateIdx(candidateIdx, polys);
 
                 Plane3 candidatePlane = polys[candidateIdx]->GetSupportingPlane();
-                
                 
                 // evaluate current candidate
@@ -923 +922 @@
                         lowestCost = candidateCost;
                 }
-        }
+                for (int i=0; i < debugPolys.size(); ++i)
+                        if (polys[candidateIdx] == debugPolys[i])
+                        {
+                                Debug << "FATAL ERROR" << endl;
+                                dist = false;
+                        }
+                debugPolys.push_back(polys[candidateIdx]);
+        }
+        
         //Debug << "Plane lowest cost: " << lowestCost << endl;
-        
+        if (!dist)
+                Debug << "FATAL ERROR DUPLICATE TESTS!!" << endl;
         return polys[bestPlaneIdx]->GetSupportingPlane();
 }
 
-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
-}
-
-float BspTree::EvalSplitPlane(const PolygonContainer &polys, const Plane3 &candidatePlane) const
+int BspTree::GetNextCandidateIdx(int currentIdx, PolygonContainer &polys)
+{
+        int candidateIdx = Random(currentIdx--);
+        
+        // swap candidates to avoid testing same plane 2 times
+        Polygon3 *p = polys[candidateIdx];
+        polys[candidateIdx] = polys[currentIdx];
+        polys[currentIdx] = p;
+        
+        return currentIdx;
+}
+
+float BspTree::EvalSplitPlane(PolygonContainer &polys, const Plane3 &candidatePlane)
 {
         float val = 0;

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -359 +359 @@
                 @returns the cost of the candidate split plane
         */
-        float EvalSplitPlane(const PolygonContainer &polys, const Plane3 &candidatePlane) const;
+        float EvalSplitPlane(PolygonContainer &polys, const Plane3 &candidatePlane);
 
         /** Evaluates tree stats in the BSP tree leafs.
@@ -377 +377 @@
                 @param polys the polygon list on which the split decition is based
         */
-        Plane3 SelectPlane(BspLeaf *leaf, const PolygonContainer &polys) const;
+        Plane3 SelectPlane(BspLeaf *leaf, PolygonContainer &polys);
 
         /** Filters next view cell down the tree and inserts it into the appropriate leaves
@@ -416 +416 @@
                 @param maxTests the maximal number of candidate tests
         */
-        Plane3 SelectPlaneHeuristics(const PolygonContainer &polys, const int maxTests) const;
+        Plane3 SelectPlaneHeuristics(PolygonContainer &polys, const int maxTests);
 
         /** Extracts the meshes of the objects and copies them into the mesh. 
@@ -444 +444 @@
         int CastRay(Ray &ray);
 
-        /** returns next candidate index
+        /** returns next candidate index and reorders polygons so no candidate is chosen two times
                 @param the current candidate index
                 @param max the range of candidates
         */
-        inline int GetNextCandidateIdx(int currentIdx, const int max) const;
+        int GetNextCandidateIdx(int currentIdx, PolygonContainer &polys);
 
         /** Helper function which extracts a view cell on the front and the back

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -40 +40 @@
 
   // if BSP tree construction method needs predefined view cells
-
   if (BspTree::sConstructionMethod == BspTree::VIEW_CELLS)
   {
@@ -72 +71 @@
   if (exporter) 
   {     
-          Debug << Exporting complementary view cells" << endl;
+          Debug << "Exporting complementary view cells" << endl;
           exporter->ExportViewCells(&vc_compl); // export view cells
           delete exporter;