column generation separated

1 files changed, 10 insertions, 4 deletions

diff --git a/delta.jscad b/delta.jscad
index 7dedfab..2e6365c 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -550,38 +550,44 @@ function base_sides() {
    var e = E2020.extrusion({l:CONFIG.base.el});
    e = e.connectTo(e.properties.c_midway,
     new CSG.Connector([0,-CD.base.mid_inscription_r,CONFIG.extrusion.w/2],[1,0,0],[0,0,1]),
     false, 0);
    return ( e.translate([0,0,CONFIG.foot.h+l*(CONFIG.extrusion.w+CONFIG.base.gap)])
     .rotateZ(w)
     .setColor(CONFIG.color.extrusion) );
   });
  });
 }
 function base_extrusions() {
  var rv = union( base_sides().map(function(x){return union(x)}) );
  rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
  return rv;
 }
 
+function columns() {
+ return THREEWINDS.map(function(w) {
+  return (E2020.extrusion({l:CONFIG.column.h})
+   .translate([0,CD.base.column_r,CONFIG.foot.h])
+   .rotateZ(w).setColor(CONFIG.color.extrusion)
+  );
+ });
+}
 function column_extrusions() {
- var rv = union( THREEWINDS.map(function(w) {
-  return E2020.extrusion({l:CONFIG.column.h}).translate([0,CD.base.column_r,0]).rotateZ(w);
- }) );
+ var rv = union( columns() );
  rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
- return rv.setColor(CONFIG.color.extrusion);
+ return rv;
 }
 
 function duet() {
  var C = CONFIG.duet;
  var pholes = new CSG.Properties();
  var hx = C.hole_spacing.x/2;
  var hy = C.hole_spacing.y/2;
  var hh = { nw: [1,-1], ne: [1,1], se: [-1,1], sw: [-1,-1] };
  var holes = [];
  for(w in hh) {
   var h = hh[w],_x=h[0]*hx,_y=h[1]*hy;
   holes.push(CSG.cylinder({start:[_x,_y,-1],end:[_x,_y,C.pcb_size.z+1],radius:3/2}));
   pholes['c_'+w] = new CSG.Connector([_x,_y,0],[0,0,1],[1,0,0]);
  }
  rv = CSG.cube({
   corner1: [-C.pcb_size.x/2, -C.pcb_size.y/2,            0],