-rw-r--r-- | delta.jscad | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/delta.jscad b/delta.jscad index 855d4f9..01a5dc7 100644 --- a/delta.jscad +++ b/delta.jscad @@ -741,25 +741,36 @@ function P(x) { var PARTS = { wip: function(params) { return foot(); return union(base_extrusions(),column_extrusions(),duet()); alltogethernow: function(params) { var cols = columns(); var sides = base_sides(); var feet = THREEWINDS.map(function(w,i) { var rv = foot(); rv = rv.connectTo(rv.properties.c_column,cols[i].properties.c_bottom,false,0); return rv; }); - var rv = union(cols).union(sides.map(union)).union(feet); + var dh = duetholder(); + var dhsw = dh.connectTo(dh.properties.c_h, + new CSG.Connector([-CONFIG.duet.hole_spacing.x/2,-CD.base.mid_inscription_r,CONFIG.foot.h],[0,0,1],[1,0,0]), + false,0); + var d = duet(); + d = d.connectTo(d.properties.holes.c_sw,dhsw.properties.duet.c_sw,false,0); + var dhse = dh.connectTo(dh.properties.duet.c_se,d.properties.holes.c_se,false,0); + var dhne = dh.connectTo(dh.properties.duet.c_ne,d.properties.holes.c_ne,false,0); + var dhnw = dh.connectTo(dh.properties.duet.c_nw,d.properties.holes.c_nw,false,0); + var rv = union(cols).union(sides.map(union)).union(feet).union([ + d,dhsw,dhse,dhne,dhnw + ]); rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); return rv; }, duetholder: function(params) { return duetholder(); } }; function main(params) { var part = params.part && PARTS[params.part]; if(!part) return refaxes(); var rv = P(part(params)); |