From 8f8e1f717a19dcb7b9adbc15e4336f09c548cb8f Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Sat, 8 Jun 2019 08:37:03 +0800 Subject: [PATCH] refactor --- src/trim_shape.scad | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/trim_shape.scad b/src/trim_shape.scad index f90c8c7e..9f7dc758 100644 --- a/src/trim_shape.scad +++ b/src/trim_shape.scad @@ -1,12 +1,13 @@ +include <__private__/__to3d.scad>; include <__private__/__line_intersection.scad>; -include <__private__/__in_line2d.scad>; +include <__private__/__in_line.scad>; include <__private__/__lines_from.scad>; function _trim_shape_any_intersection_sub(lines, line, lines_leng, i, epsilon) = let( p = __line_intersection(lines[i], line, epsilon) ) - (p != [] && __in_line2d(line, p, epsilon) && __in_line2d(lines[i], p, epsilon)) ? [i, p] : _trim_shape_any_intersection(lines, line, lines_leng, i + 1, epsilon); + (p != [] && __in_line(line, p, epsilon) && __in_line(lines[i], p, epsilon)) ? [i, p] : _trim_shape_any_intersection(lines, line, lines_leng, i + 1, epsilon); // return [idx, [x, y]] or [] function _trim_shape_any_intersection(lines, line, lines_leng, i, epsilon) =