vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into buildfix

felipesanches-svg
Marius Kintel 2011-12-25 17:44:06 +01:00
parent c5511b05ec 3e64e63b01
commit 1679a57240
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/glview.cc
View File

@ -105,7 +105,7 @@ void GLView::init()
void GLView::setRenderer(Renderer *r)
{
this->renderer = r;
updateGL();
if (r) updateGL(); // Let the last image stay, e.g. to avoid animation flickering
}
void GLView::initializeGL()

1
testdata/scad/features/color-tests.scad vendored
View File

@ -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();

BIN
tests/regression/cgalpngtest/color-tests-expected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

9
tests/regression/dumptest/color-tests-expected.txt
View File

@ -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);
}
}
}
}