livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-1873 

Make range of star brightness in code and in UI 0-500 (not 512).
master
Graham Linden 2018-09-17 19:48:58 +01:00
parent 57d89c8094
commit 9581a197ac
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llinventory/llsettingssky.cpp
View File

@ -534,7 +534,7 @@ LLSettingsSky::validation_list_t LLSettingsSky::validationList()
boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.25f)(20.0f))), LLSD::Real(1.0))); boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.25f)(20.0f))), LLSD::Real(1.0)));
validation.push_back(Validator(SETTING_MOON_TEXTUREID, false, LLSD::TypeUUID)); validation.push_back(Validator(SETTING_MOON_TEXTUREID, false, LLSD::TypeUUID));
validation.push_back(Validator(SETTING_STAR_BRIGHTNESS, true, LLSD::TypeReal, validation.push_back(Validator(SETTING_STAR_BRIGHTNESS, true, LLSD::TypeReal,
boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(512.0f))))); boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(500.0f)))));
validation.push_back(Validator(SETTING_SUNLIGHT_COLOR, true, LLSD::TypeArray, validation.push_back(Validator(SETTING_SUNLIGHT_COLOR, true, LLSD::TypeArray,
boost::bind(&Validator::verifyVectorMinMax, _1, boost::bind(&Validator::verifyVectorMinMax, _1,
LLSD(LLSDArray(0.0f)(0.0f)(0.0f)("*")), LLSD(LLSDArray(0.0f)(0.0f)(0.0f)("*")),
@ -784,7 +784,7 @@ LLSD LLSettingsSky::translateLegacySettings(const LLSD& legacy)
} }
if (legacy.has(SETTING_STAR_BRIGHTNESS)) if (legacy.has(SETTING_STAR_BRIGHTNESS))
{ {
newsettings[SETTING_STAR_BRIGHTNESS] = LLSD::Real(legacy[SETTING_STAR_BRIGHTNESS].asReal()) * 256.0f; newsettings[SETTING_STAR_BRIGHTNESS] = LLSD::Real(legacy[SETTING_STAR_BRIGHTNESS].asReal() * 250.0f);
} }
if (legacy.has(SETTING_SUNLIGHT_COLOR)) if (legacy.has(SETTING_SUNLIGHT_COLOR))
{ {

2
indra/newview/lldrawpoolwlsky.cpp
View File

@ -293,7 +293,7 @@ void LLDrawPoolWLSky::renderStarsDeferred(void) const
LLGLEnable blend(GL_BLEND); LLGLEnable blend(GL_BLEND);
gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA); gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
F32 star_alpha = LLEnvironment::instance().getCurrentSky()->getStarBrightness() / 512.0f; F32 star_alpha = LLEnvironment::instance().getCurrentSky()->getStarBrightness() / 500.0f;
// If start_brightness is not set, exit // If start_brightness is not set, exit
if(star_alpha < 0.001f) if(star_alpha < 0.001f)

2
indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
View File

@ -171,7 +171,7 @@
layout="topleft" layout="topleft"
left_delta="5" left_delta="5"
min_val="0" min_val="0"
max_val="512" max_val="500"
name="star_brightness" name="star_brightness"
top_delta="15" top_delta="15"
width="250" width="250"