summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-12-25 23:38:03 (GMT)
committerMarius Kintel <marius@kintel.net>2011-12-25 23:38:03 (GMT)
commitc4bffdaf37fdf72a84a225ec584d3698fe398857 (patch)
tree503b819d69c00f007709cfee0f332c7adc7ad818 /tests
parent3e64e63b0113a99666ad68aa3e82bb7b80324d9b (diff)
Color overriding now works. The outermost color will win if multiple colors are specified for the same object
Diffstat (limited to 'tests')
-rw-r--r--tests/regression/dumptest/testcolornames-expected.txt4
-rw-r--r--tests/regression/opencsgtest/color-tests-expected.pngbin10950 -> 10389 bytes
-rw-r--r--tests/regression/throwntogethertest/color-tests-expected.pngbin10215 -> 9795 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/regression/dumptest/testcolornames-expected.txt b/tests/regression/dumptest/testcolornames-expected.txt
index 56e664f..63b5e70 100644
--- a/tests/regression/dumptest/testcolornames-expected.txt
+++ b/tests/regression/dumptest/testcolornames-expected.txt
@@ -49,7 +49,7 @@
}
}
multmatrix([[1, 0, 0, 1], [0, 1, 0, 1], [0, 0, 1, 0], [0, 0, 0, 1]]) {
- color([1, 0.713725, 0.756863, 1]) {
+ color([1, 0.713726, 0.756863, 1]) {
sphere($fn = 5, $fa = 12, $fs = 2, r = 0.8);
}
}
@@ -79,7 +79,7 @@
}
}
multmatrix([[1, 0, 0, 8], [0, 1, 0, 1], [0, 0, 1, 0], [0, 0, 0, 1]]) {
- color([1, 0.498039, 0.313725, 1]) {
+ color([1, 0.498039, 0.313726, 1]) {
sphere($fn = 5, $fa = 12, $fs = 2, r = 0.8);
}
}
diff --git a/tests/regression/opencsgtest/color-tests-expected.png b/tests/regression/opencsgtest/color-tests-expected.png
index 82ba36a..5b35312 100644
--- a/tests/regression/opencsgtest/color-tests-expected.png
+++ b/tests/regression/opencsgtest/color-tests-expected.png
Binary files differ
diff --git a/tests/regression/throwntogethertest/color-tests-expected.png b/tests/regression/throwntogethertest/color-tests-expected.png
index 5d4ed89..8fb69b1 100644
--- a/tests/regression/throwntogethertest/color-tests-expected.png
+++ b/tests/regression/throwntogethertest/color-tests-expected.png
Binary files differ
contact: Jan Huwald // Impressum