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

---
 code/shaders/simple.fs | 22 ++++++++++++++++++++++
 code/shaders/simple.vs | 15 +++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 code/shaders/simple.fs
 create mode 100644 code/shaders/simple.vs

(limited to 'code/shaders')

diff --git a/code/shaders/simple.fs b/code/shaders/simple.fs
new file mode 100644
index 0000000..2d2a582
--- /dev/null
+++ b/code/shaders/simple.fs
@@ -0,0 +1,22 @@
+#version 330 core
+in vec2 TexCoord;
+
+out vec4 color;
+
+uniform sampler2D blockTexture;
+uniform int block;
+uniform float time;
+
+void main()
+{
+    //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);
+}
+
diff --git a/code/shaders/simple.vs b/code/shaders/simple.vs
new file mode 100644
index 0000000..7233efc
--- /dev/null
+++ b/code/shaders/simple.vs
@@ -0,0 +1,15 @@
+#version 330 core
+layout (location = 0) in vec3 position;
+layout (location = 2) in vec2 texCoord;
+
+out vec2 TexCoord;
+
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
+
+void main()
+{
+    gl_Position = projection * view * model * vec4(position, 1.0f);
+    TexCoord = vec2(texCoord.x, texCoord.y);
+}
\ No newline at end of file
-- 
cgit v1.2.3