author | Michael Krelin <hacker@klever.net> | 2016-01-07 20:55:22 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2016-01-07 20:55:22 (UTC) |
commit | 40385e372ced49ce2bc4acc1eff2f058feaa9b57 (patch) (unidiff) | |
tree | 28ed9f448429da7fb2b98f4c550d09f51ecced22 | |
parent | 38331f5dc2cb18d65baf24c5a181de1656c9b8c4 (diff) | |
download | redelta-40385e372ced49ce2bc4acc1eff2f058feaa9b57.zip redelta-40385e372ced49ce2bc4acc1eff2f058feaa9b57.tar.gz redelta-40385e372ced49ce2bc4acc1eff2f058feaa9b57.tar.bz2 |
column generation separated
-rw-r--r-- | delta.jscad | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/delta.jscad b/delta.jscad index 7dedfab..2e6365c 100644 --- a/delta.jscad +++ b/delta.jscad | |||
@@ -560,18 +560,24 @@ function base_sides() { | |||
560 | function base_extrusions() { | 560 | function base_extrusions() { |
561 | var rv = union( base_sides().map(function(x){return union(x)}) ); | 561 | var rv = union( base_sides().map(function(x){return union(x)}) ); |
562 | rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); | 562 | rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); |
563 | return rv; | 563 | return rv; |
564 | } | 564 | } |
565 | 565 | ||
566 | function columns() { | ||
567 | return THREEWINDS.map(function(w) { | ||
568 | return (E2020.extrusion({l:CONFIG.column.h}) | ||
569 | .translate([0,CD.base.column_r,CONFIG.foot.h]) | ||
570 | .rotateZ(w).setColor(CONFIG.color.extrusion) | ||
571 | ); | ||
572 | }); | ||
573 | } | ||
566 | function column_extrusions() { | 574 | function column_extrusions() { |
567 | var rv = union( THREEWINDS.map(function(w) { | 575 | var rv = union( columns() ); |
568 | return E2020.extrusion({l:CONFIG.column.h}).translate([0,CD.base.column_r,0]).rotateZ(w); | ||
569 | }) ); | ||
570 | rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); | 576 | rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); |
571 | return rv.setColor(CONFIG.color.extrusion); | 577 | return rv; |
572 | } | 578 | } |
573 | 579 | ||
574 | function duet() { | 580 | function duet() { |
575 | var C = CONFIG.duet; | 581 | var C = CONFIG.duet; |
576 | var pholes = new CSG.Properties(); | 582 | var pholes = new CSG.Properties(); |
577 | var hx = C.hole_spacing.x/2; | 583 | var hx = C.hole_spacing.x/2; |