Skip to content

Commit ab6f8e3

Browse files
Fix carpet contour
revert short circuit of `ya.c2p(ya.l2c(...))` as `ya.l2p(...)` because it breaks carpet contours
1 parent f430809 commit ab6f8e3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/traces/contour/find_all_paths.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -277,17 +277,17 @@ function getInterpPx(pi, loc, step) {
277277
(dx !== 1 ? (1 - dx) * xa.c2l(pi.x[locx]) : 0) +
278278
(dx !== 0 ? dx * xa.c2l(pi.x[locx + 1]) : 0);
279279

280-
return [xa.l2p(dxl, true),
281-
ya.c2p(pi.y[locy], true),
282-
locx + dx, locy];
280+
return [xa.c2p(xa.l2c(dxl), true),
281+
ya.c2p(pi.y[locy], true),
282+
locx + dx, locy];
283283
} else {
284284
var dy = (pi.level - zxy) / (pi.z[locy + 1][locx] - zxy);
285285
var dyl =
286-
(dy !== 1 ? (1 - dy) * ya.c2l(pi.y[locy]) : 0) +
286+
(dy !== 1 ? (1 - dy) * ya.c2l(pi.y[locy]) : 0) +
287287
(dy !== 0 ? dy * ya.c2l(pi.y[locy + 1]) : 0);
288288

289289
return [xa.c2p(pi.x[locx], true),
290-
ya.l2p(dyl, true),
291-
locx, locy + dy];
290+
ya.c2p(ya.l2c(dyl), true),
291+
locx, locy + dy];
292292
}
293293
}

0 commit comments

Comments
 (0)