TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: fix incorrect behavior if mat has either ambient or diffuse

Browse Source 
This might have only been an issue in some drivers (not sure, spec is a bit vague here).
Apparently we need to call glMaterial *after* the color material setting has been disabled for it to stick.

Fixes #369
This commit is contained in:
rdb 2018-08-05 12:51:27 +02:00
parent 60468b0bec
commit 8348f16665
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -7633,7 +7633,6 @@ do_issue_material() {
} else if (material->has_ambient()) {
// The material specifies an ambient, but not a diffuse component. The
// diffuse component comes from the object's color.
call_glMaterialfv(face, GL_AMBIENT, material->get_ambient());
if (has_material_force_color) {
glDisable(GL_COLOR_MATERIAL);
call_glMaterialfv(face, GL_DIFFUSE, _material_force_color);
@ -7643,11 +7642,11 @@ do_issue_material() {
#endif // OPENGLES
glEnable(GL_COLOR_MATERIAL);
}
call_glMaterialfv(face, GL_AMBIENT, material->get_ambient());
} else if (material->has_diffuse()) {
// The material specifies a diffuse, but not an ambient component. The
// ambient component comes from the object's color.
call_glMaterialfv(face, GL_DIFFUSE, material->get_diffuse());
if (has_material_force_color) {
glDisable(GL_COLOR_MATERIAL);
call_glMaterialfv(face, GL_AMBIENT, _material_force_color);
@ -7657,6 +7656,7 @@ do_issue_material() {
#endif // OPENGLES
glEnable(GL_COLOR_MATERIAL);
}
call_glMaterialfv(face, GL_DIFFUSE, material->get_diffuse());
} else {
// The material specifies neither a diffuse nor an ambient component.