openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-08-15 11:14:17 +02:00
Code Issues Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Justin Lin
2022-04-17 20:35:21 +08:00
parent 7bcf5d8f27
commit c31804a29d
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/along_with.scad
View File

@@ -18,13 +18,15 @@ module along_with(points, angles, twist = 0, scale = 1.0, method = "AXIS_ANGLE")
leng_points_minus_one = leng_points - 1; leng_points_minus_one = leng_points - 1;
twist_step_a = twist / leng_points; twist_step_a = twist / leng_points;
scale_step_vt = is_num(scale) ? scale_one = [1, 1, 1];
let(s = (scale - 1) / leng_points_minus_one) [s, s, s] :
[
(scale.x - 1) / leng_points_minus_one, scale_step_vt = (
(scale.y - 1) / leng_points_minus_one, is_num(scale) ?
is_undef(scale.z) ? 0 : (scale.z - 1) / leng_points_minus_one let(s = scale - 1) [s, s, s] :
]; len(s) == 2 ? [each (scale - [1, 1]), 0]:
scale - scale_one
) / leng_points_minus_one;
/* /*
Sadly, children(n) cannot be used with inner modules Sadly, children(n) cannot be used with inner modules
@@ -76,8 +78,6 @@ module along_with(points, angles, twist = 0, scale = 1.0, method = "AXIS_ANGLE")
) )
[each matrice, curr_matrix * prev_matrix]; [each matrice, curr_matrix * prev_matrix];
scale_one = [1, 1, 1];
// align modules // align modules
module axis_angle_align_with_pts_angles(i) { module axis_angle_align_with_pts_angles(i) {

25
src/path_extrude.scad
View File

@@ -23,19 +23,19 @@ module path_extrude(shape_pts, path_pts, triangles = "SOLID", twist = 0, scale =
len_path_pts_minus_one = len_path_pts - 1; len_path_pts_minus_one = len_path_pts - 1;
m_rot_90_0_n90 = m_rotation([90, 0, -90]); m_rot_90_0_n90 = m_rotation([90, 0, -90]);
one = [1, 1, 1];
module axis_angle_path_extrude() { module axis_angle_path_extrude() {
twist_step_a = twist / len_path_pts; twist_step_a = twist / len_path_pts;
function translate_pts(pts, t) = [for(p = pts) p + t]; function translate_pts(pts, t) = [for(p = pts) p + t];
scale_step_vt = is_num(scale) ? scale_step_vt = (
let(s = (scale - 1) / len_path_pts_minus_one) [s, s, s] : is_num(scale) ?
[ let(s = scale - 1) [s, s, s] :
(scale.x - 1) / len_path_pts_minus_one, len(s) == 2 ? [each (scale - [1, 1]), 0]:
(scale.y - 1) / len_path_pts_minus_one, scale - one
is_undef(scale.z) ? 0 : (scale.z - 1) / len_path_pts_minus_one ) / len_path_pts_minus_one;
];
// get rotation matrice for sections // get rotation matrice for sections
@@ -45,7 +45,7 @@ module path_extrude(shape_pts, path_pts, triangles = "SOLID", twist = 0, scale =
let( let(
vt0 = pth_pts[i] - pth_pts[i - 1], vt0 = pth_pts[i] - pth_pts[i - 1],
vt1 = pth_pts[i + 1] - pth_pts[i], vt1 = pth_pts[i + 1] - pth_pts[i],
a = acos((vt0 * vt1) / (norm(vt0) * norm(vt1))), a = acos((vt0 * vt1) / sqrt(vt0 * vt0 * vt1 * vt1)),
v = cross(vt0, vt1) v = cross(vt0, vt1)
) )
[a, v] [a, v]
@@ -124,13 +124,12 @@ module path_extrude(shape_pts, path_pts, triangles = "SOLID", twist = 0, scale =
sections = sections =
let( let(
fst_section = fst_section = translate_pts(local_rotate_section(0, 0, one), pth_pts[0]),
translate_pts(local_rotate_section(0, 0, [1, 1, 1]), pth_pts[0]),
end_i = len_path_pts - 1, end_i = len_path_pts - 1,
remain_sections = [ remain_sections = [
for(i = 0; i < end_i; i = i + 1) for(i = 0; i < end_i; i = i + 1)
translate_pts( translate_pts(
local_rotate_section(i, i * twist_step_a, [1, 1, 1] + scale_step_vt * (i + 1)), local_rotate_section(i, i * twist_step_a, one + scale_step_vt * (i + 1)),
pth_pts[i + 1] pth_pts[i + 1]
) )
] ]
@@ -151,9 +150,7 @@ module path_extrude(shape_pts, path_pts, triangles = "SOLID", twist = 0, scale =
} }
module euler_angle_path_extrude() { module euler_angle_path_extrude() {
scale_step_vt = is_num(scale) ? scale_step_vt = ((is_num(scale) ? [scale, scale] : scale) - [1, 1]) / len_path_pts_minus_one;
[(scale - 1) / len_path_pts_minus_one, (scale - 1) / len_path_pts_minus_one] :
[(scale.x - 1) / len_path_pts_minus_one, (scale.y - 1) / len_path_pts_minus_one];
twist_step = twist / len_path_pts_minus_one; twist_step = twist / len_path_pts_minus_one;