summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2016-03-20 14:39:18 (UTC)
committer Michael Krelin <hacker@klever.net>2016-03-20 14:39:18 (UTC)
commit4a633d30598c5c230e42d3feafbca39b43292acc (patch) (side-by-side diff)
treedf14b54b33c5af558cab0d5e6dcd878aaa22a9c7
parent00a023fb1fa3370550b2b30b6ce06aec45436a52 (diff)
downloadredelta-master.zip
redelta-master.tar.gz
redelta-master.tar.bz2
fanholder changes of no effectHEADmaster
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--delta.jscad6
1 files changed, 4 insertions, 2 deletions
diff --git a/delta.jscad b/delta.jscad
index b783913..b46534a 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -463,13 +463,13 @@ var EFFECTOR = {
}));
});
},
fanholder: function effector_fanholder() {
var fh = CONFIG.effector.fanholder;
var od = fh.screw.d+2*fh.screw.m;
- return linear_extrude({height:fh.w},hull(
+ var rv = linear_extrude({height:fh.w},hull(
CAG.circle({center:[0,-this.rmount],radius:od/2}),
CAG.circle({center:[0,-fh.r+od/2+fh.w/2],radius:fh.w/2})
)).translate([0,0,-fh.w]).union(
linear_extrude({height:fh.w},hull(
CAG.circle({center:[fh.w/2,-this.rmount-od/2-fh.w/2],radius:fh.w/2}),
CAG.circle({center:[od/2,-fh.r],radius:od/2})
@@ -479,13 +479,15 @@ var EFFECTOR = {
end: [fh.w,-fh.r,-od/2],
radius: fh.screw.d/2
})).subtract( CSG.cylinder({
start: [0,-this.rmount,1],
end: [0,-this.rmount,-fh.w-1],
radius: fh.screw.d/2
- })).setColor([0.3,0.8,0.3,0.9]).rotateZ(-120);
+ }));
+ rv.properties.P = new CSG.Connector([0,0,0],[0,0,-1],[1,0,0]);
+ return rv.setColor([0.3,0.8,0.3,0.9]).rotateZ(-120);
}
};
function columns() {
var rv = [0,1,2].map(function(x) {
return union(vector_char(0,0,String.fromCharCode('A'.charCodeAt(0)+x)).segments.map(function(x) {