diff options
| author | Marius Kintel <marius@kintel.net> | 2011-11-23 15:11:55 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-11-23 15:11:55 (GMT) |
| commit | 25fa1984dbeed2b294e1f04d833fa5f7bd66fcad (patch) | |
| tree | d419950c7fbec37e35d6c1b4c640d181ddf017c6 /tests | |
| parent | 1969396b9d1ec34778f9568652b0864f64365a23 (diff) | |
| parent | 73092dd4c89829bb0a7fa0a026addd2d54171cbb (diff) | |
Merge branch 'hull3'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/regression/cgalpngtest/hull3-tests-expected.png | bin | 4408 -> 11978 bytes | |||
| -rw-r--r-- | tests/regression/dumptest/hull3-tests-expected.txt | 34 | ||||
| -rw-r--r-- | tests/regression/opencsgtest/hull3-tests-expected.png | bin | 4408 -> 12471 bytes | |||
| -rw-r--r-- | tests/regression/throwntogethertest/hull3-tests-expected.png | bin | 4408 -> 12471 bytes |
4 files changed, 14 insertions, 20 deletions
diff --git a/tests/regression/cgalpngtest/hull3-tests-expected.png b/tests/regression/cgalpngtest/hull3-tests-expected.png Binary files differindex 50d838c..e34ae89 100644 --- a/tests/regression/cgalpngtest/hull3-tests-expected.png +++ b/tests/regression/cgalpngtest/hull3-tests-expected.png diff --git a/tests/regression/dumptest/hull3-tests-expected.txt b/tests/regression/dumptest/hull3-tests-expected.txt index 831aae2..bde58c9 100644 --- a/tests/regression/dumptest/hull3-tests-expected.txt +++ b/tests/regression/dumptest/hull3-tests-expected.txt @@ -1,26 +1,20 @@ - multmatrix([[1, 0, 0, 0], [0, 1, 0, 40], [0, 0, 1, 0], [0, 0, 0, 1]]) { - group() { - hull() { - multmatrix([[1, 0, 0, 15], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) { - cylinder($fn = 0, $fa = 12, $fs = 1, h = 10, r1 = 1, r2 = 1, center = false); - } - difference() { - cylinder($fn = 0, $fa = 12, $fs = 1, h = 10, r1 = 1, r2 = 1, center = false); - cylinder($fn = 0, $fa = 12, $fs = 1, h = 5, r1 = 1, r2 = 1, center = false); - } - } + hull(); + hull(); + hull() { + cylinder($fn = 0, $fa = 12, $fs = 1, h = 1, r1 = 10, r2 = 10, center = false); + multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 10], [0, 0, 0, 1]]) { + cube(size = [5, 5, 5], center = true); } } - multmatrix([[1, 0, 0, 40], [0, 1, 0, 40], [0, 0, 1, 0], [0, 0, 0, 1]]) { - group() { - hull() { - multmatrix([[1, 0, 0, 15], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) { - cylinder($fn = 0, $fa = 12, $fs = 1, h = 1, r1 = 10, r2 = 10, center = false); - } - cylinder($fn = 0, $fa = 12, $fs = 1, h = 1, r1 = 10, r2 = 10, center = false); + multmatrix([[1, 0, 0, 25], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { + hull() { + multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 10], [0, 0, 0, 1]]) { + cylinder($fn = 0, $fa = 12, $fs = 1, h = 1, r1 = 3, r2 = 3, center = false); + } + difference() { + cylinder($fn = 0, $fa = 12, $fs = 1, h = 4, r1 = 10, r2 = 10, center = true); + cylinder($fn = 0, $fa = 12, $fs = 1, h = 5, r1 = 5, r2 = 5, center = true); } } } - hull(); - hull(); diff --git a/tests/regression/opencsgtest/hull3-tests-expected.png b/tests/regression/opencsgtest/hull3-tests-expected.png Binary files differindex 50d838c..5a363a1 100644 --- a/tests/regression/opencsgtest/hull3-tests-expected.png +++ b/tests/regression/opencsgtest/hull3-tests-expected.png diff --git a/tests/regression/throwntogethertest/hull3-tests-expected.png b/tests/regression/throwntogethertest/hull3-tests-expected.png Binary files differindex 50d838c..5a363a1 100644 --- a/tests/regression/throwntogethertest/hull3-tests-expected.png +++ b/tests/regression/throwntogethertest/hull3-tests-expected.png |
