From 23f3b1471b2bbfe92252456f32c9ae55a9d1f213 Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Fri, 13 May 2016 12:48:11 -0400
Subject: Things flash red when hit

---
 shaders/world.frag | 7 ++++---
 shaders/world.vert | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'shaders')

diff --git a/shaders/world.frag b/shaders/world.frag
index c45b4a0..80af175 100644
--- a/shaders/world.frag
+++ b/shaders/world.frag
@@ -1,10 +1,11 @@
 uniform sampler2D sampler;
 
 varying vec2 texCoord;
+varying vec4 color;
 
 void main(){
-    vec4 color = texture2D(sampler, vec2(texCoord.x, 1-texCoord.y));
-    if(color.a <= .1)
+    vec4 pixTex = texture2D(sampler, vec2(texCoord.x, 1-texCoord.y));
+    if(pixTex.a <= .1)
         discard;
-    gl_FragColor = color;
+    gl_FragColor = pixTex * color;
 }
diff --git a/shaders/world.vert b/shaders/world.vert
index 1bedfd3..ce7fa5a 100644
--- a/shaders/world.vert
+++ b/shaders/world.vert
@@ -1,11 +1,14 @@
 attribute vec3 coord2d;
 attribute vec2 tex_coord;
 
+uniform vec4 tex_color;
 uniform mat4 ortho;
 
 varying vec2 texCoord;
+varying vec4 color;
 
 void main(){
+	color = tex_color;
     texCoord = tex_coord;
     gl_Position = ortho * vec4(coord2d.xyz, 1.0);
 }
-- 
cgit v1.2.3