mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-23 15:40:42 +00:00
Merge branch 'remove_forgotten_code' into 'master'
Remove forgotten commented-out debugging code See merge request OpenMW/openmw!2319
This commit is contained in:
commit
d9ea6e36fa
@ -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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user