RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
David Rose 2001-05-01 16:47:17 +00:00
parent 98a4f21207
commit ffcb2fb123
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/glgsg/glGraphicsStateGuardian.cxx
View File

@ -2172,13 +2172,17 @@ draw_pixel_buffer(PixelBuffer *pb, const DisplayRegion *dr,
////////////////////////////////////////////////////////////////////
void GLGraphicsStateGuardian::apply_material(const Material *material) {
GLenum face = material->get_twoside() ? GL_FRONT_AND_BACK : GL_FRONT;
glMaterialfv(face, GL_SPECULAR, material->get_specular().get_data());
glMaterialfv(face, GL_EMISSION, material->get_emission().get_data());
glMaterialf(face, GL_SHININESS, material->get_shininess());
if (material->has_ambient() && material->has_diffuse()) {
// The material has both an ambient and diffuse specified. This
// means we do not need glMaterialColor().
glDisable(GL_COLOR_MATERIAL);
glMaterialfv(face, GL_AMBIENT, material->get_ambient().get_data());
glMaterialfv(face, GL_DIFFUSE, material->get_diffuse().get_data());
glDisable(GL_COLOR_MATERIAL);
} else if (material->has_ambient()) {
// The material specifies an ambient, but not a diffuse component.
@ -2190,7 +2194,7 @@ void GLGraphicsStateGuardian::apply_material(const Material *material) {
} else if (material->has_diffuse()) {
// The material specifies a diffuse, but not an ambient component.
// The ambient component comes from the object's color.
glMaterialfv(face, GL_AMBIENT, material->get_ambient().get_data());
glMaterialfv(face, GL_DIFFUSE, material->get_diffuse().get_data());
glColorMaterial(face, GL_AMBIENT);
glEnable(GL_COLOR_MATERIAL);
@ -2200,10 +2204,6 @@ void GLGraphicsStateGuardian::apply_material(const Material *material) {
glColorMaterial(face, GL_AMBIENT_AND_DIFFUSE);
glEnable(GL_COLOR_MATERIAL);
}
glMaterialfv(face, GL_SPECULAR, material->get_specular().get_data());
glMaterialfv(face, GL_EMISSION, material->get_emission().get_data());
glMaterialf(face, GL_SHININESS, material->get_shininess());
call_glLightModelLocal(material->get_local());
call_glLightModelTwoSide(material->get_twoside());