summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-12-25 16:16:29 (GMT)
committerMarius Kintel <marius@kintel.net>2011-12-25 16:16:29 (GMT)
commit5db9bfc2ffa2e8df9388433e4da7bdfce434d2c5 (patch)
treecd01ad29b4865573f8f0e2d1945aa310401448a7
parent3572251a9139bf95f2217c2e9957668b6c82ccdc (diff)
Added test case for color override
-rw-r--r--testdata/scad/features/color-tests.scad1
-rw-r--r--tests/regression/cgalpngtest/color-tests-expected.pngbin9554 -> 8360 bytes
-rw-r--r--tests/regression/dumptest/color-tests-expected.txt9
3 files changed, 10 insertions, 0 deletions
diff --git a/testdata/scad/features/color-tests.scad b/testdata/scad/features/color-tests.scad
index 3ef2540..3fc98c8 100644
--- a/testdata/scad/features/color-tests.scad
+++ b/testdata/scad/features/color-tests.scad
@@ -13,3 +13,4 @@ translate([12,0,0]) color([0,0,1],0.5) object();
translate([24,0,0]) color(c="Green",alpha=0.2) object();
translate([-12,12,0]) color() object();
translate([-12,0,0]) color(alpha=0.5) object();
+translate([24,-12,0]) color([1,0,0]) color([0,0,1]) object();
diff --git a/tests/regression/cgalpngtest/color-tests-expected.png b/tests/regression/cgalpngtest/color-tests-expected.png
index 207fc5b..c7385d2 100644
--- a/tests/regression/cgalpngtest/color-tests-expected.png
+++ b/tests/regression/cgalpngtest/color-tests-expected.png
Binary files differ
diff --git a/tests/regression/dumptest/color-tests-expected.txt b/tests/regression/dumptest/color-tests-expected.txt
index 1224e2d..95fe012 100644
--- a/tests/regression/dumptest/color-tests-expected.txt
+++ b/tests/regression/dumptest/color-tests-expected.txt
@@ -52,4 +52,13 @@
}
}
}
+ multmatrix([[1, 0, 0, 24], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+ color([1, 0, 0, 1]) {
+ color([0, 0, 1, 1]) {
+ group() {
+ cube(size = [10, 10, 10], center = false);
+ }
+ }
+ }
+ }
contact: Jan Huwald // Impressum