author | Michael Krelin <hacker@klever.net> | 2016-01-08 22:12:00 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2016-01-08 22:12:00 (UTC) |
commit | cc491344eef63b1a0d826de3864a33ff989e94cf (patch) (side-by-side diff) | |
tree | 22a18380308c24dc274c17d20558bc350c424840 | |
parent | 59a7256a88fecb14ee79f47d49abdc34df665b81 (diff) | |
download | redelta-cc491344eef63b1a0d826de3864a33ff989e94cf.zip redelta-cc491344eef63b1a0d826de3864a33ff989e94cf.tar.gz redelta-cc491344eef63b1a0d826de3864a33ff989e94cf.tar.bz2 |
fix duet winds
-rw-r--r-- | delta.jscad | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/delta.jscad b/delta.jscad index a1be156..5c63b41 100644 --- a/delta.jscad +++ b/delta.jscad @@ -570,65 +570,65 @@ function base_sides() { false, 0); return ( e.translate([0,0,CONFIG.foot.h+l*(CONFIG.extrusion.w+CONFIG.base.gap)]) .rotateZ(w) .setColor(CONFIG.color.extrusion) ); }); }); } function base_extrusions() { var rv = union( base_sides().map(function(x){return union(x)}) ); rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); return rv; } function columns() { return THREEWINDS.map(function(w) { return (E2020.extrusion({l:CONFIG.column.h}) .translate([0,CD.base.column_r,CONFIG.foot.h]) .rotateZ(w).setColor(CONFIG.color.extrusion) ); }); } function column_extrusions() { var rv = union( columns() ); rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); return rv; } function duet() { var C = CONFIG.duet; var pholes = new CSG.Properties(); var hx = C.hole_spacing.x/2; var hy = C.hole_spacing.y/2; - var hh = { nw: [1,-1], ne: [1,1], se: [-1,1], sw: [-1,-1] }; + var hh = { nw: [-1,1], ne: [1,1], se: [1,-1], sw: [-1,-1] }; var holes = []; for(w in hh) { var h = hh[w],_x=h[0]*hx,_y=h[1]*hy; holes.push(CSG.cylinder({start:[_x,_y,-1],end:[_x,_y,C.pcb_size.z+1],radius:3/2})); pholes['c_'+w] = new CSG.Connector([_x,_y,0],[0,0,1],[1,0,0]); } rv = CSG.cube({ corner1: [-C.pcb_size.x/2, -C.pcb_size.y/2, 0], corner2: [ C.pcb_size.x/2, C.pcb_size.y/2, C.pcb_size.z] }).subtract(holes).setColor(CONFIG.color.pcb).union( CSG.cube({ corner1: [-C.pcb_size.x/2,-C.hole_spacing.y/2+3,C.pcb_size.z], corner2: [ C.pcb_size.x/2, C.hole_spacing.y/2-3,C.h] }).setColor(CONFIG.color.bulk) ); rv.properties.holes = pholes; rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); rv.properties.vitamin = true; return rv; } function foot() { var F = CONFIG.foot; var br = F.bolt.hd/2+F.margin; var bh = F.zscalefactor*Math.sqrt(Math.pow(F.d/2,2)-Math.pow(br,2)); var th = F.h-bh; var r = 2*F.d; var rv = CSG.sphere({ // botom contorted sphere center: [0,0,0], radius: F.d/2, resolution: r }).scale([1,1,F.zscalefactor]).translate([0,0,bh]).union(CSG.cylinder({ // top hat start: [0,0,bh], end: [0,0,F.h], radius: F.d/2, resolution: r })).intersect(CSG.cylinder({ // cut off excess |