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

DRTVWR-440: SL-12574: Tweak environment cube map to better match Windlight

master
Ptolemy 2020-02-07 16:17:15 -08:00
parent 90e3974b16
commit 4be51fa559
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,9 +147,9 @@ vec3 post_diffuse = color.rgb;
if (nh > 0.0)
{
float scontrib = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
vec3 sp = sun_contrib*scontrib / 16.0;
vec3 sp = sun_contrib*scontrib / 6.0;
sp = clamp(sp, vec3(0), vec3(1));
bloom += dot(sp, sp) / 6.0;
bloom += dot(sp, sp) / 4.0;
#if !defined(SUNLIGHT_KILL)
color += sp * spec.rgb;
#endif

4
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
View File

@ -155,9 +155,9 @@ vec3 post_diffuse = color.rgb;
if (nh > 0.0)
{
float scontrib = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
vec3 sp = sun_contrib*scontrib / 16.0;
vec3 sp = sun_contrib*scontrib / 6.0;
sp = clamp(sp, vec3(0), vec3(1));
bloom += dot(sp, sp) / 6.0;
bloom += dot(sp, sp) / 4.0;
#if !defined(SUNLIGHT_KILL)
color += sp * spec.rgb;
#endif

13
indra/newview/llface.cpp
View File

@ -1419,17 +1419,16 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
if (shiny_in_alpha)
{
static const GLfloat alpha[4] =
static const GLfloat SHININESS_TO_ALPHA[4] =
{
0.00f,
0.25f,
0.5f,
0.75f
0.0000f,
0.3333f,
0.6666f,
1.0000f
};
llassert(tep->getShiny() <= 3);
color.mV[3] = U8 (alpha[tep->getShiny()] * 255);
color.mV[3] = U8 (SHININESS_TO_ALPHA[tep->getShiny()] * 255);
}
}
}