From 4e60d3e2d3f66471dff75732626451690a5bc8b5 Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Wed, 23 Mar 2016 08:24:55 -0400
Subject: Flickering lights and light that follows player

---
 frig.frag | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'frig.frag')

diff --git a/frig.frag b/frig.frag
index 07b4a8a..f750f2d 100644
--- a/frig.frag
+++ b/frig.frag
@@ -3,29 +3,33 @@ uniform sampler2D sampler;
 
 uniform int numLight;
 uniform vec2 lightLocation[64];
+uniform float fireFlicker[64];
 uniform vec3 lightColor;
 uniform float amb;
 
-float b = .0005;
-float minLight = .05;
-float radius = sqrt(1.0 / (b * minLight));
-
+float b = .0005f;
+float minLight = .05f;
+float radius = sqrt(1.0f / (b * minLight));
 //float radius = b*minlight;
 
+float rand(vec2 co){
+    return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
+}
+
 void main(){
-	vec4 color = vec4(0.0,0.0,0.0,0.0);
+	vec4 color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
 	for(int i = 0; i < numLight; i++){
 		vec2 loc = lightLocation[i];
 		float dist = length(loc - gl_FragCoord.xy);
 		//float attenuation=1.0/(1.0+0.01*dist+0.00000000001*dist*dist);
-		float attenuation = clamp(1.0 - dist*dist/(radius*radius), 0.0, 1.0); attenuation *= attenuation;
+		float attenuation = clamp(1.0f - dist*dist/(radius*radius), 0.0f, 1.0f); attenuation *= attenuation;
 
-		color += vec4(attenuation, attenuation, attenuation, 1.0) * vec4(lightColor, 1.0);
+		color += vec4(attenuation, attenuation, attenuation, 1.0f) * vec4(lightColor, 1.0f) * fireFlicker[i];
 	}
 	vec2 coords = gl_TexCoord[0].st;
 	vec4 tex = texture2D(sampler, coords);
 
-	color += vec4(amb,amb,amb,1.0+amb);
+	color += vec4(amb,amb,amb,1.0f+amb);
 	gl_FragColor = tex * vec4(color)*tex.a;
 }
 
@@ -36,4 +40,4 @@ void main(){
 	.00008		500
 	.00002		1000
 	.00005		2000
-*/
\ No newline at end of file
+*/
-- 
cgit v1.2.3