From 74082c8cff46863fe56ddc9de93cca57b610c4d9 Mon Sep 17 00:00:00 2001 From: Torsten Paul Date: Sun, 20 Oct 2013 22:03:09 +0200 Subject: Extend circle tests to cover the new diameter parameter. diff --git a/testdata/scad/features/circle-tests.scad b/testdata/scad/features/circle-tests.scad index 90cd9f6..57b1992 100644 --- a/testdata/scad/features/circle-tests.scad +++ b/testdata/scad/features/circle-tests.scad @@ -8,4 +8,6 @@ translate([6,-3,0]) circle(1, $fn=12); translate([0,-6,0]) circle(1, $fa=20, $fs=0.3); translate([3,-6,0]) circle(1, $fa=30, $fs=0.3); translate([6,-6,0]) circle(1, $fa=40, $fs=0.3); -translate([3,-9,0]) circle(1, $fn=0.1); +translate([0,-9,0]) circle(1, $fn=0.1); +translate([3,-9,0]) circle(d=2, $fn=8); +translate([6,-9,0]) circle(r=10, d=2, $fn=8); diff --git a/tests/regression/cgalpngtest/circle-tests-expected.png b/tests/regression/cgalpngtest/circle-tests-expected.png index d640042..39a3481 100644 Binary files a/tests/regression/cgalpngtest/circle-tests-expected.png and b/tests/regression/cgalpngtest/circle-tests-expected.png differ diff --git a/tests/regression/dumptest/circle-tests-expected.csg b/tests/regression/dumptest/circle-tests-expected.csg index b522850..3e183ee 100644 --- a/tests/regression/dumptest/circle-tests-expected.csg +++ b/tests/regression/dumptest/circle-tests-expected.csg @@ -27,7 +27,13 @@ group() { multmatrix([[1, 0, 0, 6], [0, 1, 0, -6], [0, 0, 1, 0], [0, 0, 0, 1]]) { circle($fn = 0, $fa = 40, $fs = 0.3, r = 1); } - multmatrix([[1, 0, 0, 3], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) { + multmatrix([[1, 0, 0, 0], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) { circle($fn = 0.1, $fa = 12, $fs = 2, r = 1); } + multmatrix([[1, 0, 0, 3], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) { + circle($fn = 8, $fa = 12, $fs = 2, r = 1); + } + multmatrix([[1, 0, 0, 6], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) { + circle($fn = 8, $fa = 12, $fs = 2, r = 1); + } } diff --git a/tests/regression/opencsgtest/circle-tests-expected.png b/tests/regression/opencsgtest/circle-tests-expected.png index 06f7d9c..20f9ca2 100644 Binary files a/tests/regression/opencsgtest/circle-tests-expected.png and b/tests/regression/opencsgtest/circle-tests-expected.png differ diff --git a/tests/regression/throwntogethertest/circle-tests-expected.png b/tests/regression/throwntogethertest/circle-tests-expected.png index 06f7d9c..2d5bde0 100644 Binary files a/tests/regression/throwntogethertest/circle-tests-expected.png and b/tests/regression/throwntogethertest/circle-tests-expected.png differ -- cgit v0.10.1