author | Michael Krelin <hacker@klever.net> | 2016-01-06 23:45:43 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2016-01-06 23:45:43 (UTC) |
commit | 70e08848566d909a76fa3f611d35570c57f8e048 (patch) (side-by-side diff) | |
tree | 721d2ab3c42a5bf515286963b316ad7cdcd13048 /delta.jscad | |
parent | f669f3d2881597cc0d86e4b55332b541883c8205 (diff) | |
download | redelta-70e08848566d909a76fa3f611d35570c57f8e048.zip redelta-70e08848566d909a76fa3f611d35570c57f8e048.tar.gz redelta-70e08848566d909a76fa3f611d35570c57f8e048.tar.bz2 |
move parameters around
-rw-r--r-- | delta.jscad | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/delta.jscad b/delta.jscad index ef0d4ec..9941125 100644 --- a/delta.jscad +++ b/delta.jscad @@ -436,71 +436,48 @@ function microswitch() { var rv = CSG.cube({ center:[0,0,2.5],radius: [19.8/2,6/2,10/2] }).union( CSG.cube({ center: [2.5,0.5,6], radius: [2/2,3.5/2,5/2] }) ).union( [-8,-1,8].map(function(x) { return CSG.cube({ center:[x,0,0], radius: [0.6/2,3.2/2,13/2] }) }) ).subtract( [-9.5/2,9.5/2].map(function(x,i) { screw_connector[i] = new CSG.Connector([x,6/2,0],[0,-1,0],[0,0,1]); return CSG.cylinder({ start: [x,-4,0], end: [x,4,0], radius: 2/2 }) }) ); rv.properties.switch_connector = new CSG.Connector([2.5,0.5,6+5/2],[0,0,1],[0,-1,0]); rv.properties.screw_connector = screw_connector; rv.properties.microswitch = new CSG.Properties(); rv.properties.microswitch.size = new CSG.Vector3D( 19.8,6,10 ); return rv; } -function getParameterDefinitions() { - return [{ - name: 'part', - type: 'choice', - values: [ - 'platform', - 'hinged', - 'clamp', - 'fanholder', - 'alltogethernow' - ], - captions: [ - 'Effector platform', - 'Hinged part', - 'Clamp', - 'Fan holder', - 'All together now!' - ], - caption: 'Part', - initial: 'alltogethernow' - }]; -} - var FOURWINDS = [0,90,180,270]; var E2020 = { outer: 20, thickness: 1.8, roundius: 1, centerhole: 5, slot_width: 6, T: { width: 10, thickness: 1.5, depth: 6.5 }, extrusion: function(o) { if(!o) o = {}; var e = o.extrusion || this; var l = o.l||5; var iy = e.outer/2-e.T.depth; var ix = e.T.width/2-(e.outer/2-iy-e.thickness-e.T.thickness); var rv = CAG.roundedRectangle({ corner1: [-e.outer/2,-e.outer/2], corner2: [e.outer/2,e.outer/2], roundradius: e.roundius }).subtract( FOURWINDS.map(function(w) { return CAG.fromPoints([ [ e.slot_width/2,e.outer/2+1], [ e.slot_width/2,e.outer/2-e.thickness], [ e.T.width/2,e.outer/2-e.thickness], [ e.T.width/2,e.outer/2-e.thickness-e.T.thickness], @@ -599,26 +576,51 @@ function _main(params) { 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; } -/* vim:set ft=javascript ai: */ +function getParameterDefinitions() { + return [{ + name: 'part', + type: 'choice', + values: [ + 'platform', + 'hinged', + 'clamp', + 'fanholder', + 'alltogethernow', + 'wip' + ], + captions: [ + 'Effector platform', + 'Hinged part', + 'Clamp', + 'Fan holder', + 'All together now!', + 'Work in progress' + ], + caption: 'Part', + initial: 'wip' + }]; +} + +/* vim:set ft=javascript ai: */ |