Changeset 298 for trunk

Timestamp:

09/28/05 17:09:31 (19 years ago)

Author:

mattausch

Message:

added polygon area

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (2 diffs)
• src/Polygon3.cpp (modified) (1 diff)
• src/Polygon3.h (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (3 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
 }
@@ -80 +80 @@
         #splitPlaneStrategy 18
         # largest polygon area
-        #splitPlaneStrategy 32
-        splitPlaneStrategy 72
+        splitPlaneStrategy 32
+        # axus aligned + balanced polygons
+        #splitPlaneStrategy 72
 #       constructionMethod rays
         constructionMethod viewCells

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.cpp

@@ -106 +106 @@
 }
 
+float Polygon3::GetArea() const
+{
+        float area = 0.0f;
+
+        VertexContainer vertXY;
+
+        //-- rotate polygon to lie in xy plane
+        Vector3 v1 = mVertices[0] - mVertices[1];
+        Vector3 v2 = mVertices[2] - mVertices[1];
+        Vector3 n = Normalize(CrossProd(v2,v1));
+
+        Matrix4x4 rot = GenRotation(v1, v2, n);
+
+        VertexContainer::const_iterator it, it_end = mVertices.end();
+
+        Debug << "old: ";
+        for (it = mVertices.begin(); it != it_end; ++it)
+        {
+                vertXY.push_back(rot * (*it));
+                Debug << (*it).z << " ";
+        }
+        Debug << endl << "new: ";
+        for (it = vertXY.begin(); it != vertXY.end(); ++it)
+                Debug << (*it).z << " ";
+        Debug << endl << endl;
+
+        return area;
+}
+
 int Polygon3::Side(const Plane3 &plane) const
 {

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.h

@@ -40 +40 @@
         */
         void Split(Plane3 *partition, Polygon3 *front, Polygon3 *back);
+
+        /** Returns the area of this polygon.
+        */
+        float GetArea() const;
 
         enum {BACK_SIDE, FRONT_SIDE, SPLIT, COINCIDENT};

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -800 +800 @@
         float sumBalancedPolys = 0;
         float sumBalancedViewCells = 0;
-        float sumLeastSplits = 0;
+        float sumSplits = 0;
+        float sumPolyArea = 0;
         float verticalAxis = 0;
         
@@ -825 +826 @@
                                 
                         if (sSplitPlaneStrategy & LEAST_SPLITS)
-                                sumLeastSplits += sLeastSplitsTable[classification];
+                                sumSplits += sLeastSplitsTable[classification];
+
+                        if (sSplitPlaneStrategy & LARGEST_POLY_AREA)
+                                sumPolyArea += (*it)->GetArea();
                 }
         }
@@ -881 +885 @@
         return sBalancedPolysFactor * fabs(sumBalancedPolys) + 
                    sBalancedViewCellsFactor * fabs(sumBalancedViewCells) +
-                   sLeastSplitsFactor * sumLeastSplits + 
-                   sVerticalSplitsFactor * verticalAxis;
+                   sLeastSplitsFactor * sumSplits + 
+                   sVerticalSplitsFactor * verticalAxis +
+                   sumPolyArea;
 }