From 7d8dc5be8e6844ebe81dfa822f573c654023fbf8 Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Tue, 19 Feb 2019 17:19:50 +0100 Subject: [PATCH] [GL] Use MathLib::Point3d as args for getOrient(). There is no requirement for the GeoLib::Point: - id is not used - name of the geo-object is not used. --- GeoLib/AnalyticalGeometry.cpp | 6 +++--- GeoLib/AnalyticalGeometry.h | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/GeoLib/AnalyticalGeometry.cpp b/GeoLib/AnalyticalGeometry.cpp index 1a22d47307a..dd029dc5bb1 100644 --- a/GeoLib/AnalyticalGeometry.cpp +++ b/GeoLib/AnalyticalGeometry.cpp @@ -44,9 +44,9 @@ double getOrientation2d(MathLib::Point3d const& a, namespace GeoLib { -Orientation getOrientation(GeoLib::Point const& p0, - GeoLib::Point const& p1, - GeoLib::Point const& p2) +Orientation getOrientation(MathLib::Point3d const& p0, + MathLib::Point3d const& p1, + MathLib::Point3d const& p2) { double const orientation = ExactPredicates::getOrientation2d(p0, p1, p2); if (orientation > 0) diff --git a/GeoLib/AnalyticalGeometry.h b/GeoLib/AnalyticalGeometry.h index 08b5c8d6b1b..d9f82309803 100644 --- a/GeoLib/AnalyticalGeometry.h +++ b/GeoLib/AnalyticalGeometry.h @@ -41,10 +41,9 @@ enum Orientation * \returns CW (clockwise), CCW (counterclockwise) or COLLINEAR (points are on a * line) */ -Orientation getOrientation(GeoLib::Point const& p0, - GeoLib::Point const& p1, - GeoLib::Point const& p2); - +Orientation getOrientation(MathLib::Point3d const& p0, + MathLib::Point3d const& p1, + MathLib::Point3d const& p2); /** * compute a supporting plane (represented by plane_normal and the value d) for the polygon * Let \f$n\f$ be the plane normal and \f$d\f$ a parameter. Then for all points \f$p \in R^3\f$ of the plane -- GitLab