summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2016-01-13 10:13:41 (UTC)
committer Michael Krelin <hacker@klever.net>2016-01-13 10:13:41 (UTC)
commit34af0c1f06a2bec183afdc412d4a05c1d0c8906f (patch) (side-by-side diff)
treeb21814323d66619ec131546ac95ecf81a33876d2
parentf8b3bc2a1792a7ee8eeacf7dd1d9f5b3cc96a7a6 (diff)
downloadredelta-34af0c1f06a2bec183afdc412d4a05c1d0c8906f.zip
redelta-34af0c1f06a2bec183afdc412d4a05c1d0c8906f.tar.gz
redelta-34af0c1f06a2bec183afdc412d4a05c1d0c8906f.tar.bz2
moving things around
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--delta.jscad29
1 files changed, 15 insertions, 14 deletions
diff --git a/delta.jscad b/delta.jscad
index 7384ecf..156e704 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -755,38 +755,24 @@ function glass() {
rv.properties.c_bed = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
rv.properties.P = new CSG.Connector([0,0,-CONFIG.foot.h-CONFIG.heatbed.h],[0,0,1],[1,0,0]);
rv.properties.vitamin = true;
return rv.setColor(CONFIG.color.glass);
}
function platform() {
var b = heatbed();
var g = glass();
g = g.connectTo(g.properties.c_bed,b.properties.c_glass,false,0);
return b.union(g);
}
-function refaxes(o) {
- if(!o) o = {};
- var l = o.l||20, g = o.g||0.7;
- return union([
- 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 duetholder(params);
return PARTS.alltogethernow(params);
return base_extrusions();
return foot();
return union(base_extrusions(),column_extrusions(),duet().translate([0,-20,0]));
},
alltogethernow: function(params) {
var cols = columns();
var sides = base_sides();
var feet = THREEWINDS.map(function(w,i) {
@@ -850,24 +836,39 @@ function _main(params) {
alltogethernow: [e,hdhd[0],hdhd[1], columns(),hs,ms,fh]
}[params.part||'alltogethernow'])
var rv = union(
e,
hs,
columns(),
///hd,
hdhd[0], hdhd[1],
ms);
return rv;
}
+function refaxes(o) {
+ if(!o) o = {};
+ var l = o.l||20, g = o.g||0.7;
+ return union([
+ 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);
+}
+
+
function getParameterDefinitions() {
return [{
name: 'part',
type: 'choice',
values: [
'platform',
'hinged',
'clamp',
'fanholder',
'duetholder',
'foot', 'shoe',
'alltogethernow',