Changes in src/tesselation.cpp [244a84:8db598]

File:

• src/tesselation.cpp (modified) (7 diffs)

src/tesselation.cpp

@@ -14 +14 @@
 #include "tesselation.hpp"
 #include "tesselationhelpers.hpp"
+#include "triangleintersectionlist.hpp"
 #include "vector.hpp"
 #include "verbose.hpp"
@@ -474 +475 @@
 };
 
-/** Finds the point on the triangle \a *BTS through which the line defined by \a *MolCenter and \a *x crosses.
- * We call Vector::GetIntersectionWithPlane() to receive the intersection point with the plane
+/** Finds the point on the triangle to the point \a *x.
+ * We call Vector::GetIntersectionWithPlane() with \a * and the center of the triangle to receive an intersection point.
+ * Then we check the in-plane part (the part projected down onto plane). We check whether it crosses one of the
+ * boundary lines. If it does, we return this intersection as closest point, otherwise the projected point down.
  * Thus we test if it's really on the plane and whether it's inside the triangle on the plane or not.
  * The latter is done as follows: We calculate the cross point of one of the triangle's baseline with the line
@@ -3222 +3225 @@
 };
 
-
 /** Finds the triangle that is closest to a given Vector \a *x.
  * \param *out output stream for debugging
@@ -3315 +3317 @@
  * \param *out output stream for debugging
  * \param *x Vector to look from
+ * \param &distance contains found distance on return
  * \return list of BoundaryTriangleSet of nearest triangles or NULL.
  */
@@ -3358 +3361 @@
 bool Tesselation::IsInnerPoint(const Vector &Point, const LinkedCell* const LC) const
 {
-  return (GetDistanceSquaredToSurface(Point, LC) < MYEPSILON);
-}
+  Info FunctionInfo(__func__);
+  TriangleIntersectionList Intersections(&Point,this,LC);
+
+  return Intersections.IsInside();
+};
 
 /** Returns the distance to the surface given by the tesselation.
@@ -3432 +3438 @@
 };
 
-/** Calculates distance to a tesselated surface.
+/** Calculates minimum distance from \a&Point to a tesselated surface.
  * Combines \sa FindClosestTrianglesToVector() and \sa GetDistanceSquaredToTriangle().
  * \param &Point point to calculate distance from
@@ -3438 +3444 @@
  * \return distance squared to closest point on surface
  */
-double Tesselation::GetDistanceSquaredToSurface(const Vector &Point, const LinkedCell* const LC) const
-{
-  BoundaryTriangleSet *triangle = FindClosestTriangleToVector(&Point, LC);
-  const double distance = GetDistanceSquaredToTriangle(Point, triangle);
-  return Min(distance, LC->RADIUS);
+double Tesselation::GetDistanceToSurface(const Vector &Point, const LinkedCell* const LC) const
+{
+  Info FunctionInfo(__func__);
+  TriangleIntersectionList Intersections(&Point,this,LC);
+
+  return Intersections.GetSmallestDistance();
+};
+
+/** Calculates minimum distance from \a&Point to a tesselated surface.
+ * Combines \sa FindClosestTrianglesToVector() and \sa GetDistanceSquaredToTriangle().
+ * \param &Point point to calculate distance from
+ * \param *LC needed for finding closest points fast
+ * \return distance squared to closest point on surface
+ */
+BoundaryTriangleSet * Tesselation::GetClosestTriangleOnSurface(const Vector &Point, const LinkedCell* const LC) const
+{
+  Info FunctionInfo(__func__);
+  TriangleIntersectionList Intersections(&Point,this,LC);
+
+  return Intersections.GetClosestTriangle();
 };