move parameters around

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
@@ -412,119 +412,96 @@ var EFFECTOR = {
    )).rotateY(90).translate([-fh.w/2,0,0])
   ).subtract( CSG.cylinder({
    start: [-fh.w,-fh.r,-od/2],
    end: [fh.w,-fh.r,-od/2],
    radius: fh.screw.d/2
   })).subtract( CSG.cylinder({
    start: [0,-this.rmount,1],
    end: [0,-this.rmount,-fh.w-1],
    radius: fh.screw.d/2
   })).setColor([0.3,0.8,0.3,0.9]).rotateZ(-120);
  }
 };
 
 function columns() {
  var rv = [0,1,2].map(function(x) {
   return union(vector_char(0,0,String.fromCharCode('A'.charCodeAt(0)+x)).segments.map(function(x) {
    return rectangular_extrude(x,{w:2,h:1});
   })).center().rotateX(90).translate([0,50,0]).rotateZ(x*120+120);
  });
  return union(rv);
 }
 
 function microswitch() {
  var screw_connector = new CSG.Properties();
  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],
      [  ix, iy ],
      [ -ix, iy ],
      [ -e.T.width/2,e.outer/2-e.thickness-e.T.thickness],
      [ -e.T.width/2,e.outer/2-e.thickness],
      [ -e.slot_width/2,e.outer/2-e.thickness],
      [ -e.slot_width/2,e.outer/2+1],
     ]).rotateZ(w);
    })
   ).subtract(CAG.circle({
    center: [0,0], radius: e.centerhole/2
   })).extrude({offset:[0,0,l]});
   rv.properties.c_top=rv.properties.c_left
    = new CSG.Connector([0,0,l],[0,0,-1],[1,0,0]);
   rv.properties.c_bottom=rv.properties.c_right
    = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
   rv.properties.c_midway = new CSG.Connector([0,0,l/2],[0,0,1],[1,0,0]);
   rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
   rv.properties.vitamin = true;
   return rv;
  },
 
  cap: function extrusion_cap(o) {
   if(!o) o = {};
   var e = o.extrusion || this;
@@ -575,50 +552,75 @@ function base_extrusions() {
 function refaxes(o) {
  if(!o) o = {};
  var l = o.l||20, g = o.g||0.7;
  return union([
   CSG.cylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]),
   CSG.cylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]),
   CSG.cylinder({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 main(params) {
  return refaxes().union(P(base_extrusions()));
 }
 
 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;
 }
-/* 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: */