From d20adb868fe02e9e7aa8a262b3cd4c5dd01d5eea Mon Sep 17 00:00:00 2001 From: Evan Goers Date: Tue, 24 Jan 2012 04:36:42 +0000 Subject: Got rid of r_diffuse/r_specular/r_ambient. --- src/render/draw.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/render/draw.cc') diff --git a/src/render/draw.cc b/src/render/draw.cc index f60ba1a..e40e3cc 100644 --- a/src/render/draw.cc +++ b/src/render/draw.cc @@ -90,7 +90,7 @@ void pass_prepare(float seconds) // zone ambient light GLfloat zone_ambient[4]; for (size_t i = 0; i < 3; i++) { - zone_ambient[i] = core::localplayer()->zone()->ambient_color()[i] * r_ambient->value(); + zone_ambient[i] = core::localplayer()->zone()->ambient_color()[i]; } zone_ambient[3] = 1.0f; glLightModelfv(GL_LIGHT_MODEL_AMBIENT, zone_ambient); @@ -123,9 +123,9 @@ void pass_prepare(float seconds) for (size_t i = 0; i < 3; i++) { zone_light[i] = globe->location()[i]; zone_color[i] = globe->color()[i]; - ambient_light[i] = globe->color()[i] * (r_ambient->value() * 0.1); - diffuse_light[i] = globe->color()[i] * (r_diffuse->value() * 0.8); - specular_light[i] = globe->color()[i] * (r_specular->value() * 0.4); + ambient_light[i] = globe->color()[i] * 0.1; + diffuse_light[i] = globe->color()[i] * 0.8; + specular_light[i] = globe->color()[i] * 0.4; } zone_light[3] = 1.0f; ambient_light[3] = 1.0f; -- cgit v1.2.3