chiark
/
gitweb
/
~ianmdlvl
/
reprap-play.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d574dce
)
sewing-table: RoundCorner rework: introduce ctr3 (nfc)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 3 Jun 2017 20:11:08 +0000
(21:11 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 3 Jun 2017 20:11:08 +0000
(21:11 +0100)
sewing-table.scad.m4
patch
|
blob
|
history
diff --git
a/sewing-table.scad.m4
b/sewing-table.scad.m4
index a407c7aaab41cae439d68b5ff2a638e4551b20f4..57f9f3d978d6d3aba91548d8dfd9957d9c5666ea 100644
(file)
--- a/
sewing-table.scad.m4
+++ b/
sewing-table.scad.m4
@@
-248,7
+248,8
@@
m4_define(`ROUNDCORNER_VARS',`
lp2 = this_cnr + clockwise2d(l_uvec) * bigr;
lp3 = this_cnr - clockwise2d(r_uvec) * bigr;
lp4 = right_cnr - clockwise2d(r_uvec) * bigr;
lp2 = this_cnr + clockwise2d(l_uvec) * bigr;
lp3 = this_cnr - clockwise2d(r_uvec) * bigr;
lp4 = right_cnr - clockwise2d(r_uvec) * bigr;
- ctr = line_intersection_2d(lp1,lp2,lp3,lp4)
+ ctr = line_intersection_2d(lp1,lp2,lp3,lp4);
+ ctr3 = concat(ctr,[0])
')
module RoundCorner_selector(ci, adj) {
')
module RoundCorner_selector(ci, adj) {
@@
-281,7
+282,7
@@
module RoundCornerCut(ci) {
ROUNDCORNER_VARS;
difference(){
RoundCorner_selector(ci, -0.1);
ROUNDCORNER_VARS;
difference(){
RoundCorner_selector(ci, -0.1);
- translate(c
oncat(ctr,[0])
)
+ translate(c
tr3
)
cylinder(center=true, h=20, r= bigr);
}
}
cylinder(center=true, h=20, r= bigr);
}
}
@@
-291,7
+292,7
@@
module RoundCornerAdd(ci) {
intersection(){
RoundCorner_selector(ci, +0.1);
INREFFRAME_EDGE {
intersection(){
RoundCorner_selector(ci, +0.1);
INREFFRAME_EDGE {
- translate(c
oncat(ctr,[0])
){
+ translate(c
tr3
){
rotate_extrude(convexity=10, $fn=50)
translate([bigr, 0])
difference(){
rotate_extrude(convexity=10, $fn=50)
translate([bigr, 0])
difference(){