moving things around

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
@@ -743,62 +743,48 @@ function heatbed() {
  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);
@@ -838,48 +824,63 @@ function _main(params) {
  });
  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'