From 48174a4fb5468e4bfffb6c64f4113737f538a795 Mon Sep 17 00:00:00 2001
From: Faerbit <faerbit@gmail.com>
Date: Sat, 7 Mar 2015 18:57:24 +0100
Subject: [PATCH] Removing useless shaders.

---
 data/shader/flame_color.fsh | 11 -----------
 data/shader/flame_color.vsh | 11 -----------
 data/shader/merge.fsh       | 18 ------------------
 data/shader/merge.vsh       | 11 -----------
 4 files changed, 51 deletions(-)
 delete mode 100644 data/shader/flame_color.fsh
 delete mode 100644 data/shader/flame_color.vsh
 delete mode 100644 data/shader/merge.fsh
 delete mode 100644 data/shader/merge.vsh

diff --git a/data/shader/flame_color.fsh b/data/shader/flame_color.fsh
deleted file mode 100644
index 6e36a05..0000000
--- a/data/shader/flame_color.fsh
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 150
-
-in vec2 vTexCoord;
-
-uniform sampler2D flame_fbo;
-
-out vec4 oColor;
-
-void main() {
-    oColor = texture(flame_fbo, vTexCoord);
-}
diff --git a/data/shader/flame_color.vsh b/data/shader/flame_color.vsh
deleted file mode 100644
index f3e6540..0000000
--- a/data/shader/flame_color.vsh
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 150
-
-in vec2 aPosition;
-in vec2 aTexCoord;
-
-out vec2 vTexCoord;
-
-void main() {
-    vTexCoord = aTexCoord;
-    gl_Position = vec4(aPosition, 0.0, 1.0);
-}
diff --git a/data/shader/merge.fsh b/data/shader/merge.fsh
deleted file mode 100644
index 3e1e44f..0000000
--- a/data/shader/merge.fsh
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 150
-
-in vec2 vTexCoord;
-
-uniform sampler2D flame_fbo;
-uniform sampler2D light_fbo;
-
-out vec4 oColor;
-
-void main() {
-    vec4 flameColor = texture(flame_fbo, vTexCoord);
-    if (flameColor == vec4(0.0, 0.0, 0.0, 1.0)) {
-        oColor = texture(light_fbo, vTexCoord);
-    }
-    else {
-        oColor = mix(flameColor, texture(light_fbo, vTexCoord), 0.4);
-    }
-}
diff --git a/data/shader/merge.vsh b/data/shader/merge.vsh
deleted file mode 100644
index f3e6540..0000000
--- a/data/shader/merge.vsh
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 150
-
-in vec2 aPosition;
-in vec2 aTexCoord;
-
-out vec2 vTexCoord;
-
-void main() {
-    vTexCoord = aTexCoord;
-    gl_Position = vec4(aPosition, 0.0, 1.0);
-}