mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-01 17:41:23 +00:00
Code Issues Releases Wiki Activity

Merge branch 'remove_forgotten_code' into 'master'

Browse source 
Remove forgotten commented-out debugging code

See merge request OpenMW/openmw!2319

(cherry picked from commit d9ea6e36fa)

59a0d9c0 Update files/data/shaders/bloomlinear.omwfx
09a39c87 Remove more unused code
This commit is contained in:
psi29a 2022-08-25 08:55:42 +00:00
parent 649ca6b8e6
commit cc0df8f43c
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
files/data/shaders/bloomlinear.omwfx
View file

@ -191,17 +191,9 @@ fragment vertical(target=RT_Vertical, rt1=RT_Horizontal) {
fragment final(rt1=RT_Vertical) { fragment final(rt1=RT_Vertical) {
omw_In vec2 omw_TexCoord; omw_In vec2 omw_TexCoord;
float clampify(float x, float clamp)
{
if(x < clamp)
return x;
return ((x-clamp)*0.5)+clamp;
}
void main() void main()
{ {
vec3 color = vec3(0.0); vec3 color = omw_Texture2D(RT_Vertical, omw_TexCoord).rgb;
color = omw_Texture2D(RT_Vertical, omw_TexCoord).rgb;
// add dithering (in gamma-compressed light, because monitors are sRGB) // add dithering (in gamma-compressed light, because monitors are sRGB)
color = powv(color, 1.0/uGamma); color = powv(color, 1.0/uGamma);
color += (scramblev2(omw_TexCoord).rgb/255.0 - vec3(0.5/255.0))*2.0; color += (scramblev2(omw_TexCoord).rgb/255.0 - vec3(0.5/255.0))*2.0;
@ -218,7 +210,6 @@ fragment final(rt1=RT_Vertical) {
vec3 base_color = powv(omw_GetLastShader(omw_TexCoord).rgb, uGamma); vec3 base_color = powv(omw_GetLastShader(omw_TexCoord).rgb, uGamma);
vec3 add_color = base_color + color * uStrength * 0.5; vec3 add_color = base_color + color * uStrength * 0.5;
omw_FragColor = vec4(powv(add_color, 1.0/uGamma), 1.0); omw_FragColor = vec4(powv(add_color, 1.0/uGamma), 1.0);
//omw_FragColor = vec4(powv(color, 1.0/uGamma), 1.0);
} }
} }