From 8f4370be7aae76a30732fa119c74368d2aaabb22 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Tue, 3 May 2022 09:56:23 +0800 Subject: [PATCH] refactor: sh_pts for matrix multi --- src/path_extrude.scad | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/path_extrude.scad b/src/path_extrude.scad index 4dffe1c5..a3230af4 100644 --- a/src/path_extrude.scad +++ b/src/path_extrude.scad @@ -16,7 +16,7 @@ use ; use ; module path_extrude(shape_pts, path_pts, triangles = "SOLID", twist = 0, scale = 1.0, closed = false, method = "AXIS_ANGLE") { - sh_pts = len(shape_pts[0]) == 3 ? shape_pts : [for(p = shape_pts) __to3d(p)]; + sh_pts = len(shape_pts[0]) == 3 ? [for(p = shape_pts) [each p, 1]] : [for(p = shape_pts) [p.x, p.y, 0, 1]]; pth_pts = len(path_pts[0]) == 3 ? path_pts : [for(p = path_pts) __to3d(p)]; len_path_pts = len(pth_pts); @@ -84,7 +84,7 @@ module path_extrude(shape_pts, path_pts, triangles = "SOLID", twist = 0, scale = ) [ for(p = sh_pts) - let(transformed = transform_m * [each p, 1]) + let(transformed = transform_m * p) [transformed.x, transformed.y, transformed.z] ]; @@ -100,7 +100,7 @@ module path_extrude(shape_pts, path_pts, triangles = "SOLID", twist = 0, scale = ) [ for(p = init_section(init_a, init_s)) - [ms0p * p, ms1p * p, ms2p * p] + [ms0p * p, ms1p * p, ms2p * p] ]; sections = @@ -150,7 +150,7 @@ module path_extrude(shape_pts, path_pts, triangles = "SOLID", twist = 0, scale = ) [ for(p = sh_pts) - let(transformed = transform_m * [each p, 1]) + let(transformed = transform_m * p) [transformed.x, transformed.y, transformed.z] ];