diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-11-25 01:02:15 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-11-25 01:02:15 (GMT) |
| commit | 8496e5d7cc273680b61313b98a327dd9b355e28f (patch) | |
| tree | a3f33e7719d3dfac5848a556ddeb29e038f1f307 /tests | |
| parent | 825fbc7b9e7756ef8c2b49a85efd9abe3ebf8d95 (diff) | |
| parent | 91c2b8909ce670e65d341f98fc5f7e456622bba4 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/regression/cgalpngtest/polygon-tests-expected.png | bin | 7755 -> 8321 bytes | |||
| -rw-r--r-- | tests/regression/cgalpngtest/render-2d-tests-expected.png | bin | 7029 -> 7730 bytes | |||
| -rw-r--r-- | tests/regression/dumptest/polygon-tests-expected.csg | 3 | ||||
| -rw-r--r-- | tests/regression/dumptest/render-2d-tests-expected.csg | 10 | ||||
| -rw-r--r-- | tests/regression/opencsgtest/polygon-tests-expected.png | bin | 8736 -> 9532 bytes | |||
| -rw-r--r-- | tests/regression/opencsgtest/render-2d-tests-expected.png | bin | 7646 -> 7951 bytes | |||
| -rw-r--r-- | tests/regression/throwntogethertest/polygon-tests-expected.png | bin | 8797 -> 9626 bytes | |||
| -rw-r--r-- | tests/regression/throwntogethertest/render-2d-tests-expected.png | bin | 7646 -> 7951 bytes |
8 files changed, 11 insertions, 2 deletions
diff --git a/tests/regression/cgalpngtest/polygon-tests-expected.png b/tests/regression/cgalpngtest/polygon-tests-expected.png Binary files differindex 5ceabe8..28e4e9f 100644 --- a/tests/regression/cgalpngtest/polygon-tests-expected.png +++ b/tests/regression/cgalpngtest/polygon-tests-expected.png diff --git a/tests/regression/cgalpngtest/render-2d-tests-expected.png b/tests/regression/cgalpngtest/render-2d-tests-expected.png Binary files differindex 19ea16a..2418968 100644 --- a/tests/regression/cgalpngtest/render-2d-tests-expected.png +++ b/tests/regression/cgalpngtest/render-2d-tests-expected.png diff --git a/tests/regression/dumptest/polygon-tests-expected.csg b/tests/regression/dumptest/polygon-tests-expected.csg index 56995a5..e19bcb0 100644 --- a/tests/regression/dumptest/polygon-tests-expected.csg +++ b/tests/regression/dumptest/polygon-tests-expected.csg @@ -33,4 +33,7 @@ group() { multmatrix([[1, 0, 0, 2], [0, 1, 0, -4], [0, 0, 1, 0], [0, 0, 0, 1]]) { polygon(points = [[0, 0], [1, 0], [1, 1], [0, 0]], paths = undef, convexity = 1); } + multmatrix([[1, 0, 0, -2], [0, 1, 0, -4], [0, 0, 1, 0], [0, 0, 0, 1]]) { + polygon(points = [[0, 0], [1, 0], [1, 1], [0, 1], [0.2, 0.2], [0.8, 0.2], [0.8, 0.8], [0.2, 0.8]], paths = [[0, 1, 2, 3], [4, 5, 6, 7]], convexity = 1); + } } diff --git a/tests/regression/dumptest/render-2d-tests-expected.csg b/tests/regression/dumptest/render-2d-tests-expected.csg index 75739b3..bcc5e96 100644 --- a/tests/regression/dumptest/render-2d-tests-expected.csg +++ b/tests/regression/dumptest/render-2d-tests-expected.csg @@ -1,8 +1,14 @@ group() { render(convexity = 1) { difference() { - square(size = [100, 100], center = true); - circle($fn = 0, $fa = 12, $fs = 2, r = 30); + square(size = [10, 10], center = true); + circle($fn = 0, $fa = 12, $fs = 2, r = 3); + } + } + multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { + render(convexity = 1) { + square(size = [10, 10], center = true); + circle($fn = 0, $fa = 12, $fs = 2, r = 3); } } } diff --git a/tests/regression/opencsgtest/polygon-tests-expected.png b/tests/regression/opencsgtest/polygon-tests-expected.png Binary files differindex fe84a80..94bd131 100644 --- a/tests/regression/opencsgtest/polygon-tests-expected.png +++ b/tests/regression/opencsgtest/polygon-tests-expected.png diff --git a/tests/regression/opencsgtest/render-2d-tests-expected.png b/tests/regression/opencsgtest/render-2d-tests-expected.png Binary files differindex 0bf6288..47e57dd 100644 --- a/tests/regression/opencsgtest/render-2d-tests-expected.png +++ b/tests/regression/opencsgtest/render-2d-tests-expected.png diff --git a/tests/regression/throwntogethertest/polygon-tests-expected.png b/tests/regression/throwntogethertest/polygon-tests-expected.png Binary files differindex 779b878..2ce6b75 100644 --- a/tests/regression/throwntogethertest/polygon-tests-expected.png +++ b/tests/regression/throwntogethertest/polygon-tests-expected.png diff --git a/tests/regression/throwntogethertest/render-2d-tests-expected.png b/tests/regression/throwntogethertest/render-2d-tests-expected.png Binary files differindex 0bf6288..47e57dd 100644 --- a/tests/regression/throwntogethertest/render-2d-tests-expected.png +++ b/tests/regression/throwntogethertest/render-2d-tests-expected.png |
