douzeb/gridfinity-rebuilt-openscad-forked
1
0
Fork 0
forked from Charavane/gridfinity-rebuilt-openscad
Code Pull requests Activity

Fixed #31, funnel and tab safety checks

Browse source
This commit is contained in:
K Hodson 2023-02-14 16:20:16 -07:00
parent ea200b3971
commit 5f3f336ae9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gridfinity-spiral-vase.scad
View file

@ -87,6 +87,7 @@ m = min(d_tabw/1.8 + max(0,me), d_tabw/1.25);
d_ramp = f2c*(length*((d_height-2)/7+1)/12-r_f2)+d_wall2; d_ramp = f2c*(length*((d_height-2)/7+1)/12-r_f2)+d_wall2;
d_edge = ((gridx*length-0.5)/n_divx-d_tabw-r_fo1)/2; d_edge = ((gridx*length-0.5)/n_divx-d_tabw-r_fo1)/2;
n_st = d_edge < 2 && style_tab != 0 && style_tab != 6 ? 1 : style_tab == 1 && n_divx <= 1? 0 : style_tab; n_st = d_edge < 2 && style_tab != 0 && style_tab != 6 ? 1 : style_tab == 1 && n_divx <= 1? 0 : style_tab;
n_st = gridz <= 3 ? 6 : d_edge < 2 && style_tab != 0 && style_tab != 6 ? 1 : style_tab == 1 && n_divx <= 1? 0 : style_tab;
n_x = (n_st==0?1:n_divx); n_x = (n_st==0?1:n_divx);
spacing = (gridx*length-0.5)/(n_divx); spacing = (gridx*length-0.5)/(n_divx);
@ -121,7 +122,7 @@ module gridfinityVase() {
cube([gridx*length,d_wall2,d_height-0.2],center=true); cube([gridx*length,d_wall2,d_height-0.2],center=true);
} }
if (enable_funnel) if (enable_funnel && gridz > 3)
pattern_linear((n_st==0?n_divx>1?n_divx:gridx:1), 1, (gridx*length-r_fo1)/(n_st==0?n_divx>1?n_divx:gridx:1)) pattern_linear((n_st==0?n_divx>1?n_divx:gridx:1), 1, (gridx*length-r_fo1)/(n_st==0?n_divx>1?n_divx:gridx:1))
transform_funnel() transform_funnel()
block_funnel_outside(); block_funnel_outside();
@ -135,7 +136,7 @@ module gridfinityVase() {
block_tabsupport(); block_tabsupport();
} }
if (enable_funnel) if (enable_funnel && gridz > 3)
pattern_linear((n_st==0?n_divx>1?n_divx:gridx:1), 1, (gridx*length-r_fo1)/(n_st==0?n_divx>1?n_divx:gridx:1)) pattern_linear((n_st==0?n_divx>1?n_divx:gridx:1), 1, (gridx*length-r_fo1)/(n_st==0?n_divx>1?n_divx:gridx:1))
transform_funnel() transform_funnel()
block_funnel_inside(); block_funnel_inside();
@ -330,7 +331,7 @@ module block_divider_edgecut() {
} }
module transform_funnel() { module transform_funnel() {
if (me > 6 && enable_funnel && n_st != 6) if (me > 6 && enable_funnel && gridz > 3 && n_st != 6)
transform_style() transform_style()
render() render()
children(); children();
@ -476,7 +477,7 @@ module block_tabscoop(a=m, b=0, c=0, d=-1) {
profile_tabscoop(a); profile_tabscoop(a);
translate([-gridx*length/2,-m,-m]) translate([-gridx*length/2,-m,-m])
cube([gridx*length,m-d_tabh*cos(a_tab)+0.005+c,d_height*2]); cube([gridx*length,m-d_tabh*cos(a_tab)+0.005+c,d_height*20]);
if (d >= 0) if (d >= 0)
translate([0,0,-d_tabh*sin(a_tab)+d_height+m/2+d+2.1]) translate([0,0,-d_tabh*sin(a_tab)+d_height+m/2+d+2.1])