From cd48894563052baeddff64f6bbc13ccc7fa6e081 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Thu, 19 Feb 2015 20:10:11 -0500 Subject: Added CRT mesh! Also a character sprite, changed up the map file format, fixed some shader bugs --- shaders/final.fragment | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'shaders/final.fragment') diff --git a/shaders/final.fragment b/shaders/final.fragment index 5feccb9..7eeb78e 100644 --- a/shaders/final.fragment +++ b/shaders/final.fragment @@ -15,14 +15,14 @@ const vec2 UVScalar = vec2(1.0, 1.0); const vec2 UVOffset = vec2(0.0, 0.0); const vec2 CRTMask_Scale = vec2(85.0, 153.6)*4.0; const vec2 CRTMask_Offset = vec2(0.0, 0.0); -const float Tuning_Overscan = 1.0; +const float Tuning_Overscan = 1.08; const float Tuning_Dimming = 0.0; -const float Tuning_Satur = 1.35; +const float Tuning_Satur = 1.0; const float Tuning_ReflScalar = 0.3; const float Tuning_Barrel = 0; //0.12; -const float Tuning_Scanline_Brightness = 0.5; +const float Tuning_Scanline_Brightness = 0.45; const float Tuning_Scanline_Opacity = 0.5; -const float Tuning_Diff_Brightness = 0.5; +const float Tuning_Diff_Brightness = 0.75; const float Tuning_Spec_Brightness = 0.35; const float Tuning_Spec_Power = 50.0; const float Tuning_Fres_Brightness = 1.0; @@ -86,7 +86,7 @@ void main() vec4 emissive = sampleCRT(UV); vec4 nearfinal = colorfres + colordiff + colorspec + emissive; - vec4 final = nearfinal * mix(vec4(1,1,1,1), vec4(0,0,0,0), Tuning_Dimming); + //vec4 final = nearfinal * mix(vec4(1,1,1,1), vec4(0,0,0, 0), Tuning_Dimming); - color = final.rgb; + color = nearfinal.rgb; } -- cgit 1.4.1