caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Point2d to take advantage of const correctness.

Browse Source
This commit is contained in:
EvilSpirit 2016-02-03 19:00:52 +06:00 committed by whitequark
parent 29ad1acdfe
commit dd5feb5724
2 changed files with 31 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dsc.h
View File

@ -127,18 +127,18 @@ public:
static Point2d From(double x, double y); static Point2d From(double x, double y);
Point2d Plus(Point2d b); Point2d Plus(const Point2d &b) const;
Point2d Minus(Point2d b); Point2d Minus(const Point2d &b) const;
Point2d ScaledBy(double s); Point2d ScaledBy(double s) const;
double DivPivoting(Point2d delta); double DivPivoting(Point2d delta) const;
double Dot(Point2d p); double Dot(Point2d p) const;
double DistanceTo(Point2d p); double DistanceTo(const Point2d &p) const;
double DistanceToLine(Point2d p0, Point2d dp, bool segment); double DistanceToLine(const Point2d &p0, const Point2d &dp, bool segment) const;
double Magnitude(void); double Magnitude(void) const;
double MagSquared(void); double MagSquared(void) const;
Point2d WithMagnitude(double v); Point2d WithMagnitude(double v) const;
Point2d Normal(void); Point2d Normal(void) const;
bool Equals(Point2d v, double tol=LENGTH_EPS); bool Equals(Point2d v, double tol=LENGTH_EPS) const;
}; };
// A simple list // A simple list

54
src/util.cpp
View File

@ -948,33 +948,22 @@ Vector Vector4::PerspectiveProject(void) {
} }
Point2d Point2d::From(double x, double y) { Point2d Point2d::From(double x, double y) {
Point2d r; return { x, y };
r.x = x; r.y = y;
return r;
} }
Point2d Point2d::Plus(Point2d b) { Point2d Point2d::Plus(const Point2d &b) const {
Point2d r; return { x + b.x, y + b.y };
r.x = x + b.x;
r.y = y + b.y;
return r;
} }
Point2d Point2d::Minus(Point2d b) { Point2d Point2d::Minus(const Point2d &b) const {
Point2d r; return { x - b.x, y - b.y };
r.x = x - b.x;
r.y = y - b.y;
return r;
} }
Point2d Point2d::ScaledBy(double s) { Point2d Point2d::ScaledBy(double s) const {
Point2d r; return { x * s, y * s };
r.x = x*s;
r.y = y*s;
return r;
} }
double Point2d::DivPivoting(Point2d delta) { double Point2d::DivPivoting(Point2d delta) const {
if(fabs(delta.x) > fabs(delta.y)) { if(fabs(delta.x) > fabs(delta.y)) {
return x/delta.x; return x/delta.x;
} else { } else {
@ -982,36 +971,34 @@ double Point2d::DivPivoting(Point2d delta) {
} }
} }
double Point2d::MagSquared(void) { double Point2d::MagSquared(void) const {
return x*x + y*y; return x*x + y*y;
} }
double Point2d::Magnitude(void) { double Point2d::Magnitude(void) const {
return sqrt(x*x + y*y); return sqrt(x*x + y*y);
} }
Point2d Point2d::WithMagnitude(double v) { Point2d Point2d::WithMagnitude(double v) const {
double m = Magnitude(); double m = Magnitude();
if(m < 1e-20) { if(m < 1e-20) {
dbp("!!! WithMagnitude() of zero vector"); dbp("!!! WithMagnitude() of zero vector");
Point2d r = { v, 0 }; return { v, 0 };
return r;
} else {
return ScaledBy(v/m);
} }
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 dx = x - p.x;
double dy = y - p.y; double dy = y - p.y;
return sqrt(dx*dx + dy*dy); return sqrt(dx*dx + dy*dy);
} }
double Point2d::Dot(Point2d p) { double Point2d::Dot(Point2d p) const {
return x*p.x + y*p.y; 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; double m = dp.x*dp.x + dp.y*dp.y;
if(m < LENGTH_EPS*LENGTH_EPS) return VERY_POSITIVE; 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 Point2d::Normal(void) const {
Point2d ret; return { y, -x };
ret.x = y;
ret.y = -x;
return ret;
} }
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 dx = v.x - x; if(dx < -tol || dx > tol) return false;
double dy = v.y - y; if(dy < -tol || dy > tol) return false; double dy = v.y - y; if(dy < -tol || dy > tol) return false;