From dd5feb5724b35d6ad568205ce66312e3c35c97f1 Mon Sep 17 00:00:00 2001
From: EvilSpirit <anandamide@mail.ru>
Date: Wed, 3 Feb 2016 19:00:52 +0600
Subject: [PATCH] Refactor Point2d to take advantage of const correctness.

---
 src/dsc.h    | 24 +++++++++++------------
 src/util.cpp | 54 ++++++++++++++++++----------------------------------
 2 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/src/dsc.h b/src/dsc.h
index 5995dcb0..aaf176ce 100644
--- a/src/dsc.h
+++ b/src/dsc.h
@@ -127,18 +127,18 @@ public:
 
     static Point2d From(double x, double y);
 
-    Point2d Plus(Point2d b);
-    Point2d Minus(Point2d b);
-    Point2d ScaledBy(double s);
-    double DivPivoting(Point2d delta);
-    double Dot(Point2d p);
-    double DistanceTo(Point2d p);
-    double DistanceToLine(Point2d p0, Point2d dp, bool segment);
-    double Magnitude(void);
-    double MagSquared(void);
-    Point2d WithMagnitude(double v);
-    Point2d Normal(void);
-    bool Equals(Point2d v, double tol=LENGTH_EPS);
+    Point2d Plus(const Point2d &b) const;
+    Point2d Minus(const Point2d &b) const;
+    Point2d ScaledBy(double s) const;
+    double DivPivoting(Point2d delta) const;
+    double Dot(Point2d p) const;
+    double DistanceTo(const Point2d &p) const;
+    double DistanceToLine(const Point2d &p0, const Point2d &dp, bool segment) const;
+    double Magnitude(void) const;
+    double MagSquared(void) const;
+    Point2d WithMagnitude(double v) const;
+    Point2d Normal(void) const;
+    bool Equals(Point2d v, double tol=LENGTH_EPS) const;
 };
 
 // A simple list
diff --git a/src/util.cpp b/src/util.cpp
index 0ab6f48a..6909f7c0 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -948,33 +948,22 @@ Vector Vector4::PerspectiveProject(void) {
 }
 
 Point2d Point2d::From(double x, double y) {
-    Point2d r;
-    r.x = x; r.y = y;
-    return r;
+    return { x, y };
 }
 
-Point2d Point2d::Plus(Point2d b) {
-    Point2d r;
-    r.x = x + b.x;
-    r.y = y + b.y;
-    return r;
+Point2d Point2d::Plus(const Point2d &b) const {
+    return { x + b.x, y + b.y };
 }
 
-Point2d Point2d::Minus(Point2d b) {
-    Point2d r;
-    r.x = x - b.x;
-    r.y = y - b.y;
-    return r;
+Point2d Point2d::Minus(const Point2d &b) const {
+    return { x - b.x, y - b.y };
 }
 
-Point2d Point2d::ScaledBy(double s) {
-    Point2d r;
-    r.x = x*s;
-    r.y = y*s;
-    return r;
+Point2d Point2d::ScaledBy(double s) const {
+    return { x * s, y * s };
 }
 
-double Point2d::DivPivoting(Point2d delta) {
+double Point2d::DivPivoting(Point2d delta) const {
     if(fabs(delta.x) > fabs(delta.y)) {
         return x/delta.x;
     } else {
@@ -982,36 +971,34 @@ double Point2d::DivPivoting(Point2d delta) {
     }
 }
 
-double Point2d::MagSquared(void) {
+double Point2d::MagSquared(void) const {
     return x*x + y*y;
 }
 
-double Point2d::Magnitude(void) {
+double Point2d::Magnitude(void) const {
     return sqrt(x*x + y*y);
 }
 
-Point2d Point2d::WithMagnitude(double v) {
+Point2d Point2d::WithMagnitude(double v) const {
     double m = Magnitude();
     if(m < 1e-20) {
         dbp("!!! WithMagnitude() of zero vector");
-        Point2d r = { v, 0 };
-        return r;
-    } else {
-        return ScaledBy(v/m);
+        return { v, 0 };
     }
+    return { x * v / m, y * v / m };
 }
 
-double Point2d::DistanceTo(Point2d p) {
+double Point2d::DistanceTo(const Point2d &p) const {
     double dx = x - p.x;
     double dy = y - p.y;
     return sqrt(dx*dx + dy*dy);
 }
 
-double Point2d::Dot(Point2d p) {
+double Point2d::Dot(Point2d p) const {
     return x*p.x + y*p.y;
 }
 
-double Point2d::DistanceToLine(Point2d p0, Point2d dp, bool segment) {
+double Point2d::DistanceToLine(const Point2d &p0, const Point2d &dp, bool segment) const {
     double m = dp.x*dp.x + dp.y*dp.y;
     if(m < LENGTH_EPS*LENGTH_EPS) return VERY_POSITIVE;
 
@@ -1030,14 +1017,11 @@ double Point2d::DistanceToLine(Point2d p0, Point2d dp, bool segment) {
     }
 }
 
-Point2d Point2d::Normal(void) {
-    Point2d ret;
-    ret.x = y;
-    ret.y = -x;
-    return ret;
+Point2d Point2d::Normal(void) const {
+    return { y, -x };
 }
 
-bool Point2d::Equals(Point2d v, double tol) {
+bool Point2d::Equals(Point2d v, double tol) const {
     double dx = v.x - x; if(dx < -tol || dx > tol) return false;
     double dy = v.y - y; if(dy < -tol || dy > tol) return false;