Changeset 299 for trunk/VUT

Timestamp:

09/28/05 18:11:32 (19 years ago)

Author:

mattausch

Message:

added polygon area (debugged)

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Polygon3.cpp (modified) (5 diffs)
• Polygon3.h (modified) (1 diff)
• ViewCellBsp.cpp (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.cpp

@@ -8 +8 @@
 #define SIDE_TOLERANCE 0.002f // TODO: Test different values
 #define SIDE_TOLERANCE_SQRD 0.000004f
+#define AREA_LIMIT 0.0001f
 
 Polygon3::Polygon3(): mMaterial(NULL), mParent(NULL)
@@ -108 +109 @@
 float Polygon3::GetArea() const
 {
-        float area = 0.0f;
-
-        VertexContainer vertXY;
+        VertexContainer vtx;
 
         //-- rotate polygon to lie in xy plane
@@ -121 +120 @@
         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;
+                vtx.push_back(rot * (*it));
+        
+        Vector3 *cur = &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);
+        }
+
+        return area * 0.5f;
 }
 
@@ -210 +211 @@
 }
 
-bool Polygon3::CheckValid() const
+bool Polygon3::Valid() const
 {
         if (mVertices.size() < 3)
                 return false;
 
+#if 1
+        // check if area exceeds certain size
+        if (AREA_LIMIT > GetArea())
+                return false;
+#else
         Vector3 vtx = mVertices.back();
         VertexContainer::const_iterator it, it_end = mVertices.end();
@@ -227 +233 @@
                 vtx = *it;
         }
-        
+#endif  
         return true;
 }

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.h

@@ -67 +67 @@
                 @returns true if polygon is valid.
         */
-        bool CheckValid() const; 
+        bool Valid() const; 
 
         /** Includes polygons to axis aligned box.

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -193 +193 @@
 
                                 // check if polygons still valid 
-                                if (front_piece->mVertices.size() >= 3)
+                                if (front_piece->Valid())
                                         frontPolys->push_back(front_piece);
                                 else
                                         DEL_PTR(front_piece);
                                 
-                                if (back_piece->mVertices.size() >= 3)
+                                if (back_piece->Valid())
                                         backPolys->push_back(back_piece);
                                 else                            
@@ -456 +456 @@
                 polys.push_back(poly);
 
-                if (!poly->CheckValid())
+                if (!poly->Valid())
                         Debug << "Input polygon not valid: " << *poly << endl;
 
@@ -829 +829 @@
 
                         if (sSplitPlaneStrategy & LARGEST_POLY_AREA)
+                        {
+                                Debug << "polygon area: " << (*it)->GetArea() << " ";
                                 sumPolyArea += (*it)->GetArea();
-                }
+                        }
+                }Debug << "\n";
         }