summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2016-01-07 20:54:42 (UTC)
committer Michael Krelin <hacker@klever.net>2016-01-07 20:54:42 (UTC)
commit07d64020a23339f759f183c12ebda7a5f69acc78 (patch) (side-by-side diff)
tree8ab795bf566d384ccbf9061fb31705e20c143c1c
parent5980d4a6d0f40119a633020146b861a805b108c8 (diff)
downloadredelta-07d64020a23339f759f183c12ebda7a5f69acc78.zip
redelta-07d64020a23339f759f183c12ebda7a5f69acc78.tar.gz
redelta-07d64020a23339f759f183c12ebda7a5f69acc78.tar.bz2
rounded reference axes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--delta.jscad6
1 files changed, 3 insertions, 3 deletions
diff --git a/delta.jscad b/delta.jscad
index fa33a0d..e6516f9 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -608,51 +608,51 @@ function foot() {
})).subtract([
CSG.cylinder({ // bolt hole
start: [0,0,-1], end: [0,0,F.h+1], radius: F.bolt.d/2+PRINT.slide_tolerance
}), CSG.cylinder({ // nut hole
start: [0,0,F.h-F.nut.h-PRINT.play_tolerance],
end: [0,0,F.h],
radius: F.nut.d/2+PRINT.slide_tolerance, resolution: 6
}), CSG.cylinder({ // bolthead/washer hole
start: [0,0,-1], end: [0,0,F.h-F.nut.h-PRINT.play_tolerance-F.shell],
radius: F.bolt.hd/2+PRINT.play_tolerance
})
]).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.P = new CSG.Connector([0,0,F.h],[0,0,-1],[1,0,0]);
return rv.setColor(CONFIG.color.parts);
}
function refaxes(o) {
if(!o) o = {};
var l = o.l||20, g = o.g||0.7;
return union([
- CSG.cylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]),
- CSG.cylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]),
- CSG.cylinder({start:[0,0,0],end:[0,0,l]}).setColor([0,0,1,g])
+ CSG.roundedCylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]),
+ CSG.roundedCylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]),
+ CSG.roundedCylinder({start:[0,0,0],end:[0,0,l]}).setColor([0,0,1,g])
]);
}
function P(x) {
return x.connectTo(x.properties.P,new CSG.Connector([0,0,0],[0,0,1],[1,0,0]), false, 0);
}
var PARTS = {
wip: function(params) {
return foot();
return union(base_extrusions(),column_extrusions(),duet());
}
};
function main(params) {
var part = params.part && PARTS[params.part];
if(!part) return refaxes();
var rv = P(part(params));
if(!params.print) rv = rv.union(refaxes());
return rv;
}
function _main(params) {
var e = EFFECTOR.effector();