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) (side-by-side diff)
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
@@ -647,17 +647,17 @@ function foot() {
]).union(CSG.cylinder({ // bridging patch
start: [0,0,F.h-F.nut.h-PRINT.play_tolerance-PRINT.layer_height],
end: [0,0,F.h-F.nut.h-PRINT.play_tolerance],
radius: F.nut.d/2
}));
rv.properties.c_column = new CSG.Connector([0,0,F.h],[0,0,1],[1,0,0]);
+ rv.properties.c_shoe = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
rv.properties.P = new CSG.Connector([0,0,F.h],[0,0,-1],[1,0,0]);
return rv.setColor(CONFIG.color.parts);
}
-function foot_foot() {
- // TODO: connect in the altogethernow?
+function shoe() {
var F = CONFIG.foot;
var rv = CSG.cylinder({
start: [0,0,0], end: [0,0,F.foot.ho],
radius: F.bolt.hd/2+F.margin
}).union(CSG.cylinder({
start: [0,0,0], end: [0,0,F.foot.ho+F.foot.hi],
@@ -749,13 +749,15 @@ var PARTS = {
alltogethernow: function(params) {
var cols = columns();
var sides = base_sides();
var feet = THREEWINDS.map(function(w,i) {
var rv = foot();
rv = rv.connectTo(rv.properties.c_column,cols[i].properties.c_bottom,false,0);
- return rv;
+ var s = shoe();
+ s = s.connectTo(s.properties.c_foot,rv.properties.c_shoe,false,0);
+ return rv.union(s);
});
var dh = duetholder();
var dhsw = dh.connectTo(dh.properties.c_h,
new CSG.Connector([-CONFIG.duet.hole_spacing.x/2,-CD.base.mid_inscription_r,CONFIG.foot.h],[0,0,1],[1,0,0]),
false,0);
var d = duet();
@@ -768,13 +770,15 @@ var PARTS = {
]);
rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
return rv;
},
duetholder: function(params) {
return duetholder();
- }
+ },
+ foot: foot,
+ shoe: shoe
};
function main(params) {
var part = params.part && PARTS[params.part];
if(!part) return refaxes();
var rv = P(part(params));
@@ -820,21 +824,24 @@ function getParameterDefinitions() {
values: [
'platform',
'hinged',
'clamp',
'fanholder',
'duetholder',
+ 'foot', 'shoe',
'alltogethernow',
'wip'
],
captions: [
'Effector platform',
'Hinged part',
'Clamp',
'Fan holder',
'Duet holder',
+ 'Foot',
+ 'Shoe',
'All together now!',
'Work in progress'
],
caption: 'Part',
initial: 'wip'
},{