grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-04 03:09:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix for stroke() with scalar width.

Browse source
This commit is contained in:
Revar Desmera 2020-01-29 01:31:05 -08:00
parent e8aa0a068a
commit 555f1a9ab3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shapes2d.scad
View file

@ -97,10 +97,13 @@ module stroke(
[] []
) * linewidth; ) * linewidth;
assert(is_path(path));
assert(is_bool(closed)); assert(is_bool(closed));
assert(is_path(path));
path = closed? concat(path,[path[0]]) : path;
assert(is_list(path) && is_vector(path[0]) && len(path[0])==2, "path must be a 2D list of points.");
assert(is_num(width) || (is_vector(width) && len(width)==len(path))); assert(is_num(width) || (is_vector(width) && len(width)==len(path)));
width = is_list(width)? width : [for (x=path) width]; width = is_num(width)? [for (x=path) width] : width;
endcap1 = first_defined([endcap1, endcaps, "round"]); endcap1 = first_defined([endcap1, endcaps, "round"]);
endcap2 = first_defined([endcap2, endcaps, "round"]); endcap2 = first_defined([endcap2, endcaps, "round"]);
@ -125,9 +128,6 @@ module stroke(
endcap_shape1 = _endcap_shape(endcap1, select(width,0), endcap_width1, endcap_length1, endcap_extent1); endcap_shape1 = _endcap_shape(endcap1, select(width,0), endcap_width1, endcap_length1, endcap_extent1);
endcap_shape2 = _endcap_shape(endcap2, select(width,-1), endcap_width2, endcap_length2, endcap_extent2); endcap_shape2 = _endcap_shape(endcap2, select(width,-1), endcap_width2, endcap_length2, endcap_extent2);
path = closed? concat(path,[path[0]]) : path;
assert(is_list(path) && is_vector(path[0]) && len(path[0])==2, "path must be a 2D list of points.");
segments = pair(path); segments = pair(path);
trim1 = select(width,0) * first_defined([ trim1 = select(width,0) * first_defined([

2
version.scad
View file

@ -8,7 +8,7 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
BOSL_VERSION = [2,0,100]; BOSL_VERSION = [2,0,101];
// Section: BOSL Library Version Functions // Section: BOSL Library Version Functions