diff options
author | Marius Kintel <marius@kintel.net> | 2014-01-16 03:23:50 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2014-01-16 03:23:50 (GMT) |
commit | bf0d9edf38132049a2d8a8f5de4d6e70657a8870 (patch) | |
tree | 5559625acd9496f855fd7e377b75ce5318cf7d21 /tests | |
parent | 1fc52f8cd47213131e0eb76ccf184b5c7388c6b9 (diff) |
Change behavior of intersection: intersecting something with an empty object will be empty
Diffstat (limited to 'tests')
-rw-r--r-- | tests/regression/cgalpngtest/intersection-tests-expected.png | bin | 7455 -> 7853 bytes | |||
-rw-r--r-- | tests/regression/dumptest/intersection-tests-expected.csg | 19 | ||||
-rw-r--r-- | tests/regression/opencsgtest/intersection-tests-expected.png | bin | 7273 -> 7519 bytes | |||
-rw-r--r-- | tests/regression/throwntogethertest/intersection-tests-expected.png | bin | 11327 -> 12180 bytes |
4 files changed, 19 insertions, 0 deletions
diff --git a/tests/regression/cgalpngtest/intersection-tests-expected.png b/tests/regression/cgalpngtest/intersection-tests-expected.png Binary files differindex d287e5f..0d40a99 100644 --- a/tests/regression/cgalpngtest/intersection-tests-expected.png +++ b/tests/regression/cgalpngtest/intersection-tests-expected.png diff --git a/tests/regression/dumptest/intersection-tests-expected.csg b/tests/regression/dumptest/intersection-tests-expected.csg index bfb5077..1091c8d 100644 --- a/tests/regression/dumptest/intersection-tests-expected.csg +++ b/tests/regression/dumptest/intersection-tests-expected.csg @@ -54,4 +54,23 @@ group() { } } } + multmatrix([[1, 0, 0, 0], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) { + intersection() { + cylinder($fn = 0, $fa = 12, $fs = 2, h = 5, r1 = 4, r2 = 4, center = true); + cube(size = [0, 0, 0], center = false); + } + } + multmatrix([[1, 0, 0, 12], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) { + intersection() { + cube(size = [5, 5, 5], center = true); + circle($fn = 0, $fa = 12, $fs = 2, r = 2); + } + } + multmatrix([[1, 0, 0, 24], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) { + intersection() { + group(); + cube(size = [5, 5, 5], center = true); + cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 2, r2 = 2, center = true); + } + } } diff --git a/tests/regression/opencsgtest/intersection-tests-expected.png b/tests/regression/opencsgtest/intersection-tests-expected.png Binary files differindex 772e2dc..3cc588f 100644 --- a/tests/regression/opencsgtest/intersection-tests-expected.png +++ b/tests/regression/opencsgtest/intersection-tests-expected.png diff --git a/tests/regression/throwntogethertest/intersection-tests-expected.png b/tests/regression/throwntogethertest/intersection-tests-expected.png Binary files differindex f6cc56f..6dee3c6 100644 --- a/tests/regression/throwntogethertest/intersection-tests-expected.png +++ b/tests/regression/throwntogethertest/intersection-tests-expected.png |