summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingssky.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llinventory/llsettingssky.cpp')
-rw-r--r--indra/llinventory/llsettingssky.cpp39
1 files changed, 38 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index ce6244d038..f773b64bde 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -601,7 +601,7 @@ void LLSettingsSky::blend(LLSettingsBase::ptr_t &end, F64 blendf)
mSettingFlags |= other->mSettingFlags;
- mCanAutoAdjust = false; // no point?
+ mCanAutoAdjust = other->mCanAutoAdjust;
mSunRotation = slerp((F32)blendf, mSunRotation, other->mSunRotation);
mMoonRotation = slerp((F32)blendf, mMoonRotation, other->mMoonRotation);
@@ -1177,6 +1177,11 @@ void LLSettingsSky::loadValuesFromLLSD()
mReflectionProbeAmbiance = (F32)settings[SETTING_REFLECTION_PROBE_AMBIANCE].asReal();
}
+ mHDRMax = 2.0f;
+ mHDRMin = 0.5f;
+ mHDROffset = 1.0f;
+ mTonemapMix = 1.0f;
+
mSunTextureId = settings[SETTING_SUN_TEXTUREID].asUUID();
mMoonTextureId = settings[SETTING_MOON_TEXTUREID].asUUID();
mCloudTextureId = settings[SETTING_CLOUD_TEXTUREID].asUUID();
@@ -2027,6 +2032,38 @@ F32 LLSettingsSky::getGamma() const
return mGamma;
}
+F32 LLSettingsSky::getHDRMin() const
+{
+ if (mCanAutoAdjust)
+ return 0.f;
+
+ return mHDRMin;
+}
+
+F32 LLSettingsSky::getHDRMax() const
+{
+ if (mCanAutoAdjust)
+ return 0.f;
+
+ return mHDRMax;
+}
+
+F32 LLSettingsSky::getHDROffset() const
+{
+ if (mCanAutoAdjust)
+ return 1.0f;
+
+ return mHDROffset;
+}
+
+F32 LLSettingsSky::getTonemapMix() const
+{
+ if (mCanAutoAdjust)
+ return 0.0f;
+
+ return mTonemapMix;
+}
+
void LLSettingsSky::setGamma(F32 val)
{
mGamma = val;