Added LineSegment::Intersects(Plane) and Plane::ClosestPoint(Ray) and Plane::ClosestPoint(LineSegment).

Author: juj

src/Geometry/LineSegment.cpp

@@ -221,6 +221,11 @@ bool LineSegment::Intersects(const Plane &plane) const
     return d * d2 <= 0.f;
 }
 
+bool LineSegment::Intersects(const Plane &plane, float *d) const
+{
+    return plane.Intersects(*this, d);
+}
+
 bool LineSegment::Intersects(const Triangle &triangle, float *d, float3 *intersectionPoint) const
 {
     return triangle.Intersects(*this, d, intersectionPoint);

src/Geometry/LineSegment.h

@@ -87,6 +87,7 @@ class LineSegment
 
     ///\todo Output intersection point.
     bool Intersects(const Plane &plane) const;
+    bool Intersects(const Plane &plane, float *d = 0) const;
     bool Intersects(const Triangle &triangle, float *d, float3 *intersectionPoint) const;
     bool Intersects(const Sphere &s, float3 *intersectionPoint = 0, float3 *intersectionNormal = 0, float *d = 0) const;
     bool Intersects(const AABB &aabb, float *dNear = 0, float *dFar = 0) const;

src/Geometry/Plane.cpp

@@ -190,6 +190,29 @@ float3 Plane::Project(const float3 &point) const
     return projected;
 }
 
+float3 Plane::ClosestPoint(const Ray &ray) const
+{
+    ///\todo Output parametric d as well.
+    float d;
+    if (ray.Intersects(*this, &d))
+        return ray.GetPoint(d);
+    else
+        return Project(ray.pos);
+}
+
+float3 Plane::ClosestPoint(const LineSegment &lineSegment) const
+{
+    ///\todo Output parametric d as well.
+    float d;
+    if (lineSegment.Intersects(*this, &d))
+        return lineSegment.GetPoint(d);
+    else
+        if (Distance(lineSegment.a) < Distance(lineSegment.b))
+            return Project(lineSegment.a);
+        else
+            return Project(lineSegment.b);
+}
+
 float3 Plane::ObliqueProject(const float3 &point, const float3 &obliqueProjectionDir) const
 {
     assume(false && "Not implemented!"); ///\todo

src/Geometry/Plane.h

@@ -115,6 +115,9 @@ class Plane
 
     /// Returns the closest point on this plane to the given point. This is an alias to Plane::Project(const float3 &point).
     float3 ClosestPoint(const float3 &point) const { return Project(point); }
+    /// Returns the closest point on this plane to the given object.
+    float3 ClosestPoint(const Ray &ray) const;
+    float3 ClosestPoint(const LineSegment &lineSegment) const;
 
     /// Projects the given point onto this plane in the given oblique projection direction.
     float3 ObliqueProject(const float3 &point, const float3 &obliqueProjectionDir) const;