X-Git-Url: https://adrianiainlam.tk/git/?p=facial-landmarks-for-cubism.git;a=blobdiff_plain;f=src%2Fmath_utils.h;fp=src%2Fmath_utils.h;h=f6b3d193588e4a0c9415869437edce12bb15eb62;hp=d465c87f586d5ea4f819f2e04f5776998e73c7e7;hb=af96b559e637dd8f5eaa4ee702ea8d2aec63d371;hpb=e7870591434b48c02191cab4ef853dca1b5e4597 diff --git a/src/math_utils.h b/src/math_utils.h index d465c87..f6b3d19 100644 --- a/src/math_utils.h +++ b/src/math_utils.h @@ -27,7 +27,6 @@ SOFTWARE. #include #include -#include static const double PI = 3.14159265358979; @@ -47,20 +46,21 @@ static double avg(T container, double defaultValue = 0) return sum / container.size(); } + template -static dlib::point centroid(Args&... args) +static Point centroid(Args&... args) { std::size_t numArgs = sizeof...(args); - if (numArgs == 0) return dlib::point(0, 0); + if (numArgs == 0) return Point(0, 0); double sumX = 0, sumY = 0; for (auto point : {args...}) { - sumX += point.x(); - sumY += point.y(); + sumX += point.x; + sumY += point.y; } - return dlib::point(sumX / numArgs, sumY / numArgs); + return Point(sumX / numArgs, sumY / numArgs); } static inline double sq(double x) @@ -88,10 +88,10 @@ static inline double degToRad(double deg) return deg * PI / 180; } -double dist(dlib::point& p1, dlib::point& p2) +double dist(Point& p1, Point& p2) { - double xDist = p1.x() - p2.x(); - double yDist = p1.y() - p2.y(); + double xDist = p1.x - p2.x; + double yDist = p1.y - p2.y; return std::hypot(xDist, yDist); }