From 59e792a6ebbacb1ddaba1d9825772a75805cc6ab Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Sun, 26 Aug 2007 17:56:46 +0000 Subject: Various small cleanups (bzr r3587) --- src/line-geometry.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/line-geometry.cpp') diff --git a/src/line-geometry.cpp b/src/line-geometry.cpp index 000da8a07..549defb2e 100644 --- a/src/line-geometry.cpp +++ b/src/line-geometry.cpp @@ -121,9 +121,14 @@ bool lies_in_sector (NR::Point const &v1, NR::Point const &v2, NR::Point const & return (coords.first >= 0 and coords.second >= 0); } -static double pos_angle (NR::Point A, NR::Point B) +bool lies_in_quadrangle (NR::Point const &A, NR::Point const &B, NR::Point const &C, NR::Point const &D, NR::Point const &pt) { - return fabs (NR::atan2 (A) - NR::atan2 (B)); + return (lies_in_sector (D - A, B - A, pt - A) && lies_in_sector (D - C, B - C, pt - C)); +} + +static double pos_angle (NR::Point v, NR::Point w) +{ + return fabs (NR::atan2 (v) - NR::atan2 (w)); } /* -- cgit v1.2.3