summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2014-01-19 17:18:09 (GMT)
committerMarius Kintel <marius@kintel.net>2014-01-19 17:18:09 (GMT)
commit556040439e702da771659d2ddd026825bde733f6 (patch)
tree96ab559ea4a45b296d9ab8e63d83a5e425d82e4c
parent47c042a559d5359a804cd790f3d8df6df6ccb002 (diff)
Added test of minkowski2 with >2 children
-rw-r--r--testdata/scad/features/minkowski2-tests.scad7
-rw-r--r--tests/regression/cgalpngtest/minkowski2-tests-expected.pngbin6984 -> 7257 bytes
-rw-r--r--tests/regression/dumptest/minkowski2-tests-expected.csg7
-rw-r--r--tests/regression/opencsgtest/minkowski2-tests-expected.pngbin7388 -> 7638 bytes
-rw-r--r--tests/regression/throwntogethertest/minkowski2-tests-expected.pngbin7388 -> 7644 bytes
5 files changed, 14 insertions, 0 deletions
diff --git a/testdata/scad/features/minkowski2-tests.scad b/testdata/scad/features/minkowski2-tests.scad
index 37fad27..92a7dca 100644
--- a/testdata/scad/features/minkowski2-tests.scad
+++ b/testdata/scad/features/minkowski2-tests.scad
@@ -32,3 +32,10 @@ translate([25,0,0]) roundedBox2dSimple();
// One child
translate([0,-20,0]) minkowski() { square(10); }
+
+// >2 children
+translate([-20,-20,0]) minkowski() {
+ square(10);
+ square(2, center=true);
+ circle(1);
+}
diff --git a/tests/regression/cgalpngtest/minkowski2-tests-expected.png b/tests/regression/cgalpngtest/minkowski2-tests-expected.png
index b85161b..806153b 100644
--- a/tests/regression/cgalpngtest/minkowski2-tests-expected.png
+++ b/tests/regression/cgalpngtest/minkowski2-tests-expected.png
Binary files differ
diff --git a/tests/regression/dumptest/minkowski2-tests-expected.csg b/tests/regression/dumptest/minkowski2-tests-expected.csg
index e653f8b..75c5559 100644
--- a/tests/regression/dumptest/minkowski2-tests-expected.csg
+++ b/tests/regression/dumptest/minkowski2-tests-expected.csg
@@ -34,4 +34,11 @@ group() {
square(size = [10, 10], center = false);
}
}
+ multmatrix([[1, 0, 0, -20], [0, 1, 0, -20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+ minkowski(convexity = 0) {
+ square(size = [10, 10], center = false);
+ square(size = [2, 2], center = true);
+ circle($fn = 0, $fa = 12, $fs = 2, r = 1);
+ }
+ }
}
diff --git a/tests/regression/opencsgtest/minkowski2-tests-expected.png b/tests/regression/opencsgtest/minkowski2-tests-expected.png
index 9ea580d..8e7e96e 100644
--- a/tests/regression/opencsgtest/minkowski2-tests-expected.png
+++ b/tests/regression/opencsgtest/minkowski2-tests-expected.png
Binary files differ
diff --git a/tests/regression/throwntogethertest/minkowski2-tests-expected.png b/tests/regression/throwntogethertest/minkowski2-tests-expected.png
index 9ea580d..1118260 100644
--- a/tests/regression/throwntogethertest/minkowski2-tests-expected.png
+++ b/tests/regression/throwntogethertest/minkowski2-tests-expected.png
Binary files differ
contact: Jan Huwald // Impressum