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

Merged in graham_linden/viewer-eep-graham (pull request #92) 

SL-1491 and SL-1873
master
Rider Linden 2018-09-17 19:04:32 +00:00
parent 53a93d3e73 9581a197ac
commit 027bc36259
5 changed files with 9 additions and 5 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)));
validation.push_back(Validator(SETTING_MOON_TEXTUREID, false, LLSD::TypeUUID));
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,
boost::bind(&Validator::verifyVectorMinMax, _1,
LLSD(LLSDArray(0.0f)(0.0f)(0.0f)("*")),
@ -784,7 +784,7 @@ LLSD LLSettingsSky::translateLegacySettings(const LLSD& legacy)
}
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))
{

3
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
View File

@ -174,7 +174,8 @@ void main()
if (norm.w < 0.5)
{
col = mix(atmosFragLighting(col, additive, atten), fullbrightFragAtmosTransport(col, atten, additive), diffuse.a);
vec3 add = additive * spec.a;
col = mix(atmosFragLighting(col, add, atten), fullbrightFragAtmosTransport(col, atten, add), diffuse.a);
col = mix(scaleFragSoftClip(col), fullbrightScaleSoftClipFrag(col, atten), diffuse.a);
}

3
indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsV.glsl
View File

@ -73,6 +73,9 @@ void setAmblitColor(vec3 v)
void setAdditiveColor(vec3 v)
{
// SL-1491 clamp additive term to something reasonable to prevent
// lens flares over non-reflective surfaces
v = clamp(v, vec3(0), vec3(0.2));
additive_color = v;
vary_AdditiveColor = v;
}

2
indra/newview/lldrawpoolwlsky.cpp
View File

@ -293,7 +293,7 @@ void LLDrawPoolWLSky::renderStarsDeferred(void) const
LLGLEnable blend(GL_BLEND);
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(star_alpha < 0.001f)

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

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