summaryrefslogtreecommitdiffstats
path: root/code/shaders
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-05-13 16:01:56 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-05-13 16:01:56 +0200
commit1563ae5be6bc130a9b3a23464f7e28fdb1e87da3 (patch)
treeb1f65a03827494fa78e320b134f4cc7df54754bb /code/shaders
parent2017-05-12 (diff)
downloadAltCraft-1563ae5be6bc130a9b3a23464f7e28fdb1e87da3.tar
AltCraft-1563ae5be6bc130a9b3a23464f7e28fdb1e87da3.tar.gz
AltCraft-1563ae5be6bc130a9b3a23464f7e28fdb1e87da3.tar.bz2
AltCraft-1563ae5be6bc130a9b3a23464f7e28fdb1e87da3.tar.lz
AltCraft-1563ae5be6bc130a9b3a23464f7e28fdb1e87da3.tar.xz
AltCraft-1563ae5be6bc130a9b3a23464f7e28fdb1e87da3.tar.zst
AltCraft-1563ae5be6bc130a9b3a23464f7e28fdb1e87da3.zip
Diffstat (limited to 'code/shaders')
-rw-r--r--code/shaders/simple.fs22
-rw-r--r--code/shaders/simple.vs15
2 files changed, 37 insertions, 0 deletions
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