summaryrefslogtreecommitdiffstats
path: root/code/shaders
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-05-18 16:03:05 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-05-18 16:03:05 +0200
commit4d7b1da29e0957ac798ee8e6da8288cbd4ae5c79 (patch)
tree548911d4e341fd5717acff3b5bc752c7b5650bf4 /code/shaders
parent2017-05-13 (diff)
downloadAltCraft-4d7b1da29e0957ac798ee8e6da8288cbd4ae5c79.tar
AltCraft-4d7b1da29e0957ac798ee8e6da8288cbd4ae5c79.tar.gz
AltCraft-4d7b1da29e0957ac798ee8e6da8288cbd4ae5c79.tar.bz2
AltCraft-4d7b1da29e0957ac798ee8e6da8288cbd4ae5c79.tar.lz
AltCraft-4d7b1da29e0957ac798ee8e6da8288cbd4ae5c79.tar.xz
AltCraft-4d7b1da29e0957ac798ee8e6da8288cbd4ae5c79.tar.zst
AltCraft-4d7b1da29e0957ac798ee8e6da8288cbd4ae5c79.zip
Diffstat (limited to 'code/shaders')
-rw-r--r--code/shaders/simple.fs22
-rw-r--r--code/shaders/simple.vs15
2 files changed, 0 insertions, 37 deletions
diff --git a/code/shaders/simple.fs b/code/shaders/simple.fs
deleted file mode 100644
index 2d2a582..0000000
--- a/code/shaders/simple.fs
+++ /dev/null
@@ -1,22 +0,0 @@
-#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
deleted file mode 100644
index 7233efc..0000000
--- a/code/shaders/simple.vs
+++ /dev/null
@@ -1,15 +0,0 @@
-#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