From 2bb4648c0a92244d98a3dd0995e912eba80c4450 Mon Sep 17 00:00:00 2001 From: Evan Goers Date: Wed, 21 Mar 2012 14:01:06 +0000 Subject: Changed create_light() to add_light(). De-duplicated some magic numbers. --- src/render/draw.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/render/draw.cc') diff --git a/src/render/draw.cc b/src/render/draw.cc index 3b7acad..71b8631 100644 --- a/src/render/draw.cc +++ b/src/render/draw.cc @@ -54,6 +54,10 @@ bool draw_particles = true; bool draw_lights = true; size_t max_lights = 8; +float ambient_light_intensity = 0.1f; +float diffuse_light_intensity = 0.75f; +float specular_light_intensity = 0.75f; + GLenum zone_gllight = GL_LIGHT0; typedef std::map Globes; @@ -69,7 +73,7 @@ void pass_reset_lights() } // Lights -int create_light(float* location, float attenuation, math::Color color) +int add_light(float* location, float attenuation, math::Color color) { int gllight; @@ -93,9 +97,9 @@ int create_light(float* location, float attenuation, math::Color color) for (size_t i = 0; i < 3; i++) { gllight_location[i] = location[i]; - ambient_light[i] = color[i] * 0.1; - diffuse_light[i] = color[i] * 0.75; - specular_light[i] = color[i] * 0.75; + ambient_light[i] = color[i] * ambient_light_intensity; + diffuse_light[i] = color[i] * diffuse_light_intensity; + specular_light[i] = color[i] * specular_light_intensity; } gllight_location[3] = 1.0f; ambient_light[3] = 1.0f; @@ -169,7 +173,7 @@ void pass_prepare(float seconds) zone_light[i] = globe->location()[i]; zone_color[i] = globe->color()[i]; } - GLenum zone_gllight = create_light(zone_light, 0.00025f, globe->color()); + GLenum zone_gllight = add_light(zone_light, 0.00025f, globe->color()); gl::enable(zone_gllight); has_zone_light = true; } -- cgit v1.2.3