summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2016-01-06 23:46:23 (UTC)
committer Michael Krelin <hacker@klever.net>2016-01-06 23:46:23 (UTC)
commit8cd03b0c3f807d552a6721886a3af0af8b592a1c (patch) (unidiff)
tree79ce55cc3f5cb564be9801f5ac276db649ad4d4b
parent70e08848566d909a76fa3f611d35570c57f8e048 (diff)
downloadredelta-8cd03b0c3f807d552a6721886a3af0af8b592a1c.zip
redelta-8cd03b0c3f807d552a6721886a3af0af8b592a1c.tar.gz
redelta-8cd03b0c3f807d552a6721886a3af0af8b592a1c.tar.bz2
column extrusions
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--delta.jscad8
1 files changed, 8 insertions, 0 deletions
diff --git a/delta.jscad b/delta.jscad
index 9941125..043f6f8 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -536,32 +536,40 @@ var E2020 = {
536var THREEWINDS = [0,120,240]; 536var THREEWINDS = [0,120,240];
537 537
538function base_extrusions() { 538function base_extrusions() {
539 var rv = union( THREEWINDS.map(function(w) { 539 var rv = union( THREEWINDS.map(function(w) {
540 var e = E2020.extrusion({l:CONFIG.base.el}); 540 var e = E2020.extrusion({l:CONFIG.base.el});
541 e = e.connectTo(e.properties.c_midway, 541 e = e.connectTo(e.properties.c_midway,
542 new CSG.Connector([0,-CD.base.mid_inscription_r,CONFIG.extrusion.w/2],[1,0,0],[0,0,1]), 542 new CSG.Connector([0,-CD.base.mid_inscription_r,CONFIG.extrusion.w/2],[1,0,0],[0,0,1]),
543 false, 0); 543 false, 0);
544 return union( [0,CONFIG.extrusion.w+CONFIG.base.gap].map(function(z) { 544 return union( [0,CONFIG.extrusion.w+CONFIG.base.gap].map(function(z) {
545 return e.translate([0,0,z]); 545 return e.translate([0,0,z]);
546 }) ).rotateZ(w); 546 }) ).rotateZ(w);
547 }) ); 547 }) );
548 rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]); 548 rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
549 return rv.setColor(CONFIG.color.extrusion); 549 return rv.setColor(CONFIG.color.extrusion);
550} 550}
551 551
552function column_extrusions() {
553 var rv = union( THREEWINDS.map(function(w) {
554 return E2020.extrusion({l:CONFIG.column.h}).translate([0,CD.base.column_r,0]).rotateZ(w);
555 }) );
556 rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
557 return rv.setColor(CONFIG.color.extrusion);
558}
559
552function refaxes(o) { 560function refaxes(o) {
553 if(!o) o = {}; 561 if(!o) o = {};
554 var l = o.l||20, g = o.g||0.7; 562 var l = o.l||20, g = o.g||0.7;
555 return union([ 563 return union([
556 CSG.cylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]), 564 CSG.cylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]),
557 CSG.cylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]), 565 CSG.cylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]),
558 CSG.cylinder({start:[0,0,0],end:[0,0,l]}).setColor([0,0,1,g]) 566 CSG.cylinder({start:[0,0,0],end:[0,0,l]}).setColor([0,0,1,g])
559 ]); 567 ]);
560} 568}
561 569
562function P(x) { 570function P(x) {
563 return x.connectTo(x.properties.P,new CSG.Connector([0,0,0],[0,0,1],[1,0,0]), false, 0); 571 return x.connectTo(x.properties.P,new CSG.Connector([0,0,0],[0,0,1],[1,0,0]), false, 0);
564} 572}
565 573
566function main(params) { 574function main(params) {
567 return refaxes().union(P(base_extrusions())); 575 return refaxes().union(P(base_extrusions()));