Ticket #3588: geometry.patch

source/simulation2/helpers/Geometry.cpp

@@ -19 +19 @@
 
 #include "Geometry.h"
 
-#include "maths/FixedVector2D.h"
-
 using namespace Geometry;
 
 // TODO: all of these things could be optimised quite easily
 
-bool Geometry::PointIsInSquare(CFixedVector2D point, CFixedVector2D u, CFixedVector2D v, CFixedVector2D halfSize)
-{
-    fixed du = point.Dot(u);
-    if (-halfSize.X <= du && du <= halfSize.X)
-    {
-        fixed dv = point.Dot(v);
-        if (-halfSize.Y <= dv && dv <= halfSize.Y)
-            return true;
-    }
-    return false;
-}
-
 CFixedVector2D Geometry::GetHalfBoundingBox(CFixedVector2D u, CFixedVector2D v, CFixedVector2D halfSize)
 {
     return CFixedVector2D(

source/simulation2/helpers/Geometry.h

@@ -26 +26 @@
 #include "maths/Fixed.h"
 #include "maths/MathUtil.h"
 
+#include "maths/FixedVector2D.h"
+
 class CFixedVector2D;
 
 namespace Geometry
@@ -40 +42 @@
  *
  * The @p u and @p v vectors must be perpendicular.
  */
-bool PointIsInSquare(CFixedVector2D point,
-    CFixedVector2D u, CFixedVector2D v, CFixedVector2D halfSize);
+inline bool PointIsInSquare(CFixedVector2D point, CFixedVector2D u, CFixedVector2D v, CFixedVector2D halfSize) {
+    if (point.Dot(u).Absolute() <= halfSize.X)
+        return point.Dot(v).Absolute() <= halfSize.Y;
 
+    return false;
+}
+
 /**
  * Returns a vector (bx,by) such that every point inside
  * the given rotated rectangle has coordinates