author | Michael Krelin <hacker@klever.net> | 2016-01-13 10:13:41 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2016-01-13 10:13:41 (UTC) |
commit | 34af0c1f06a2bec183afdc412d4a05c1d0c8906f (patch) (side-by-side diff) | |
tree | b21814323d66619ec131546ac95ecf81a33876d2 /delta.jscad | |
parent | f8b3bc2a1792a7ee8eeacf7dd1d9f5b3cc96a7a6 (diff) | |
download | redelta-34af0c1f06a2bec183afdc412d4a05c1d0c8906f.zip redelta-34af0c1f06a2bec183afdc412d4a05c1d0c8906f.tar.gz redelta-34af0c1f06a2bec183afdc412d4a05c1d0c8906f.tar.bz2 |
moving things around
-rw-r--r-- | delta.jscad | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/delta.jscad b/delta.jscad index 7384ecf..156e704 100644 --- a/delta.jscad +++ b/delta.jscad @@ -735,78 +735,64 @@ function heatbed() { var screw = CSG.cylinder({ start: [0,-CONFIG.heatbed.sr,-1], end: [0,-CONFIG.heatbed.sr,CONFIG.heatbed.h+1], radius: 3/2 }); var screws = []; for(var a=0;a<360;a+=60) screws.push(screw.rotateZ(a)); // TODO: connectors rv = rv.subtract(screws); rv.properties.c_glass = new CSG.Connector([0,0,CONFIG.heatbed.h],[0,0,1],[1,0,0]); rv.properties.P = new CSG.Connector( [0,0,-CONFIG.foot.h-CONFIG.extrusion.w*2-CONFIG.base.gap-CONFIG.bedholder.h], [0,0,1],[1,0,0]); rv.properties.vitamin = true; return rv.setColor(CONFIG.color.heatbed); } function glass() { var rv = CSG.cylinder({ start: [0,0,0], end: [0,0,CONFIG.glass.h], radius: CONFIG.glass.r, resolution: 72 }); rv.properties.c_bed = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); rv.properties.P = new CSG.Connector([0,0,-CONFIG.foot.h-CONFIG.heatbed.h],[0,0,1],[1,0,0]); rv.properties.vitamin = true; return rv.setColor(CONFIG.color.glass); } function platform() { var b = heatbed(); var g = glass(); g = g.connectTo(g.properties.c_bed,b.properties.c_glass,false,0); return b.union(g); } -function refaxes(o) { - if(!o) o = {}; - var l = o.l||20, g = o.g||0.7; - return union([ - CSG.roundedCylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]), - CSG.roundedCylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]), - CSG.roundedCylinder({start:[0,0,0],end:[0,0,l]}).setColor([0,0,1,g]) - ]); -} - -function P(x) { - return x.connectTo(x.properties.P,new CSG.Connector([0,0,0],[0,0,1],[1,0,0]), false, 0); -} - var PARTS = { wip: function(params) { return duetholder(params); return PARTS.alltogethernow(params); return base_extrusions(); return foot(); return union(base_extrusions(),column_extrusions(),duet().translate([0,-20,0])); }, 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); var s = shoe(); s = s.connectTo(s.properties.c_foot,rv.properties.c_shoe,false,0); return rv.union(s); }); 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 ]); var p = P(platform()); rv = rv.union(p); @@ -830,64 +816,79 @@ function main(params) { function _main(params) { var e = EFFECTOR.effector(); var hs = E3DV6.heatsink(); hs = hs.connectTo(hs.properties.grove_connector,e.properties.grove_connector,false,0); var ms = microswitch(); var hd = EFFECTOR.hinged({ microswitch:ms,effector:e }); ms = ms.connectTo( ms.properties.screw_connector[0], hd.properties.microswitch_screw_connector[0], false, 0); var hdhd = EFFECTOR.split_hinged(hd); var fh = EFFECTOR.fanholder(); return union({ platform: e, hinged: hdhd[1], clamp: hdhd[0], fanholder: fh, alltogethernow: [e,hdhd[0],hdhd[1], columns(),hs,ms,fh] }[params.part||'alltogethernow']) var rv = union( e, hs, columns(), ///hd, hdhd[0], hdhd[1], ms); return rv; } +function refaxes(o) { + if(!o) o = {}; + var l = o.l||20, g = o.g||0.7; + return union([ + CSG.roundedCylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]), + CSG.roundedCylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]), + CSG.roundedCylinder({start:[0,0,0],end:[0,0,l]}).setColor([0,0,1,g]) + ]); +} + +function P(x) { + return x.connectTo(x.properties.P,new CSG.Connector([0,0,0],[0,0,1],[1,0,0]), false, 0); +} + + function getParameterDefinitions() { return [{ name: 'part', type: 'choice', values: [ 'platform', 'hinged', 'clamp', 'fanholder', 'duetholder', 'foot', 'shoe', 'alltogethernow', 'wip' ], captions: [ 'Effector platform', 'Hinged part', 'Clamp', 'Fan holder', 'Duet holder', 'Foot', 'Shoe', 'All together now!', 'Work in progress' ], caption: 'Part', initial: 'wip' },{ name: 'print', type: 'checkbox', caption: 'For print, no nonsense', initial: false |