diff -up spring_88.0/rts/lib/assimp/code/PolyTools.h.gcc47 spring_88.0/rts/lib/assimp/code/PolyTools.h
--- spring_88.0/rts/lib/assimp/code/PolyTools.h.gcc47 2012-04-04 11:43:38.434398485 -0400
+++ spring_88.0/rts/lib/assimp/code/PolyTools.h 2012-04-04 11:45:42.999305007 -0400
@@ -47,6 +47,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
namespace Assimp {
// -------------------------------------------------------------------------------
+/** Compute the signed area of a triangle.
+ * The function accepts an unconstrained template parameter for use with
+ * both aiVector3D and aiVector2D, but generally ignores the third coordinate.*/
+template <typename T>
+inline double GetArea2D(const T& v1, const T& v2, const T& v3)
+{
+ return 0.5 * (v1.x * ((double)v3.y - v2.y) + v2.x * ((double)v1.y - v3.y) + v3.x * ((double)v2.y - v1.y));
+}
+
+// -------------------------------------------------------------------------------
/** Test if a given point p2 is on the left side of the line formed by p0-p1.
* The function accepts an unconstrained template parameter for use with
* both aiVector3D and aiVector2D, but generally ignores the third coordinate.*/
@@ -81,18 +91,6 @@ inline bool PointInTriangle2D(const T& p
return (dot11 > 0) && (dot00 > 0) && (dot11 + dot00 < 1);
}
-
-// -------------------------------------------------------------------------------
-/** Compute the signed area of a triangle.
- * The function accepts an unconstrained template parameter for use with
- * both aiVector3D and aiVector2D, but generally ignores the third coordinate.*/
-template <typename T>
-inline double GetArea2D(const T& v1, const T& v2, const T& v3)
-{
- return 0.5 * (v1.x * ((double)v3.y - v2.y) + v2.x * ((double)v1.y - v3.y) + v3.x * ((double)v2.y - v1.y));
-}
-
-
// -------------------------------------------------------------------------------
/** Check whether the winding order of a given polygon is counter-clockwise.
* The function accepts an unconstrained template parameter, but is intended