openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-08-12 01:34:12 +02:00
Code Issues Releases Wiki Activity

fix warning in OpenSCAD 2020

Browse Source
This commit is contained in:
Justin Lin
2020-12-10 09:27:26 +08:00
parent 49fb827e28
commit f93b255c60
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/_impl/_bezier_curve_impl.scad
View File

@@ -18,7 +18,22 @@ function bezier_curve_coordinate(t, pn, n, i = 0) =
(_combi(n, i) * pn[i] * pow(1 - t, n - i) * pow(t, i) +
bezier_curve_coordinate(t, pn, n, i + 1));
function _bezier_curve_point(t, points) =
function _bezier_curve_point2(t, points) =
let(n = len(points) - 1)
[
bezier_curve_coordinate(
t,
[for(p = points) p[0]],
n
),
bezier_curve_coordinate(
t,
[for(p = points) p[1]],
n
)
];
function _bezier_curve_point3(t, points) =
let(n = len(points) - 1)
[
bezier_curve_coordinate(
@@ -39,11 +54,13 @@ function _bezier_curve_point(t, points) =
];
function _bezier_curve_impl(t_step, points) =
let(
t_end = ceil(1 / t_step),
pts = concat([
for(t = 0; t < t_end; t = t + 1)
_bezier_curve_point(t * t_step, points)
], [_bezier_curve_point(1, points)])
)
len(points[0]) == 3 ? pts : [for(pt = pts) __to2d(pt)];
let(t_end = ceil(1 / t_step))
len(points[0]) == 3 ?
concat([
for(t = 0; t < t_end; t = t + 1)
_bezier_curve_point3(t * t_step, points)
], [_bezier_curve_point3(1, points)]) :
concat([
for(t = 0; t < t_end; t = t + 1)
_bezier_curve_point2(t * t_step, points)
], [_bezier_curve_point2(1, points)]);

4
src/_impl/_shape_glued2circles_impl.scad
View File

@@ -18,8 +18,8 @@ function _glued2circles_bezier(radius, centre_dist, tangent_angle, t_step, ctrl_
ctrl_p = ptf_rotate([radius * tan(tangent_angle), -radius], tangent_angle),
ctrl_p2 = [-ctrl_p[0], ctrl_p[1]] + [centre_dist / 2, 0],
ctrl_p3 = [-ctrl_p2[0], ctrl_p2[1]],
ctrl_p4 = [-ctrl_p1[0], ctrl_p1[1]]
)
ctrl_p4 = [-ctrl_p1[0], ctrl_p1[1]]
)
bezier_curve(
t_step,
[