From 1563ae5be6bc130a9b3a23464f7e28fdb1e87da3 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Sat, 13 May 2017 19:01:56 +0500
Subject: 2017-05-13

---
 shaders/simple.fs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'shaders/simple.fs')

diff --git a/shaders/simple.fs b/shaders/simple.fs
index fce2e07..2d2a582 100644
--- a/shaders/simple.fs
+++ b/shaders/simple.fs
@@ -3,10 +3,20 @@ in vec2 TexCoord;
 
 out vec4 color;
 
-uniform sampler2D texture1;
-uniform sampler2D texture2;
+uniform sampler2D blockTexture;
+uniform int block;
+uniform float time;
 
 void main()
 {
-    color = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 0.0);
-}
\ No newline at end of file
+    //color = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 0.0);
+    /*if (block==1)
+        color = vec4(0.2,0.2,0.2,1);
+    else if (block==0)
+        color = vec4(0,0,0,1);
+    else
+        color = vec4(1,1,1,1);*/
+    color = texture(blockTexture,TexCoord);
+    //color = vec4(TexCoord.x,TexCoord.y,0,1);
+}
+
-- 
cgit v1.2.3