added foot and shoe parts, connected to alltogethernow

1 files changed, 11 insertions, 4 deletions

diff --git a/delta.jscad b/delta.jscad
index 8233e74..5621f0f 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -641,29 +641,29 @@ function foot() {
    end: [0,0,F.h],
    radius: F.nut.d/2+PRINT.slide_tolerance, resolution: 6
   }), CSG.cylinder({ // bolthead/washer hole
    start: [0,0,-1], end: [0,0,F.h-F.nut.h-PRINT.play_tolerance-F.shell],
    radius: F.bolt.hd/2+PRINT.play_tolerance
   })
  ]).union(CSG.cylinder({ // bridging patch
   start: [0,0,F.h-F.nut.h-PRINT.play_tolerance-PRINT.layer_height],
   end: [0,0,F.h-F.nut.h-PRINT.play_tolerance],
   radius: F.nut.d/2
  }));
  rv.properties.c_column = new CSG.Connector([0,0,F.h],[0,0,1],[1,0,0]);
+ rv.properties.c_shoe = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
  rv.properties.P = new CSG.Connector([0,0,F.h],[0,0,-1],[1,0,0]);
  return rv.setColor(CONFIG.color.parts);
 }
-function foot_foot() {
- // TODO: connect in the altogethernow?
+function shoe() {
  var F = CONFIG.foot;
  var rv = CSG.cylinder({
   start: [0,0,0], end: [0,0,F.foot.ho],
   radius: F.bolt.hd/2+F.margin
  }).union(CSG.cylinder({
   start: [0,0,0], end: [0,0,F.foot.ho+F.foot.hi],
   radius: F.bolt.hd/2+PRINT.play_tolerance-PRINT.fit_tolerance
  }));
  rv.properties.c_foot = new CSG.Connector([0,0,F.foot.ho],[0,0,1],[1,0,0]);
  rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
  return rv.setColor(CONFIG.color.softparts);
 }
@@ -743,44 +743,48 @@ var PARTS = {
   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);
-   return rv;
+   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
   ]);
   rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
   return rv;
  },
  duetholder: function(params) {
   return duetholder();
- }
+ },
+ foot: foot,
+ shoe: shoe
 };
 
 function main(params) {
  var part = params.part && PARTS[params.part];
  if(!part) return refaxes();
  var rv = P(part(params));
  if(!params.print) rv = rv.union(refaxes());
  return rv;
 }
 
 function _main(params) {
  var e = EFFECTOR.effector();
@@ -814,33 +818,36 @@ function _main(params) {
 }
 
 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
  }];
 }