diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-07 20:02:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-07 20:02:51 (GMT) |
| commit | 0d619e5ac155e37c432d57062d8224a58c9d59ab (patch) | |
| tree | 10183df17cd4786ee1ef43b95c988fefd13ca990 /tests/regression | |
| parent | aa8aee623adc74cbfe87f9e92e30be4a9ed3a7c8 (diff) | |
| parent | b028b704e029a5161d3703efda35642a37c28cb6 (diff) | |
Merge branch 'master' into linear_extrude_argument
Diffstat (limited to 'tests/regression')
| -rw-r--r-- | tests/regression/cgalpngtest/import_dxf-tests-expected.png | bin | 9919 -> 4286 bytes | |||
| -rw-r--r-- | tests/regression/cgalpngtest/import_stl-tests-expected.png | bin | 9164 -> 5758 bytes | |||
| -rw-r--r-- | tests/regression/dumptest/import_dxf-tests-expected.txt | 3 | ||||
| -rw-r--r-- | tests/regression/dumptest/import_stl-tests-expected.txt | 3 | ||||
| -rw-r--r-- | tests/regression/opencsgtest/import_dxf-tests-expected.png | bin | 9289 -> 4491 bytes | |||
| -rw-r--r-- | tests/regression/opencsgtest/import_stl-tests-expected.png | bin | 9438 -> 6207 bytes | |||
| -rw-r--r-- | tests/regression/throwntogethertest/import_dxf-tests-expected.png | bin | 4414 -> 4503 bytes | |||
| -rw-r--r-- | tests/regression/throwntogethertest/import_stl-tests-expected.png | bin | 9438 -> 6207 bytes |
8 files changed, 6 insertions, 0 deletions
diff --git a/tests/regression/cgalpngtest/import_dxf-tests-expected.png b/tests/regression/cgalpngtest/import_dxf-tests-expected.png Binary files differindex 7c8a63e..f885b09 100644 --- a/tests/regression/cgalpngtest/import_dxf-tests-expected.png +++ b/tests/regression/cgalpngtest/import_dxf-tests-expected.png diff --git a/tests/regression/cgalpngtest/import_stl-tests-expected.png b/tests/regression/cgalpngtest/import_stl-tests-expected.png Binary files differindex 08aa225..de7638a 100644 --- a/tests/regression/cgalpngtest/import_stl-tests-expected.png +++ b/tests/regression/cgalpngtest/import_stl-tests-expected.png diff --git a/tests/regression/dumptest/import_dxf-tests-expected.txt b/tests/regression/dumptest/import_dxf-tests-expected.txt index 977efcc..d98b3e2 100644 --- a/tests/regression/dumptest/import_dxf-tests-expected.txt +++ b/tests/regression/dumptest/import_dxf-tests-expected.txt @@ -21,4 +21,7 @@ multmatrix([[1, 0, 0, 0], [0, 1, 0, 200], [0, 0, 1, 0], [0, 0, 0, 1]]) { import(file = "../../dxf/multiple-layers.dxf", layer = "Layer with a pretty long name including \\ \"special\" /'\\\\ characters", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2); } + multmatrix([[1, 0, 0, 200], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { + import(file = "../../dxf/polygons.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2); + } diff --git a/tests/regression/dumptest/import_stl-tests-expected.txt b/tests/regression/dumptest/import_stl-tests-expected.txt index 648a207..947f137 100644 --- a/tests/regression/dumptest/import_stl-tests-expected.txt +++ b/tests/regression/dumptest/import_stl-tests-expected.txt @@ -5,4 +5,7 @@ multmatrix([[1, 0, 0, 4], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { import(file = "import_bin.stl", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2); } + multmatrix([[1, 0, 0, 0], [0, 1, 0, 2], [0, 0, 1, 0], [0, 0, 0, 1]]) { + import(file = "import.stl", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2); + } diff --git a/tests/regression/opencsgtest/import_dxf-tests-expected.png b/tests/regression/opencsgtest/import_dxf-tests-expected.png Binary files differindex 6e568c7..010a222 100644 --- a/tests/regression/opencsgtest/import_dxf-tests-expected.png +++ b/tests/regression/opencsgtest/import_dxf-tests-expected.png diff --git a/tests/regression/opencsgtest/import_stl-tests-expected.png b/tests/regression/opencsgtest/import_stl-tests-expected.png Binary files differindex 19e233a..0bd9ab6 100644 --- a/tests/regression/opencsgtest/import_stl-tests-expected.png +++ b/tests/regression/opencsgtest/import_stl-tests-expected.png diff --git a/tests/regression/throwntogethertest/import_dxf-tests-expected.png b/tests/regression/throwntogethertest/import_dxf-tests-expected.png Binary files differindex e8173d9..f5ef9fc 100644 --- a/tests/regression/throwntogethertest/import_dxf-tests-expected.png +++ b/tests/regression/throwntogethertest/import_dxf-tests-expected.png diff --git a/tests/regression/throwntogethertest/import_stl-tests-expected.png b/tests/regression/throwntogethertest/import_stl-tests-expected.png Binary files differindex 19e233a..0bd9ab6 100644 --- a/tests/regression/throwntogethertest/import_stl-tests-expected.png +++ b/tests/regression/throwntogethertest/import_stl-tests-expected.png |
