summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2016-01-12 21:17:08 (UTC)
committer Michael Krelin <hacker@klever.net>2016-01-12 21:17:08 (UTC)
commit64a6bb173fd448fd0b8557f3ae79625380127a7e (patch) (unidiff)
tree1ed100596d79aa95899df14e3889970996629664
parent717f3676d93e8b2f8d71ea4b25461614becb79ef (diff)
downloadredelta-64a6bb173fd448fd0b8557f3ae79625380127a7e.zip
redelta-64a6bb173fd448fd0b8557f3ae79625380127a7e.tar.gz
redelta-64a6bb173fd448fd0b8557f3ae79625380127a7e.tar.bz2
added foot and shoe parts, connected to alltogethernow
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--delta.jscad15
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() {
641 end: [0,0,F.h], 641 end: [0,0,F.h],
642 radius: F.nut.d/2+PRINT.slide_tolerance, resolution: 6 642 radius: F.nut.d/2+PRINT.slide_tolerance, resolution: 6
643 }), CSG.cylinder({ // bolthead/washer hole 643 }), CSG.cylinder({ // bolthead/washer hole
644 start: [0,0,-1], end: [0,0,F.h-F.nut.h-PRINT.play_tolerance-F.shell], 644 start: [0,0,-1], end: [0,0,F.h-F.nut.h-PRINT.play_tolerance-F.shell],
645 radius: F.bolt.hd/2+PRINT.play_tolerance 645 radius: F.bolt.hd/2+PRINT.play_tolerance
646 }) 646 })
647 ]).union(CSG.cylinder({ // bridging patch 647 ]).union(CSG.cylinder({ // bridging patch
648 start: [0,0,F.h-F.nut.h-PRINT.play_tolerance-PRINT.layer_height], 648 start: [0,0,F.h-F.nut.h-PRINT.play_tolerance-PRINT.layer_height],
649 end: [0,0,F.h-F.nut.h-PRINT.play_tolerance], 649 end: [0,0,F.h-F.nut.h-PRINT.play_tolerance],
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}
656function foot_foot() { 657function 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],
661 radius: F.bolt.hd/2+F.margin 661 radius: F.bolt.hd/2+F.margin
662 }).union(CSG.cylinder({ 662 }).union(CSG.cylinder({
663 start: [0,0,0], end: [0,0,F.foot.ho+F.foot.hi], 663 start: [0,0,0], end: [0,0,F.foot.ho+F.foot.hi],
664 radius: F.bolt.hd/2+PRINT.play_tolerance-PRINT.fit_tolerance 664 radius: F.bolt.hd/2+PRINT.play_tolerance-PRINT.fit_tolerance
665 })); 665 }));
666 rv.properties.c_foot = new CSG.Connector([0,0,F.foot.ho],[0,0,1],[1,0,0]); 666 rv.properties.c_foot = new CSG.Connector([0,0,F.foot.ho],[0,0,1],[1,0,0]);
667 rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); 667 rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
668 return rv.setColor(CONFIG.color.softparts); 668 return rv.setColor(CONFIG.color.softparts);
669} 669}
@@ -743,44 +743,48 @@ var PARTS = {
743 return duetholder(params); 743 return duetholder(params);
744 return PARTS.alltogethernow(params); 744 return PARTS.alltogethernow(params);
745 return base_extrusions(); 745 return base_extrusions();
746 return foot(); 746 return foot();
747 return union(base_extrusions(),column_extrusions(),duet().translate([0,-20,0])); 747 return union(base_extrusions(),column_extrusions(),duet().translate([0,-20,0]));
748 }, 748 },
749 alltogethernow: function(params) { 749 alltogethernow: function(params) {
750 var cols = columns(); 750 var cols = columns();
751 var sides = base_sides(); 751 var sides = base_sides();
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,
759 new CSG.Connector([-CONFIG.duet.hole_spacing.x/2,-CD.base.mid_inscription_r,CONFIG.foot.h],[0,0,1],[1,0,0]), 761 new CSG.Connector([-CONFIG.duet.hole_spacing.x/2,-CD.base.mid_inscription_r,CONFIG.foot.h],[0,0,1],[1,0,0]),
760 false,0); 762 false,0);
761 var d = duet(); 763 var d = duet();
762 d = d.connectTo(d.properties.holes.c_sw,dhsw.properties.duet.c_sw,false,0); 764 d = d.connectTo(d.properties.holes.c_sw,dhsw.properties.duet.c_sw,false,0);
763 var dhse = dh.connectTo(dh.properties.duet.c_se,d.properties.holes.c_se,false,0); 765 var dhse = dh.connectTo(dh.properties.duet.c_se,d.properties.holes.c_se,false,0);
764 var dhne = dh.connectTo(dh.properties.duet.c_ne,d.properties.holes.c_ne,false,0); 766 var dhne = dh.connectTo(dh.properties.duet.c_ne,d.properties.holes.c_ne,false,0);
765 var dhnw = dh.connectTo(dh.properties.duet.c_nw,d.properties.holes.c_nw,false,0); 767 var dhnw = dh.connectTo(dh.properties.duet.c_nw,d.properties.holes.c_nw,false,0);
766 var rv = union(cols).union(sides.map(union)).union(feet).union([ 768 var rv = union(cols).union(sides.map(union)).union(feet).union([
767 d,dhsw,dhse,dhne,dhnw 769 d,dhsw,dhse,dhne,dhnw
768 ]); 770 ]);
769 rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); 771 rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
770 return rv; 772 return rv;
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
777function main(params) { 781function main(params) {
778 var part = params.part && PARTS[params.part]; 782 var part = params.part && PARTS[params.part];
779 if(!part) return refaxes(); 783 if(!part) return refaxes();
780 var rv = P(part(params)); 784 var rv = P(part(params));
781 if(!params.print) rv = rv.union(refaxes()); 785 if(!params.print) rv = rv.union(refaxes());
782 return rv; 786 return rv;
783} 787}
784 788
785function _main(params) { 789function _main(params) {
786 var e = EFFECTOR.effector(); 790 var e = EFFECTOR.effector();
@@ -814,33 +818,36 @@ function _main(params) {
814} 818}
815 819
816function getParameterDefinitions() { 820function getParameterDefinitions() {
817 return [{ 821 return [{
818 name: 'part', 822 name: 'part',
819 type: 'choice', 823 type: 'choice',
820 values: [ 824 values: [
821 'platform', 825 'platform',
822 'hinged', 826 'hinged',
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 ],
829 captions: [ 834 captions: [
830 'Effector platform', 835 'Effector platform',
831 'Hinged part', 836 'Hinged part',
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 ],
838 caption: 'Part', 845 caption: 'Part',
839 initial: 'wip' 846 initial: 'wip'
840 },{ 847 },{
841 name: 'print', 848 name: 'print',
842 type: 'checkbox', 849 type: 'checkbox',
843 caption: 'For print, no nonsense', 850 caption: 'For print, no nonsense',
844 initial: false 851 initial: false
845 }]; 852 }];
846} 853}