diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-08-16 14:57:27 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-08-16 14:57:27 +0000 |
| commit | 98d926afd7fba39cac373a89705851ad8bb2258e (patch) | |
| tree | f4a9195a4f04140c6eeebe1a428a658b58a24549 /indra/llinventory | |
| parent | 886fe3eefc8688df206e7b397a6b9438c7492f5f (diff) | |
| parent | 8dc048be46f167ab1be993ca22b79997a491c680 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #478)
SL-11589. SL-11212
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 434270d178..35bd9a2254 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -1313,23 +1313,10 @@ void LLSettingsSky::calculateLightSettings() const componentMultBy(sunlight, componentExp((light_atten * -1.f) * lighty)); componentMultBy(sunlight, light_transmittance); - F32 max_color = llmax(sunlight.mV[0], sunlight.mV[1], sunlight.mV[2]); - if (max_color > 1.0f) - { - sunlight *= 1.0f/max_color; - } - //increase ambient when there are more clouds LLColor3 tmpAmbient = ambient + (smear(1.f) - ambient) * cloud_shadow * 0.5; componentMultBy(tmpAmbient, light_transmittance); - //tmpAmbient = LLColor3::clamp(tmpAmbient, getGamma(), 1.0f); - max_color = llmax(tmpAmbient.mV[0], tmpAmbient.mV[1], tmpAmbient.mV[2]); - if (max_color > 1.0f) - { - tmpAmbient *= 1.0f/max_color; - } - //brightness of surface both sunlight and ambient mSunDiffuse = sunlight; mSunAmbient = tmpAmbient; @@ -1347,7 +1334,6 @@ void LLSettingsSky::calculateLightSettings() const LLColor3 moonlight_b(0.66, 0.66, 1.2); // scotopic ambient value componentMultBy(moonlight, componentExp((light_atten * -1.f) * lighty)); - clampColor(moonlight, getGamma(), 1.0f); mMoonDiffuse = componentMult(moonlight, light_transmittance) * moon_brightness; mMoonAmbient = componentMult(moonlight_b, light_transmittance) * 0.0125f; |