summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-28 18:50:10 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-28 18:50:10 -0800
commitc1ae6160a5f277176063f10d5cde39673aedd419 (patch)
tree74602bf41aa8dc6d7fddda7e30c5988e497d15af /indra/newview/pipeline.cpp
parent3e1cd883d59d93218edad7e8f3932d42bb9f0f82 (diff)
cheaply resurrect the difference between spotlight and omnidirectional, as far as the shader is concerned.
not complete.
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 891f83e877..2a1ed1b5ab 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4563,7 +4563,6 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
glLightfv(gllight, GL_POSITION, light_pos_gl.mV);
glLightfv(gllight, GL_DIFFUSE, light_color.mV);
glLightfv(gllight, GL_AMBIENT, LLColor4::black.mV);
- glLightfv(gllight, GL_SPECULAR, LLColor4::black.mV);
glLightf (gllight, GL_CONSTANT_ATTENUATION, 0.0f);
glLightf (gllight, GL_LINEAR_ATTENUATION, atten);
glLightf (gllight, GL_QUADRATIC_ATTENUATION, quad);
@@ -4577,11 +4576,16 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
glLightfv(gllight, GL_SPOT_DIRECTION, at_axis.mV);
glLightf (gllight, GL_SPOT_EXPONENT, 1.0f); // 1.0 = good old dot product
glLightf (gllight, GL_SPOT_CUTOFF, 90.0f); // hemisphere
+ glLightfv(gllight, GL_SPECULAR, LLColor4::black.mV);
}
else // omnidirectional (point) light
{
glLightf (gllight, GL_SPOT_EXPONENT, 0.0f);
glLightf (gllight, GL_SPOT_CUTOFF, 180.0f);
+
+ // we use specular.w = 1.0 as a cheap hack for the shaders to know that this is omnidirectional rather than a spotlight
+ const float specular = {0.f, 0.f, 0.f, 1.f},
+ glLightfv(gllight, GL_SPECULAR, LLColor4::black.mV);
}
cur_light++;
if (cur_light >= 8)