UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[curve_view] Filter unwanted vertical asymptotes

Browse Source 
Change-Id: Ia603a2fb1553b6dfc038d2a28472ce48e41936db
This commit is contained in:
Gabriel Ozouf
2020-10-20 17:13:51 +02:00
committed by LeaNumworks
parent 106916e7bf
commit fe8e490ac0
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/shared/curve_view.cpp
View File

@@ -708,7 +708,14 @@ void CurveView::joinDots(KDContext * ctx, KDRect rect, EvaluateXYForParameter xy
|| (!isLeftDotValid && maxNumberOfRecursion == 0) // Last step of the recursion with an undefined left dot: we stamp the last right dot
|| (isLeftDotValid && deltaX*deltaX + deltaY*deltaY < circleDiameter * circleDiameter / 4.0f)) { // the dots are already close enough
// the dots are already joined
stampAtLocation(ctx, rect, puf, pvf, color, thick);
/* We need to be sure that the point is not an artifact caused by error
* in float approximation. The value of pixelTolerance matters little,
* as wrong points will be off by a large margin. */
constexpr float pixelTolerance = 1.f;
float pvD = xyEvaluationDouble ? floatToPixel(Axis::Vertical, static_cast<float>(xyEvaluationDouble(u, model, context).x2())) : pvf;
if (std::fabs(pvf - pvD) < pixelTolerance) {
stampAtLocation(ctx, rect, puf, pvf, color, thick);
}
return;
}
}
@@ -721,8 +728,24 @@ void CurveView::joinDots(KDContext * ctx, KDRect rect, EvaluateXYForParameter xy
((x <= cx && cx <= u) || (u <= cx && cx <= x)) && ((y <= cy && cy <= v) || (v <= cy && cy <= y))) {
/* As the middle dot is between the two dots, we assume that we
* can draw a 'straight' line between the two */
straightJoinDots(ctx, rect, pxf, pyf, puf, pvf, color, thick);
return;
constexpr float dangerousSlope = 1e6f;
if (xyEvaluationDouble && std::fabs((v-y) / (u-x)) > dangerousSlope) {
/* We need to make sure we're not drawing a vertical asymptote because of
* rounding errors. */
Coordinate2D<double> xyD = xyEvaluationDouble(static_cast<double>(t), model, context);
Coordinate2D<double> uvD = xyEvaluationDouble(static_cast<double>(s), model, context);
Coordinate2D<double> cxyD = xyEvaluationDouble(static_cast<double>(ct), model, context);
if (((xyD.x1() <= cxyD.x1() && cxyD.x1() <= uvD.x1()) || (uvD.x1() <= cxyD.x1() && cxyD.x1() <= xyD.x1()))
&& ((xyD.x2() <= cxyD.x2() && cxyD.x2() <= uvD.x2()) || (uvD.x2() <= cxyD.x2() && cxyD.x2() <= xyD.x2())))
{
straightJoinDots(ctx, rect, floatToPixel(Axis::Horizontal, xyD.x1()), floatToPixel(Axis::Vertical, xyD.x2()), floatToPixel(Axis::Horizontal, uvD.x1()), floatToPixel(Axis::Vertical, uvD.x2()), color, thick);
return;
}
} else {
straightJoinDots(ctx, rect, pxf, pyf, puf, pvf, color, thick);
return;
}
}
if (maxNumberOfRecursion > 0) {
joinDots(ctx, rect, xyEvaluation, model, context, drawStraightLinesEarly, t, x, y, ct, cx, cy, color, thick, maxNumberOfRecursion-1, xyEvaluationDouble);