Changeset 301 for trunk

Timestamp:

09/29/05 01:48:20 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (3 diffs)
• src/Polygon3.cpp (modified) (2 diffs)
• src/ViewCellBsp.cpp (modified) (10 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -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
 }
@@ -75 +75 @@
         # least splits + balanced polygons
         #splitPlaneStrategy 12
-        # axis aligned + vertical axis
+        #axis aligned + vertical axis
         #splitPlaneStrategy 66
         # axis aligned + balanced view cells
-        #splitPlaneStrategy 18
+        splitPlaneStrategy 18
         # largest polygon area
-        splitPlaneStrategy 32
+        #splitPlaneStrategy 32
         # axus aligned + balanced polygons
         #splitPlaneStrategy 72
@@ -89 +89 @@
         maxViewCells 999999
         Termination {
-                maxPolysForAxisAligned 50
+                maxPolysForAxisAligned 20
                 maxPolygons 0
                 maxDepth 100

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.cpp

@@ -122 +122 @@
         for (it = mVertices.begin(); it != it_end; ++it)
                 vtx.push_back(rot * (*it));
-        
-        Vector3 cur = vtx.back();
+
+        //-- compute area
+        Vector3 last = vtx.back();
 
         float area = 0.0f;
         for (it = vtx.begin(); it != vtx.end(); ++it)
         {
-                area += cur.y * (*it).x - cur.x * (*it).y;
-
-                cur = *it;
-        }
-
+                area += last.y * (*it).x - last.x * (*it).y;
+
+                last = *it;
+        }
+        //Debug << "area: " << area * 0.5 << endl;
         return area * 0.5f;
 }
@@ -219 +220 @@
         // check if area exceeds certain size
         if (AREA_LIMIT > GetArea())
+        {
+                //Debug << "area too small: " << GetArea() << endl;
                 return false;
+        }
 #else
         Vector3 vtx = mVertices.back();

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -457 +457 @@
 
                 if (!poly->Valid())
-                        Debug << "Input polygon not valid: " << *poly << endl;
-
+                        Debug << "Input polygon not valid: " << *poly 
+                                  << endl << "Area: " << poly->GetArea() << endl;
+                
                 ++ polysNum;
         }
@@ -580 +581 @@
         if ((tData.mPolygons->size() <= sTermMaxPolygons) || (tData.mDepth >= sTermMaxDepth))
         {
-//#ifdef _DEBUG
+#ifdef _DEBUG
                 Debug << "subdivision terminated at depth " << tData.mDepth << ", #polys: " << (int)tData.mPolygons->size() << endl;
-//#endif
+#endif
 
                 EvaluateLeafStats(tData);
@@ -735 +736 @@
                 Polygon3::IncludeInBox(polys, box);
         
-                int axis = box.Size().DrivingAxis();
+                int objectsBack = 0, objectsFront = 0;
+                int axis = 0;
+                float costRatio = MAX_FLOAT;
+                Vector3 position;
+
+                for (int i=0; i < 3; i++) 
+                {
+                        float p = 0;
+                        float r = 0;/*BestCostRatio(leaf,
+                                                                        box,
+                                                                        i,
+                                                                        p,
+                                                                        objectsBack,
+                                                                        objectsFront);*/
+                        if (r < costRatio)
+                        {
+                                costRatio = r;
+                                axis = i;
+                                position = p;
+                        }
+                }
+                
+                //if (costRatio > mMaxCostRatio) axis = -1;
+                Vector3 norm(0,0,0); norm[axis] = 1.0f;
+                return Plane3(norm, position);
+
+                /*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 pt = (box.Min()[axis] + box.Max()[axis]) * 0.5f;*/
+                //Debug << "splitting axis aligned" << endl;
+                //return Plane3(norm, pt);
         }
 
@@ -786 +812 @@
                 }
         }
-        Debug << "Plane lowest cost: " << lowestCost << endl;
+        //Debug << "Plane lowest cost: " << lowestCost << endl;
         
         return polys[bestPlaneIdx]->GetSupportingPlane();
@@ -798 +824 @@
 float BspTree::EvalSplitPlane(const PolygonContainer &polys, const Plane3 &candidatePlane) const
 {
-        float sumBalancedPolys = 0;
-        float sumBalancedViewCells = 0;
-        float sumSplits = 0;
-        float sumPolyArea = 0;
-        float verticalAxis = 0;
+        float val = 0;
         
         if (sSplitPlaneStrategy & VERTICAL_AXIS)
@@ -809 +831 @@
                 // want to put a penalty on the dot product between the "tiny" vertical axis
                 // and the split plane axis
-                verticalAxis = fabs(DotProd(candidatePlane.mNormal, tinyAxis)) * (float)polys.size();
+                val += sVerticalSplitsFactor * 
+                           fabs(DotProd(candidatePlane.mNormal, tinyAxis)) * (float)polys.size();
         }
         //-- strategies where the effect of the split plane on the polygons is tested
-        if ((sSplitPlaneStrategy & BALANCED_POLYS)      || 
-                (sSplitPlaneStrategy & LEAST_SPLITS)        ||
+        if ((sSplitPlaneStrategy & BALANCED_POLYS)     || 
+                (sSplitPlaneStrategy & LEAST_SPLITS)       ||
                 (sSplitPlaneStrategy & LARGEST_POLY_AREA))
         {
                 PolygonContainer::const_iterator it, it_end = polys.end();
-                
+                float sumBalancedPolys = 0;
+                float sumSplits = 0;
+
                 for (it = polys.begin(); it != it_end; ++ it)
                 {
@@ -830 +855 @@
                         if (sSplitPlaneStrategy & LARGEST_POLY_AREA)
                         {
-                                Debug << "polygon area: " << (*it)->GetArea() << " ";
-                                sumPolyArea += (*it)->GetArea();
+                                if (classification == Polygon3::COINCIDENT)
+                                {       
+                                        float area = (*it)->GetArea();
+                                        //Debug << "polygon area: " << area << " ";
+                                        if (area) val += 100.0f/area;
+                                }
                         }
-                }Debug << "\n";
+                }
+                val += sBalancedPolysFactor * fabs(sumBalancedPolys) + 
+                           sLeastSplitsFactor * sumSplits;
         }
         
@@ -841 +872 @@
                 ObjectContainer frontViewCells;
                 ObjectContainer backViewCells;
+
+                float sumBalancedViewCells = 0;
 
                 PolygonContainer::const_iterator it, it_end = polys.end();
@@ -868 +901 @@
                         {
                                 intersect = *frontIt;
-                                sumBalancedViewCells += 1;
+                                sumBalancedViewCells += 1.0f;
                         }
                 }
@@ -883 +916 @@
                         }
                 }
+
+                 val += sBalancedViewCellsFactor * fabs(sumBalancedViewCells);
         }
 
         // return linear combination of the sums
-        return sBalancedPolysFactor * fabs(sumBalancedPolys) + 
-                   sBalancedViewCellsFactor * fabs(sumBalancedViewCells) +
-                   sLeastSplitsFactor * sumSplits + 
-                   sVerticalSplitsFactor * verticalAxis +
-                   sumPolyArea;
+        return val;
 }