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

Refactor trace_bezier_patches() to calculate vertices only once.

Browse source
This commit is contained in:
Revar Desmera 2020-03-28 15:02:14 -07:00
parent 5e4889652b
commit e06ea582fb
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
beziers.scad
View file

@ -1009,11 +1009,22 @@ module bezier_polyhedron(patches=[], splinesteps=16, vnf=EMPTY_VNF, style="defau
// trace_bezier_patches(patches=[patch1, patch2], splinesteps=8, showcps=true); // trace_bezier_patches(patches=[patch1, patch2], splinesteps=8, showcps=true);
module trace_bezier_patches(patches=[], size, splinesteps=16, showcps=true, showdots=false, showpatch=true, convexity=10, style="default") module trace_bezier_patches(patches=[], size, splinesteps=16, showcps=true, showdots=false, showpatch=true, convexity=10, style="default")
{ {
assert(is_undef(size)||is_num(size));
assert(is_int(splinesteps) && splinesteps>0);
assert(is_list(patches) && all([for (patch=patches) is_patch(patch)]));
assert(is_bool(showcps));
assert(is_bool(showdots));
assert(is_bool(showpatch));
assert(is_int(convexity) && convexity>0);
vnfs = [
for (patch = patches)
bezier_patch(patch, splinesteps=splinesteps, style=style)
];
if (showcps || showdots) { if (showcps || showdots) {
for (patch = patches) { for (patch = patches) {
bounds = pointlist_bounds(flatten(patch)); size = is_num(size)? size :
size = default(size, max(bounds[1]-bounds[0])*0.01); let( bounds = pointlist_bounds(flatten(patch)) )
echo(size=size); max(bounds[1]-bounds[0])*0.01;
if (showcps) { if (showcps) {
move_copies(flatten(patch)) color("red") sphere(d=size*2); move_copies(flatten(patch)) color("red") sphere(d=size*2);
color("cyan") { color("cyan") {
@ -1032,13 +1043,12 @@ module trace_bezier_patches(patches=[], size, splinesteps=16, showcps=true, show
} }
} }
if (showdots){ if (showdots){
vnf = bezier_patch(patch, splinesteps=splinesteps, style=style); color("blue") move_copies(vnfs[i][0]) sphere(d=size);
color("blue") move_copies(vnf[0]) sphere(d=size);
} }
} }
} }
if (showpatch) { if (showpatch) {
bezier_polyhedron(patches=patches, splinesteps=splinesteps, convexity=convexity, style=style); vnf_polyhedron(vnfs, convexity=convexity);
} }
} }

2
version.scad
View file

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