author | Michael Krelin <hacker@klever.net> | 2016-01-08 22:17:13 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2016-01-08 22:17:13 (UTC) |
commit | 717f3676d93e8b2f8d71ea4b25461614becb79ef (patch) (unidiff) | |
tree | 09e0de72b5828715c8c794ef10f513687caf12b4 | |
parent | 34a65279effcec5f51a9853846f6593dadb72246 (diff) | |
download | redelta-717f3676d93e8b2f8d71ea4b25461614becb79ef.zip redelta-717f3676d93e8b2f8d71ea4b25461614becb79ef.tar.gz redelta-717f3676d93e8b2f8d71ea4b25461614becb79ef.tar.bz2 |
wip wip
-rw-r--r-- | delta.jscad | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/delta.jscad b/delta.jscad index 01a5dc7..8233e74 100644 --- a/delta.jscad +++ b/delta.jscad | |||
@@ -731,26 +731,30 @@ function refaxes(o) { | |||
731 | CSG.roundedCylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]), | 731 | CSG.roundedCylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]), |
732 | CSG.roundedCylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]), | 732 | CSG.roundedCylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]), |
733 | CSG.roundedCylinder({start:[0,0,0],end:[0,0,l]}).setColor([0,0,1,g]) | 733 | CSG.roundedCylinder({start:[0,0,0],end:[0,0,l]}).setColor([0,0,1,g]) |
734 | ]); | 734 | ]); |
735 | } | 735 | } |
736 | 736 | ||
737 | function P(x) { | 737 | function P(x) { |
738 | return x.connectTo(x.properties.P,new CSG.Connector([0,0,0],[0,0,1],[1,0,0]), false, 0); | 738 | return x.connectTo(x.properties.P,new CSG.Connector([0,0,0],[0,0,1],[1,0,0]), false, 0); |
739 | } | 739 | } |
740 | 740 | ||
741 | var PARTS = { | 741 | var PARTS = { |
742 | wip: function(params) { | 742 | wip: function(params) { |
743 | return duetholder(params); | ||
744 | return PARTS.alltogethernow(params); | ||
745 | return base_extrusions(); | ||
743 | return foot(); | 746 | return foot(); |
744 | return union(base_extrusions(),column_extrusions(),duet()); | 747 | return union(base_extrusions(),column_extrusions(),duet().translate([0,-20,0])); |
748 | }, | ||
745 | alltogethernow: function(params) { | 749 | alltogethernow: function(params) { |
746 | var cols = columns(); | 750 | var cols = columns(); |
747 | var sides = base_sides(); | 751 | var sides = base_sides(); |
748 | var feet = THREEWINDS.map(function(w,i) { | 752 | var feet = THREEWINDS.map(function(w,i) { |
749 | var rv = foot(); | 753 | var rv = foot(); |
750 | rv = rv.connectTo(rv.properties.c_column,cols[i].properties.c_bottom,false,0); | 754 | rv = rv.connectTo(rv.properties.c_column,cols[i].properties.c_bottom,false,0); |
751 | return rv; | 755 | return rv; |
752 | }); | 756 | }); |
753 | var dh = duetholder(); | 757 | var dh = duetholder(); |
754 | var dhsw = dh.connectTo(dh.properties.c_h, | 758 | var dhsw = dh.connectTo(dh.properties.c_h, |
755 | new CSG.Connector([-CONFIG.duet.hole_spacing.x/2,-CD.base.mid_inscription_r,CONFIG.foot.h],[0,0,1],[1,0,0]), | 759 | new CSG.Connector([-CONFIG.duet.hole_spacing.x/2,-CD.base.mid_inscription_r,CONFIG.foot.h],[0,0,1],[1,0,0]), |
756 | false,0); | 760 | false,0); |