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

Refactor Point2d::DistanceToLine.

pull/10/head
EvilSpirit 2016-05-05 15:03:30 +06:00 committed by whitequark
parent 4c318f09c4
commit def73ec118
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util.cpp
View File

@ -1005,16 +1005,12 @@ double Point2d::DistanceToLine(const Point2d &p0, const Point2d &dp, bool segmen
// Let our line be p = p0 + t*dp, for a scalar t from 0 to 1 // Let our line be p = p0 + t*dp, for a scalar t from 0 to 1
double t = (dp.x*(x - p0.x) + dp.y*(y - p0.y))/m; double t = (dp.x*(x - p0.x) + dp.y*(y - p0.y))/m;
if((t < 0 || t > 1) && segment) { if(segment) {
// The closest point is one of the endpoints; determine which. if(t < 0.0) return DistanceTo(p0);
double d0 = DistanceTo(p0); if(t > 1.0) return DistanceTo(p0.Plus(dp));
double d1 = DistanceTo(p0.Plus(dp));
return min(d1, d0);
} else {
Point2d closest = p0.Plus(dp.ScaledBy(t));
return DistanceTo(closest);
} }
Point2d closest = p0.Plus(dp.ScaledBy(t));
return DistanceTo(closest);
} }
Point2d Point2d::Normal() const { Point2d Point2d::Normal() const {