summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2016-01-07 20:55:22 (UTC)
committer Michael Krelin <hacker@klever.net>2016-01-07 20:55:22 (UTC)
commit40385e372ced49ce2bc4acc1eff2f058feaa9b57 (patch) (unidiff)
tree28ed9f448429da7fb2b98f4c550d09f51ecced22
parent38331f5dc2cb18d65baf24c5a181de1656c9b8c4 (diff)
downloadredelta-40385e372ced49ce2bc4acc1eff2f058feaa9b57.zip
redelta-40385e372ced49ce2bc4acc1eff2f058feaa9b57.tar.gz
redelta-40385e372ced49ce2bc4acc1eff2f058feaa9b57.tar.bz2
column generation separated
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--delta.jscad14
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
@@ -550,38 +550,44 @@ function base_sides() {
550 var e = E2020.extrusion({l:CONFIG.base.el}); 550 var e = E2020.extrusion({l:CONFIG.base.el});
551 e = e.connectTo(e.properties.c_midway, 551 e = e.connectTo(e.properties.c_midway,
552 new CSG.Connector([0,-CD.base.mid_inscription_r,CONFIG.extrusion.w/2],[1,0,0],[0,0,1]), 552 new CSG.Connector([0,-CD.base.mid_inscription_r,CONFIG.extrusion.w/2],[1,0,0],[0,0,1]),
553 false, 0); 553 false, 0);
554 return ( e.translate([0,0,CONFIG.foot.h+l*(CONFIG.extrusion.w+CONFIG.base.gap)]) 554 return ( e.translate([0,0,CONFIG.foot.h+l*(CONFIG.extrusion.w+CONFIG.base.gap)])
555 .rotateZ(w) 555 .rotateZ(w)
556 .setColor(CONFIG.color.extrusion) ); 556 .setColor(CONFIG.color.extrusion) );
557 }); 557 });
558 }); 558 });
559} 559}
560function base_extrusions() { 560function 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
566function 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}
566function column_extrusions() { 574function 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
574function duet() { 580function 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;
578 var hy = C.hole_spacing.y/2; 584 var hy = C.hole_spacing.y/2;
579 var hh = { nw: [1,-1], ne: [1,1], se: [-1,1], sw: [-1,-1] }; 585 var hh = { nw: [1,-1], ne: [1,1], se: [-1,1], sw: [-1,-1] };
580 var holes = []; 586 var holes = [];
581 for(w in hh) { 587 for(w in hh) {
582 var h = hh[w],_x=h[0]*hx,_y=h[1]*hy; 588 var h = hh[w],_x=h[0]*hx,_y=h[1]*hy;
583 holes.push(CSG.cylinder({start:[_x,_y,-1],end:[_x,_y,C.pcb_size.z+1],radius:3/2})); 589 holes.push(CSG.cylinder({start:[_x,_y,-1],end:[_x,_y,C.pcb_size.z+1],radius:3/2}));
584 pholes['c_'+w] = new CSG.Connector([_x,_y,0],[0,0,1],[1,0,0]); 590 pholes['c_'+w] = new CSG.Connector([_x,_y,0],[0,0,1],[1,0,0]);
585 } 591 }
586 rv = CSG.cube({ 592 rv = CSG.cube({
587 corner1: [-C.pcb_size.x/2, -C.pcb_size.y/2, 0], 593 corner1: [-C.pcb_size.x/2, -C.pcb_size.y/2, 0],