Skip to content

Commit

Permalink
Updated test results for linear_extrude updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@thehans
thehans committed May 12, 2021
1 parent 7e33c9b commit 77c59ef
Show file tree
Hide file tree
Showing 44 changed files with 284 additions and 275 deletions.
2 changes: 1 addition & 1 deletion examples/Basics/linear_extrude.scad
View file
Expand Up @@ -21,7 +21,7 @@ color("cyan")
// combining both relatively complex shapes can be created
color("gray")
translate([0, 30, 0])
linear_extrude(height = 40, twist = -360, scale = 0, center = true, slices = 200)
linear_extrude(height = 40, twist = -360, scale = 0, center = true, $fs=1, $fa=1)
square([20, 10], center = true);

// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
Expand Down
2 changes: 1 addition & 1 deletion testdata/scad/3D/features/linear_extrude-tests.scad
View file
Expand Up @@ -9,7 +9,7 @@ linear_extrude(height=10) square([10,10]);
translate([19,5,0]) linear_extrude(height=10, center=true) difference() {circle(5); circle(3);}
translate([31.5,2.5,0]) linear_extrude(height=10, twist=-45) polygon(points = [[-5,-2.5], [5,-2.5], [0,2.5]]);

translate([1,21,0]) linear_extrude(height=20, twist=30, slices=2) {
translate([1,21,0]) linear_extrude(height=20, twist=30, slices=2, segments=0) {
difference() {
translate([-1,-1]) square([10,10]);
square([8,8]);
Expand Down
Binary file modified tests/regression/cgalpngtest/linear_extrude-expected.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/regression/cgalpngtest/linear_extrude-parameter-tests-expected.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/regression/cgalpngtest/linear_extrude-tests-expected.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 15 additions & 15 deletions tests/regression/dumptest-examples/GEB-expected.csg
View file
@@ -1,15 +1,15 @@
color([1, 1, 0.941176, 1]) {
group() {
intersection() {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.5, $fn = 64, $fa = 12, $fs = 2) {
text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
}
}
}
multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) {
text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
Expand All @@ -18,7 +18,7 @@ color([1, 1, 0.941176, 1]) {
}
}
multmatrix([[0, 0, 1, 0], [1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) {
text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
Expand All @@ -31,21 +31,21 @@ color([1, 1, 0.941176, 1]) {
}
color([0.729412, 0.333333, 0.827451, 1]) {
multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -20], [0, 0, 0, 1]]) {
linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 1, $fn = 64, $fa = 12, $fs = 2) {
difference() {
square(size = [40, 40], center = true);
projection(cut = false, convexity = 0) {
group() {
intersection() {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.5, $fn = 64, $fa = 12, $fs = 2) {
text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
}
}
}
multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) {
text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
Expand All @@ -54,7 +54,7 @@ color([0.729412, 0.333333, 0.827451, 1]) {
}
}
multmatrix([[0, 0, 1, 0], [1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) {
text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
Expand All @@ -72,7 +72,7 @@ color([0.729412, 0.333333, 0.827451, 1]) {
color([0.545098, 0, 0.545098, 1]) {
multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -20], [0, 0, 0, 1]]) {
linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 1, $fn = 64, $fa = 12, $fs = 2) {
difference() {
multmatrix([[1, 0, 0, 0], [0, 1, 0, 0.5], [0, 0, 1, 0], [0, 0, 0, 1]]) {
square(size = [40, 39], center = true);
Expand All @@ -81,15 +81,15 @@ color([0.545098, 0, 0.545098, 1]) {
multmatrix([[1, 0, 0, 0], [0, 0, 1, 0], [0, -1, 0, 0], [0, 0, 0, 1]]) {
group() {
intersection() {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.5, $fn = 64, $fa = 12, $fs = 2) {
text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
}
}
}
multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) {
text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
Expand All @@ -98,7 +98,7 @@ color([0.545098, 0, 0.545098, 1]) {
}
}
multmatrix([[0, 0, 1, 0], [1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) {
text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
Expand All @@ -118,7 +118,7 @@ color([0.545098, 0, 0.545098, 1]) {
color([0.482353, 0.407843, 0.933333, 1]) {
multmatrix([[0, 0, 1, 0], [1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -20], [0, 0, 0, 1]]) {
linear_extrude(height = 1, center = false, convexity = 1, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 1, $fn = 64, $fa = 12, $fs = 2) {
difference() {
multmatrix([[1, 0, 0, -0.5], [0, 1, 0, 0.5], [0, 0, 1, 0], [0, 0, 0, 1]]) {
square(size = [39, 39], center = true);
Expand All @@ -127,15 +127,15 @@ color([0.482353, 0.407843, 0.933333, 1]) {
multmatrix([[0, 1, 0, 0], [0, 0, 1, 0], [1, 0, 0, 0], [0, 0, 0, 1]]) {
group() {
intersection() {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.5, $fn = 64, $fa = 12, $fs = 2) {
text(text = "B", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
}
}
}
multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) {
text(text = "E", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
Expand All @@ -144,7 +144,7 @@ color([0.482353, 0.407843, 0.933333, 1]) {
}
}
multmatrix([[0, 0, 1, 0], [1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 20, center = true, convexity = 3, scale = [1, 1], $fn = 64, $fa = 12, $fs = 2) {
linear_extrude(height = 20, center = true, $fn = 64, $fa = 12, $fs = 2, convexity = 3) {
group() {
offset(r = 0.3, $fn = 64, $fa = 12, $fs = 2) {
text(text = "G", size = 10, spacing = 1, font = "Liberation Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 64, $fa = 12, $fs = 2);
Expand Down
2 changes: 1 addition & 1 deletion tests/regression/dumptest-examples/LetterBlock-expected.csg
View file
Expand Up @@ -4,7 +4,7 @@ group() {
cube(size = [30, 30, 15], center = true);
}
multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 5], [0, 0, 0, 1]]) {
linear_extrude(height = 30, center = false, convexity = 4, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
linear_extrude(height = 30, $fn = 0, $fa = 12, $fs = 2, convexity = 4) {
text(text = "M", size = 22, spacing = 1, font = "Bitstream Vera Sans", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "center", $fn = 0, $fa = 12, $fs = 2);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/regression/dumptest-examples/animation-expected.csg
View file
Expand Up @@ -4,7 +4,7 @@ group() {
cube(size = [150, 150, 0.1], center = true);
}
color([0, 0, 0, 1]) {
linear_extrude(height = 0.1, center = false, convexity = 1, scale = [1, 1], $fn = 30, $fa = 12, $fs = 2) {
linear_extrude(height = 0.1, $fn = 30, $fa = 12, $fs = 2) {
difference() {
group() {
polygon(points = [[-50, 60], [-49.2, 63.76], [-48.4, 67.4607], [-47.6, 71.0437], [-46.8, 74.4526], [-46, 77.6336], [-45.2, 80.5364], [-44.4, 83.1154], [-43.6, 85.3298], [-42.8, 87.1448], [-42, 88.5317], [-41.2, 89.4686], [-40.4, 89.9408], [-39.6, 89.9408], [-38.8, 89.4686], [-38, 88.5317], [-37.2, 87.1448], [-36.4, 85.3298], [-35.6, 83.1154], [-34.8, 80.5364], [-34, 77.6336], [-33.2, 74.4526], [-32.4, 71.0437], [-31.6, 67.4607], [-30.8, 63.76], [-30, 60], [-29.2, 56.24], [-28.4, 52.5393], [-27.6, 48.9563], [-26.8, 45.5474], [-26, 42.3664], [-25.2, 39.4636], [-24.4, 36.8846], [-23.6, 34.6702], [-22.8, 32.8552], [-22, 31.4683], [-21.2, 30.5314], [-20.4, 30.0592], [-19.6, 30.0592], [-18.8, 30.5314], [-18, 31.4683], [-17.2, 32.8552], [-16.4, 34.6702], [-15.6, 36.8846], [-14.8, 39.4636], [-14, 42.3664], [-13.2, 45.5474], [-12.4, 48.9563], [-11.6, 52.5393], [-10.8, 56.24], [-10, 60], [-9.2, 63.76], [-8.4, 67.4607], [-7.6, 71.0437], [-6.8, 74.4526], [-6, 77.6336], [-5.2, 80.5364], [-4.4, 83.1154], [-3.6, 85.3298], [-2.8, 87.1448], [-2, 88.5317], [-1.2, 89.4686], [-0.4, 89.9408], [0.4, 89.9408], [1.2, 89.4686], [2, 88.5317], [2.8, 87.1448], [3.6, 85.3298], [4.4, 83.1154], [5.2, 80.5364], [6, 77.6336], [6.8, 74.4526], [7.6, 71.0437], [8.4, 67.4607], [9.2, 63.76], [10, 60], [10.8, 56.24], [11.6, 52.5393], [12.4, 48.9563], [13.2, 45.5474], [14, 42.3664], [14.8, 39.4636], [15.6, 36.8846], [16.4, 34.6702], [17.2, 32.8552], [18, 31.4683], [18.8, 30.5314], [19.6, 30.0592], [20.4, 30.0592], [21.2, 30.5314], [22, 31.4683], [22.8, 32.8552], [23.6, 34.6702], [24.4, 36.8846], [25.2, 39.4636], [26, 42.3664], [26.8, 45.5474], [27.6, 48.9563], [28.4, 52.5393], [29.2, 56.24], [30, 60], [30.8, 63.76], [31.6, 67.4607], [32.4, 71.0437], [33.2, 74.4526], [34, 77.6336], [34.8, 80.5364], [35.6, 83.1154], [36.4, 85.3298], [37.2, 87.1448], [38, 88.5317], [38.8, 89.4686], [39.6, 89.9408], [40.4, 89.9408], [41.2, 89.4686], [42, 88.5317], [42.8, 87.1448], [43.6, 85.3298], [44.4, 83.1154], [45.2, 80.5364], [46, 77.6336], [46.8, 74.4526], [47.6, 71.0437], [48.4, 67.4607], [49.2, 63.76], [50, 60], [49.9842, 57.487], [49.9368, 54.9756], [49.8579, 52.4673], [49.7476, 49.9638], [49.6057, 47.4667], [49.4326, 44.9774], [49.2282, 42.4977], [48.9928, 40.029], [48.7263, 37.5729], [48.4292, 35.131], [48.1014, 32.7048], [47.7432, 30.2958], [47.3549, 27.9056], [46.9367, 25.5357], [46.4888, 23.1875], [46.0116, 20.8626], [45.5053, 18.5624], [44.9703, 16.2884], [44.4068, 14.042], [43.8153, 11.8246], [43.1962, 9.63768], [42.5497, 7.48254], [41.8764, 5.36057], [41.1766, 3.27311], [40.4508, 1.22147], [39.6995, -0.79303], [38.9231, -2.76914], [38.1221, -4.7056], [37.2971, -6.60119], [36.4484, -8.45471], [35.5768, -10.265], [34.6827, -12.0309], [33.7666, -13.7513], [32.8293, -15.4251], [31.8712, -17.0513], [30.893, -18.6288], [29.8952, -20.1567], [28.8786, -21.6339], [27.8438, -23.0596], [26.7913, -24.4328], [25.722, -25.7527], [24.6364, -27.0184], [23.5352, -28.2291], [22.4192, -29.3841], [21.289, -30.4827], [20.1453, -31.5241], [18.989, -32.5077], [17.8206, -33.4329], [16.641, -34.2991], [15.4508, -35.1057], [14.251, -35.8522], [13.0421, -36.5382], [11.8249, -37.1632], [10.6004, -37.7268], [9.36907, -38.2287], [8.13186, -38.6686], [6.88951, -39.0461], [5.64282, -39.3611], [4.39256, -39.6134], [3.13953, -39.8027], [1.88451, -39.9289], [0.628302, -39.9921], [-0.628302, -39.9921], [-1.88451, -39.9289], [-3.13953, -39.8027], [-4.39256, -39.6134], [-5.64282, -39.3611], [-6.88951, -39.0461], [-8.13186, -38.6686], [-9.36907, -38.2287], [-10.6004, -37.7268], [-11.8249, -37.1632], [-13.0421, -36.5382], [-14.251, -35.8522], [-15.4508, -35.1057], [-16.641, -34.2991], [-17.8206, -33.4329], [-18.989, -32.5077], [-20.1453, -31.5241], [-21.289, -30.4827], [-22.4192, -29.3841], [-23.5352, -28.2291], [-24.6364, -27.0184], [-25.722, -25.7527], [-26.7913, -24.4328], [-27.8438, -23.0596], [-28.8786, -21.6339], [-29.8952, -20.1567], [-30.893, -18.6288], [-31.8712, -17.0513], [-32.8293, -15.4251], [-33.7666, -13.7513], [-34.6827, -12.0309], [-35.5768, -10.265], [-36.4484, -8.45471], [-37.2971, -6.60119], [-38.1221, -4.7056], [-38.9231, -2.76914], [-39.6995, -0.79303], [-40.4508, 1.22147], [-41.1766, 3.27311], [-41.8764, 5.36057], [-42.5497, 7.48254], [-43.1962, 9.63768], [-43.8153, 11.8246], [-44.4068, 14.042], [-44.9703, 16.2884], [-45.5053, 18.5624], [-46.0116, 20.8626], [-46.4888, 23.1875], [-46.9367, 25.5357], [-47.3549, 27.9056], [-47.7432, 30.2958], [-48.1014, 32.7048], [-48.4292, 35.131], [-48.7263, 37.5729], [-48.9928, 40.029], [-49.2282, 42.4977], [-49.4326, 44.9774], [-49.6057, 47.4667], [-49.7476, 49.9638], [-49.8579, 52.4673], [-49.9368, 54.9756], [-49.9842, 57.487], [-50, 60]], paths = undef, convexity = 1);
Expand Down
3 changes: 2 additions & 1 deletion tests/regression/dumptest-examples/candleStand-expected.csg
View file
Expand Up @@ -87,7 +87,7 @@ multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 46.5], [0, 0, 0, 1]]) {
}
}
}
linear_extrude(height = 4, center = false, convexity = 2, scale = [1, 1], $fn = 0, $fa = 0.5, $fs = 0.5) {
linear_extrude(height = 4, $fn = 0, $fa = 0.5, $fs = 0.5, convexity = 2) {
difference() {
circle($fn = 0, $fa = 0.5, $fs = 0.5, r = 25);
circle($fn = 0, $fa = 0.5, $fs = 0.5, r = 23);
Expand Down Expand Up @@ -212,3 +212,4 @@ group() {
}
}
}

8 changes: 4 additions & 4 deletions tests/regression/dumptest-examples/children-expected.csg
View file
Expand Up @@ -183,7 +183,7 @@ color([0, 1, 1, 1]) {
cylinder($fn = 40, $fa = 12, $fs = 2, h = 12, r1 = 2, r2 = 2, center = false);
multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) {
multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 2, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
linear_extrude(height = 2, center = true, $fn = 0, $fa = 12, $fs = 2) {
text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2);
}
}
Expand All @@ -203,7 +203,7 @@ color([0, 1, 1, 1]) {
cylinder($fn = 40, $fa = 12, $fs = 2, h = 12, r1 = 2, r2 = 2, center = false);
multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) {
multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 2, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
linear_extrude(height = 2, center = true, $fn = 0, $fa = 12, $fs = 2) {
text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2);
}
}
Expand All @@ -223,7 +223,7 @@ color([0, 1, 1, 1]) {
cylinder($fn = 40, $fa = 12, $fs = 2, h = 12, r1 = 2, r2 = 2, center = false);
multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) {
multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 2, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
linear_extrude(height = 2, center = true, $fn = 0, $fa = 12, $fs = 2) {
text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2);
}
}
Expand All @@ -243,7 +243,7 @@ color([0, 1, 1, 1]) {
cylinder($fn = 40, $fa = 12, $fs = 2, h = 12, r1 = 2, r2 = 2, center = false);
multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) {
multmatrix([[1, 0, 0, 0], [0, 0, -1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
linear_extrude(height = 2, center = true, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
linear_extrude(height = 2, center = true, $fn = 0, $fa = 12, $fs = 2) {
text(text = "SCAD", size = 8, spacing = 1, font = "", direction = "ltr", language = "en", script = "Latn", halign = "center", valign = "baseline", $fn = 0, $fa = 12, $fs = 2);
}
}
Expand Down

0 comments on commit 77c59ef

Please sign in to comment.