-rw-r--r-- | delta.jscad | 15 |
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 | |||
@@ -650,11 +650,11 @@ function foot() { | |||
650 | radius: F.nut.d/2 | 650 | radius: F.nut.d/2 |
651 | })); | 651 | })); |
652 | rv.properties.c_column = new CSG.Connector([0,0,F.h],[0,0,1],[1,0,0]); | 652 | rv.properties.c_column = new CSG.Connector([0,0,F.h],[0,0,1],[1,0,0]); |
653 | rv.properties.c_shoe = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); | ||
653 | rv.properties.P = new CSG.Connector([0,0,F.h],[0,0,-1],[1,0,0]); | 654 | rv.properties.P = new CSG.Connector([0,0,F.h],[0,0,-1],[1,0,0]); |
654 | return rv.setColor(CONFIG.color.parts); | 655 | return rv.setColor(CONFIG.color.parts); |
655 | } | 656 | } |
656 | function foot_foot() { | 657 | function shoe() { |
657 | // TODO: connect in the altogethernow? | ||
658 | var F = CONFIG.foot; | 658 | var F = CONFIG.foot; |
659 | var rv = CSG.cylinder({ | 659 | var rv = CSG.cylinder({ |
660 | start: [0,0,0], end: [0,0,F.foot.ho], | 660 | start: [0,0,0], end: [0,0,F.foot.ho], |
@@ -752,7 +752,9 @@ var PARTS = { | |||
752 | var feet = THREEWINDS.map(function(w,i) { | 752 | var feet = THREEWINDS.map(function(w,i) { |
753 | var rv = foot(); | 753 | var rv = foot(); |
754 | 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); |
755 | return rv; | 755 | var s = shoe(); |
756 | s = s.connectTo(s.properties.c_foot,rv.properties.c_shoe,false,0); | ||
757 | return rv.union(s); | ||
756 | }); | 758 | }); |
757 | var dh = duetholder(); | 759 | var dh = duetholder(); |
758 | var dhsw = dh.connectTo(dh.properties.c_h, | 760 | var dhsw = dh.connectTo(dh.properties.c_h, |
@@ -771,7 +773,9 @@ var PARTS = { | |||
771 | }, | 773 | }, |
772 | duetholder: function(params) { | 774 | duetholder: function(params) { |
773 | return duetholder(); | 775 | return duetholder(); |
774 | } | 776 | }, |
777 | foot: foot, | ||
778 | shoe: shoe | ||
775 | }; | 779 | }; |
776 | 780 | ||
777 | function main(params) { | 781 | function main(params) { |
@@ -823,6 +827,7 @@ function getParameterDefinitions() { | |||
823 | 'clamp', | 827 | 'clamp', |
824 | 'fanholder', | 828 | 'fanholder', |
825 | 'duetholder', | 829 | 'duetholder', |
830 | 'foot', 'shoe', | ||
826 | 'alltogethernow', | 831 | 'alltogethernow', |
827 | 'wip' | 832 | 'wip' |
828 | ], | 833 | ], |
@@ -832,6 +837,8 @@ function getParameterDefinitions() { | |||
832 | 'Clamp', | 837 | 'Clamp', |
833 | 'Fan holder', | 838 | 'Fan holder', |
834 | 'Duet holder', | 839 | 'Duet holder', |
840 | 'Foot', | ||
841 | 'Shoe', | ||
835 | 'All together now!', | 842 | 'All together now!', |
836 | 'Work in progress' | 843 | 'Work in progress' |
837 | ], | 844 | ], |