Merge branch 'main' into polygon-shards

This commit is contained in:
Erica Fischer
2023-07-11 10:07:20 -07:00
64 changed files with 330 additions and 310 deletions
+6 -6
View File
@@ -981,8 +981,8 @@ drawvec clip_lines(drawvec &geom, long long minx, long long miny, long long maxx
}
static double square_distance_from_line(long long point_x, long long point_y, long long segA_x, long long segA_y, long long segB_x, long long segB_y) {
double p2x = segB_x - segA_x;
double p2y = segB_y - segA_y;
long long p2x = segB_x - segA_x;
long long p2y = segB_y - segA_y;
double something = p2x * p2x + p2y * p2y;
double u = 0 == something ? 0 : ((point_x - segA_x) * p2x + (point_y - segA_y) * p2y) / something;
@@ -992,11 +992,11 @@ static double square_distance_from_line(long long point_x, long long point_y, lo
u = 0;
}
double x = segA_x + u * p2x;
double y = segA_y + u * p2y;
long long x = std::round(segA_x + u * p2x);
long long y = std::round(segA_y + u * p2y);
double dx = x - point_x;
double dy = y - point_y;
long long dx = x - point_x;
long long dy = y - point_y;
return dx * dx + dy * dy;
}