summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-29 20:15:10 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-29 20:15:10 +0100
commitd5c465b4ab263e568761f6197534f7ddcda8a5ee (patch)
tree32796e9f7717a6ff48dcdf54e1aef4f1469d3793 /indra/newview/pipeline.cpp
parent1eda16b31989448a211808a8144f0a5ffb0bce49 (diff)
MAINT-8817 remove automatic update of inv_proj matrix so sunLightF which expects it not to match the projection mat works again
Fix misspellinging in missing settings asset notification string Fix moon quat conversion to get proper directional rotation Add early out so attempting to set parcel env settings doesn't crash
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 7be05a1bcb..aadd059546 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6258,8 +6258,8 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
// Light 0 = Sun or Moon (All objects)
{
- LLVector4 sun_dir = environment.getSunDirectionCFR();
- LLVector4 moon_dir = environment.getMoonDirectionCFR();
+ LLVector4 sun_dir(environment.getSunDirection(), 0.0f);
+ LLVector4 moon_dir(environment.getMoonDirection(), 0.0f);
mSunDir.setVec(sun_dir);
mMoonDir.setVec(moon_dir);
@@ -8480,9 +8480,11 @@ void LLPipeline::renderDeferredLighting()
glh::vec4f tc(mSunDir.mV);
mat.mult_matrix_vec(tc);
mTransformedSunDir.set(tc.v);
+ mTransformedSunDir.normalize();
glh::vec4f tc_moon(mMoonDir.mV);
mTransformedMoonDir.set(tc_moon.v);
+ mTransformedMoonDir.normalize();
}
gGL.pushMatrix();
@@ -9096,9 +9098,11 @@ void LLPipeline::renderDeferredLightingToRT(LLRenderTarget* target)
glh::vec4f tc(mSunDir.mV);
mat.mult_matrix_vec(tc);
mTransformedSunDir.set(tc.v);
+ mTransformedSunDir.normalize();
glh::vec4f tc_moon(mMoonDir.mV);
mTransformedMoonDir.set(tc_moon.v);
+ mTransformedMoonDir.normalize();
}
gGL.pushMatrix();