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

merge

meow-7.2.2
Tofu Linden 2010-04-23 17:38:21 +01:00
parent 008873627d f313196363
commit 1a987e8d32
3 changed files with 3 additions and 9 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

@ -270,7 +270,6 @@ void main()
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
float scol = max(scol_ambocc.r, diffuse.a);
float ambocc = scol_ambocc.g;
float glowresult = 0.0;
calcAtmospherics(pos.xyz, ambocc);
@ -286,7 +285,6 @@ void main()
vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz));
float sa = dot(refnormpersp, vary_light.xyz);
vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).a;
glowresult = 0.08 * dot(dumbshiny.rgb, spec.rgb);
// screen-space cheap fakey reflection map
//
@ -336,5 +334,5 @@ void main()
col = scaleSoftClip(col);
gl_FragColor.rgb = col;
gl_FragColor.a = glowresult;
gl_FragColor.a = 0.0;
}

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

@ -269,7 +269,6 @@ void main()
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
float scol = max(scol_ambocc.r, diffuse.a);
float ambocc = scol_ambocc.g;
float glowresult = 0.0;
calcAtmospherics(pos.xyz, ambocc);
@ -285,7 +284,6 @@ void main()
vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz));
float sa = dot(refnormpersp, vary_light.xyz);
vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).a;
glowresult = 0.08 * dot(dumbshiny.rgb, spec.rgb);
// screen-space cheap fakey reflection map
//
@ -336,5 +334,5 @@ void main()
col = scaleSoftClip(col);
gl_FragColor.rgb = col;
gl_FragColor.a = glowresult;
gl_FragColor.a = 0.0;
}

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

@ -272,7 +272,6 @@ void main()
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
float scol = max(scol_ambocc.r, diffuse.a);
float ambocc = scol_ambocc.g;
float glowresult = 0.0;
calcAtmospherics(pos.xyz, ambocc);
@ -288,7 +287,6 @@ void main()
vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz));
float sa = dot(refnormpersp, vary_light.xyz);
vec3 dumbshiny = vary_SunlitColor*scol*texture2D(lightFunc, vec2(sa, spec.a)).a;
glowresult = 0.08 * dot(dumbshiny.rgb, spec.rgb);
// screen-space cheap fakey reflection map
//
@ -342,7 +340,7 @@ void main()
gl_FragColor.rgb = col;
//gl_FragColor.rgb = gi_col.rgb;
gl_FragColor.a = glowresult;
gl_FragColor.a = 0.0;
//gl_FragColor.rg = scol_ambocc.rg;
//gl_FragColor.rgb = texture2DRect(lightMap, vary_fragcoord.xy).rgb;