summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Paul <Torsten.Paul@gmx.de>2013-10-20 20:03:09 (GMT)
committerTorsten Paul <Torsten.Paul@gmx.de>2013-10-21 17:47:55 (GMT)
commit74082c8cff46863fe56ddc9de93cca57b610c4d9 (patch)
treec80b9777d10714790fe278b5527da05fc018945a
parent141f43498c6eaa7a59a053e28ae89d67f81c361e (diff)
Extend circle tests to cover the new diameter parameter.
-rw-r--r--testdata/scad/features/circle-tests.scad4
-rw-r--r--tests/regression/cgalpngtest/circle-tests-expected.pngbin7373 -> 4355 bytes
-rw-r--r--tests/regression/dumptest/circle-tests-expected.csg8
-rw-r--r--tests/regression/opencsgtest/circle-tests-expected.pngbin8418 -> 6067 bytes
-rw-r--r--tests/regression/throwntogethertest/circle-tests-expected.pngbin8418 -> 6067 bytes
5 files changed, 10 insertions, 2 deletions
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
--- a/tests/regression/cgalpngtest/circle-tests-expected.png
+++ b/tests/regression/cgalpngtest/circle-tests-expected.png
Binary files 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
--- a/tests/regression/opencsgtest/circle-tests-expected.png
+++ b/tests/regression/opencsgtest/circle-tests-expected.png
Binary files differ
diff --git a/tests/regression/throwntogethertest/circle-tests-expected.png b/tests/regression/throwntogethertest/circle-tests-expected.png
index 06f7d9c..2d5bde0 100644
--- a/tests/regression/throwntogethertest/circle-tests-expected.png
+++ b/tests/regression/throwntogethertest/circle-tests-expected.png
Binary files differ
contact: Jan Huwald // Impressum