From 09153b17423678d47dfe666a0d8631e9583acd8a Mon Sep 17 00:00:00 2001
From: Vasco Lavos <vazkii@hotmail.com>
Date: Sat, 16 Jan 2016 00:46:47 +0000
Subject: [PATCH] Update beam.frag
---
src/main/resources/assets/bloodmagic/shaders/beam.frag | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/assets/bloodmagic/shaders/beam.frag b/src/main/resources/assets/bloodmagic/shaders/beam.frag
index 82fccbe1..baa63895 100644
--- a/src/main/resources/assets/bloodmagic/shaders/beam.frag
+++ b/src/main/resources/assets/bloodmagic/shaders/beam.frag
@@ -4,9 +4,7 @@
void main() {
vec2 texcoord = vec2(gl_TexCoord[0]);
vec4 color = texture2D(bgl_RenderedTexture, texcoord);
+ float r = sin(texcoord.x * 6 - 1.5 + sin(texcoord.y - time / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2;
- float gs = (color.r + color.g + color.b) / 3;
- float r = sin(texcoord.x * 6 - 1.5 + sin(texcoord.y - time / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2;
-
- gl_FragColor = vec4(gs, gs, max(gs, r), gl_Color.a);
+ gl_FragColor = vec4(gl_Color.r, gl_Color.g, max(gl_Color.b, r), gl_Color.a);
}