From 8ac4fe6d5ba5091923c7fdf1fa88724d827706fa Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Fri, 26 May 2017 19:11:17 +0500 Subject: 2017-05-26 --- cwd/shaders/block.fs | 16 ++++++++++++++++ cwd/shaders/block.vs | 15 +++++++++++++++ cwd/shaders/simple.fs | 15 +++++++++++++++ cwd/shaders/simple.vs | 16 ++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 cwd/shaders/block.fs create mode 100644 cwd/shaders/block.vs create mode 100644 cwd/shaders/simple.fs create mode 100644 cwd/shaders/simple.vs (limited to 'cwd/shaders') diff --git a/cwd/shaders/block.fs b/cwd/shaders/block.fs new file mode 100644 index 0000000..e239f7b --- /dev/null +++ b/cwd/shaders/block.fs @@ -0,0 +1,16 @@ +#version 330 core +in vec2 TexCoord; + +uniform sampler2D textureAtlas; +uniform int block; + +vec4 GetTextureByBlockId(int BlockId) { + return vec4(0,0,0,0); +} + +void main() +{ + vec4 TextureCoords = GetTextureByBlockId(block); + gl_FragmentColor = texture(blockTexture,TexCoord); +} + diff --git a/cwd/shaders/block.vs b/cwd/shaders/block.vs new file mode 100644 index 0000000..7a36a5d --- /dev/null +++ b/cwd/shaders/block.vs @@ -0,0 +1,15 @@ +#version 330 core +layout (location = 0) in vec3 position; +layout (location = 2) in vec2 UvCoordinates; + +out vec2 UvPosition; + +uniform mat4 model; +uniform mat4 view; +uniform mat4 projection; + +void main() +{ + gl_Position = projection * view * model * vec4(position, 1.0f); + UvPosition = vec2(UvCoordinates.x,UvCoordinates.y); +} \ No newline at end of file diff --git a/cwd/shaders/simple.fs b/cwd/shaders/simple.fs new file mode 100644 index 0000000..cc7f812 --- /dev/null +++ b/cwd/shaders/simple.fs @@ -0,0 +1,15 @@ +#version 330 core +in vec2 TexCoord; + +out vec4 color; + +uniform sampler2D blockTexture; +uniform int block; +uniform float time; + +void main() +{ + color = texture(blockTexture,TexCoord); + //color = vec4(TexCoord.x,TexCoord.y,0.0,1.0); +} + diff --git a/cwd/shaders/simple.vs b/cwd/shaders/simple.vs new file mode 100644 index 0000000..ca99e85 --- /dev/null +++ b/cwd/shaders/simple.vs @@ -0,0 +1,16 @@ +#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); + //TexCoord = texCoord; +} \ No newline at end of file -- cgit v1.2.3