Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2012-01-24 04:36:42 +0000
committerEvan Goers <mega@osirion.org>2012-01-24 04:36:42 +0000
commitd20adb868fe02e9e7aa8a262b3cd4c5dd01d5eea (patch)
tree57ac6f38302bd143cc89ee5217e6788eef88b20e /src/render/draw.cc
parentb8e725f88fde5bfec67e5213f7e1c183bac63e33 (diff)
Got rid of r_diffuse/r_specular/r_ambient.
Diffstat (limited to 'src/render/draw.cc')
-rw-r--r--src/render/draw.cc8
1 files changed, 4 insertions, 4 deletions
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;