From 84088dee5868094daec6007c0343c6b8a824d68f Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Sat, 1 Jun 2013 16:11:15 -0400 Subject: Improved if-else test to include a multiple-children test diff --git a/testdata/scad/features/ifelse-tests.scad b/testdata/scad/features/ifelse-tests.scad index d8c777b..3c72d55 100644 --- a/testdata/scad/features/ifelse-tests.scad +++ b/testdata/scad/features/ifelse-tests.scad @@ -1,5 +1,11 @@ -if (true) cube(2, true); -else cylinder(r=1,h=2); +if (true) { + cube(2, true); + translate([-3,0,0]) cube(2, true); +} +else { + cylinder(r=1,h=2); + translate([-3,0,0]) cylinder(r=1,h=2); +} translate([3,0,0]) if (false) cylinder(r=1,h=2); diff --git a/tests/regression/cgalpngtest/ifelse-tests-expected.png b/tests/regression/cgalpngtest/ifelse-tests-expected.png index fcda7bc..6680498 100644 Binary files a/tests/regression/cgalpngtest/ifelse-tests-expected.png and b/tests/regression/cgalpngtest/ifelse-tests-expected.png differ diff --git a/tests/regression/dumptest/ifelse-tests-expected.txt b/tests/regression/dumptest/ifelse-tests-expected.txt index 1b60002..e2d3fce 100644 --- a/tests/regression/dumptest/ifelse-tests-expected.txt +++ b/tests/regression/dumptest/ifelse-tests-expected.txt @@ -1,5 +1,8 @@ group() { cube(size = [2, 2, 2], center = true); + multmatrix([[1, 0, 0, -3], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { + cube(size = [2, 2, 2], center = true); + } } multmatrix([[1, 0, 0, 3], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { group() { diff --git a/tests/regression/opencsgtest/ifelse-tests-expected.png b/tests/regression/opencsgtest/ifelse-tests-expected.png index 6dae4df..84e18e3 100644 Binary files a/tests/regression/opencsgtest/ifelse-tests-expected.png and b/tests/regression/opencsgtest/ifelse-tests-expected.png differ diff --git a/tests/regression/throwntogethertest/ifelse-tests-expected.png b/tests/regression/throwntogethertest/ifelse-tests-expected.png index 7f6374c..5cb1c4c 100644 Binary files a/tests/regression/throwntogethertest/ifelse-tests-expected.png and b/tests/regression/throwntogethertest/ifelse-tests-expected.png differ -- cgit v0.10.1