diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-05-18 16:03:05 +0200 |
---|---|---|
committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-05-18 16:03:05 +0200 |
commit | 4d7b1da29e0957ac798ee8e6da8288cbd4ae5c79 (patch) | |
tree | 548911d4e341fd5717acff3b5bc752c7b5650bf4 /shaders | |
parent | 2017-05-13 (diff) | |
download | AltCraft-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 'shaders')
-rw-r--r-- | shaders/simple.fs | 11 | ||||
-rw-r--r-- | shaders/simple.vs | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/shaders/simple.fs b/shaders/simple.fs index 2d2a582..f933eb8 100644 --- a/shaders/simple.fs +++ b/shaders/simple.fs @@ -9,14 +9,7 @@ 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); + //color = texture(blockTexture,TexCoord); + color = vec4(TexCoord.x,TexCoord.y,0.0,1.0); } diff --git a/shaders/simple.vs b/shaders/simple.vs index 7233efc..ca99e85 100644 --- a/shaders/simple.vs +++ b/shaders/simple.vs @@ -12,4 +12,5 @@ void main() { gl_Position = projection * view * model * vec4(position, 1.0f); TexCoord = vec2(texCoord.x, texCoord.y); + //TexCoord = texCoord; }
\ No newline at end of file |