-rw-r--r-- | delta.jscad | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/delta.jscad b/delta.jscad index dcf6fcc..855d4f9 100644 --- a/delta.jscad +++ b/delta.jscad | |||
@@ -744,24 +744,27 @@ var PARTS = { | |||
744 | return union(base_extrusions(),column_extrusions(),duet()); | 744 | return union(base_extrusions(),column_extrusions(),duet()); |
745 | alltogethernow: function(params) { | 745 | alltogethernow: function(params) { |
746 | var cols = columns(); | 746 | var cols = columns(); |
747 | var sides = base_sides(); | 747 | var sides = base_sides(); |
748 | var feet = THREEWINDS.map(function(w,i) { | 748 | var feet = THREEWINDS.map(function(w,i) { |
749 | var rv = foot(); | 749 | var rv = foot(); |
750 | rv = rv.connectTo(rv.properties.c_column,cols[i].properties.c_bottom,false,0); | 750 | rv = rv.connectTo(rv.properties.c_column,cols[i].properties.c_bottom,false,0); |
751 | return rv; | 751 | return rv; |
752 | }); | 752 | }); |
753 | var rv = union(cols).union(sides.map(union)).union(feet); | 753 | var rv = union(cols).union(sides.map(union)).union(feet); |
754 | rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); | 754 | rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); |
755 | return rv; | 755 | return rv; |
756 | }, | ||
757 | duetholder: function(params) { | ||
758 | return duetholder(); | ||
756 | } | 759 | } |
757 | }; | 760 | }; |
758 | 761 | ||
759 | function main(params) { | 762 | function main(params) { |
760 | var part = params.part && PARTS[params.part]; | 763 | var part = params.part && PARTS[params.part]; |
761 | if(!part) return refaxes(); | 764 | if(!part) return refaxes(); |
762 | var rv = P(part(params)); | 765 | var rv = P(part(params)); |
763 | if(!params.print) rv = rv.union(refaxes()); | 766 | if(!params.print) rv = rv.union(refaxes()); |
764 | return rv; | 767 | return rv; |
765 | } | 768 | } |
766 | 769 | ||
767 | function _main(params) { | 770 | function _main(params) { |
@@ -795,32 +798,34 @@ function _main(params) { | |||
795 | return rv; | 798 | return rv; |
796 | } | 799 | } |
797 | 800 | ||
798 | function getParameterDefinitions() { | 801 | function getParameterDefinitions() { |
799 | return [{ | 802 | return [{ |
800 | name: 'part', | 803 | name: 'part', |
801 | type: 'choice', | 804 | type: 'choice', |
802 | values: [ | 805 | values: [ |
803 | 'platform', | 806 | 'platform', |
804 | 'hinged', | 807 | 'hinged', |
805 | 'clamp', | 808 | 'clamp', |
806 | 'fanholder', | 809 | 'fanholder', |
810 | 'duetholder', | ||
807 | 'alltogethernow', | 811 | 'alltogethernow', |
808 | 'wip' | 812 | 'wip' |
809 | ], | 813 | ], |
810 | captions: [ | 814 | captions: [ |
811 | 'Effector platform', | 815 | 'Effector platform', |
812 | 'Hinged part', | 816 | 'Hinged part', |
813 | 'Clamp', | 817 | 'Clamp', |
814 | 'Fan holder', | 818 | 'Fan holder', |
819 | 'Duet holder', | ||
815 | 'All together now!', | 820 | 'All together now!', |
816 | 'Work in progress' | 821 | 'Work in progress' |
817 | ], | 822 | ], |
818 | caption: 'Part', | 823 | caption: 'Part', |
819 | initial: 'wip' | 824 | initial: 'wip' |
820 | },{ | 825 | },{ |
821 | name: 'print', | 826 | name: 'print', |
822 | type: 'checkbox', | 827 | type: 'checkbox', |
823 | caption: 'For print, no nonsense', | 828 | caption: 'For print, no nonsense', |
824 | initial: false | 829 | initial: false |
825 | }]; | 830 | }]; |
826 | } | 831 | } |