diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-13 23:00:10 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-13 23:00:10 -0500 |
commit | 224645d1071c14b4829dbb3ae35870868fcff85a (patch) | |
tree | f84f540eee09315eb0a689c523946ffa03f4fea0 /shaders/ntsc.fragment | |
parent | 3df19e45e737a1b9395a9a258e3263e444ebedd7 (diff) | |
download | therapy-224645d1071c14b4829dbb3ae35870868fcff85a.tar.gz therapy-224645d1071c14b4829dbb3ae35870868fcff85a.tar.bz2 therapy-224645d1071c14b4829dbb3ae35870868fcff85a.zip |
Fixed inconsistent rendering failure
The issue appears to have been caused by blending with unset alpha channels. Also included the re-ordered player character sprite image. The CMake file has been updated to include linking against some Apple libraries that are usually already included in GLFW3. refs #1
Diffstat (limited to 'shaders/ntsc.fragment')
-rw-r--r-- | shaders/ntsc.fragment | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shaders/ntsc.fragment b/shaders/ntsc.fragment index 56fb1c4..d6ae904 100644 --- a/shaders/ntsc.fragment +++ b/shaders/ntsc.fragment | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | in vec2 UV; | 3 | in vec2 UV; |
4 | 4 | ||
5 | out vec3 color; | 5 | out vec4 color; |
6 | 6 | ||
7 | uniform sampler2D curFrameSampler; | 7 | uniform sampler2D curFrameSampler; |
8 | uniform sampler2D NTSCArtifactSampler; | 8 | uniform sampler2D NTSCArtifactSampler; |
@@ -61,5 +61,5 @@ void main() | |||
61 | Cur_Local = clamp(Cur_Local + (offset * Tuning_Sharp * mix(vec4(1,1,1,1), NTSCArtifact, Tuning_NTSC)), vec4(0,0,0,0), vec4(1,1,1,1)); | 61 | Cur_Local = clamp(Cur_Local + (offset * Tuning_Sharp * mix(vec4(1,1,1,1), NTSCArtifact, Tuning_NTSC)), vec4(0,0,0,0), vec4(1,1,1,1)); |
62 | Cur_Local = clamp(max(Cur_Local, Tuning_Persistence * (1.0 / (1.0 + (2.0 * Tuning_Bleed))) * (Prev_Local + ((Prev_Left + Prev_Right) * Tuning_Bleed))), vec4(0,0,0,0), vec4(1,1,1,1)); | 62 | Cur_Local = clamp(max(Cur_Local, Tuning_Persistence * (1.0 / (1.0 + (2.0 * Tuning_Bleed))) * (Prev_Local + ((Prev_Left + Prev_Right) * Tuning_Bleed))), vec4(0,0,0,0), vec4(1,1,1,1)); |
63 | 63 | ||
64 | color = Cur_Local.xyz; | 64 | color = vec4(Cur_Local.rgb, 1.0); |
65 | } | 65 | } |