From f8af4c44d17b94ab814f1784060388afd7a24e03 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Sat, 26 Jan 2019 14:54:29 +0500 Subject: Removed previous implementation of Shader --- cwd/assets/altcraft/shaders/vert/entity.vs | 13 ++++++++++ cwd/assets/altcraft/shaders/vert/face.vs | 41 ++++++++++++++++++++++++++++++ cwd/assets/altcraft/shaders/vert/fbo.vs | 11 ++++++++ cwd/assets/altcraft/shaders/vert/sky.vs | 17 +++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 cwd/assets/altcraft/shaders/vert/entity.vs create mode 100644 cwd/assets/altcraft/shaders/vert/face.vs create mode 100644 cwd/assets/altcraft/shaders/vert/fbo.vs create mode 100644 cwd/assets/altcraft/shaders/vert/sky.vs (limited to 'cwd/assets/altcraft/shaders/vert') diff --git a/cwd/assets/altcraft/shaders/vert/entity.vs b/cwd/assets/altcraft/shaders/vert/entity.vs new file mode 100644 index 0000000..baa25e5 --- /dev/null +++ b/cwd/assets/altcraft/shaders/vert/entity.vs @@ -0,0 +1,13 @@ +#version 330 core + +uniform mat4 view; +uniform mat4 projection; +uniform mat4 model; +layout (location = 0) in vec3 position; +layout (location = 1) in vec2 uvPosition; +out vec2 uvPos; + +void main(){ + uvPos = uvPosition; + gl_Position = projection*view*model*vec4(position,1); +} \ No newline at end of file diff --git a/cwd/assets/altcraft/shaders/vert/face.vs b/cwd/assets/altcraft/shaders/vert/face.vs new file mode 100644 index 0000000..9c40846 --- /dev/null +++ b/cwd/assets/altcraft/shaders/vert/face.vs @@ -0,0 +1,41 @@ +#version 330 core +layout (location = 0) in vec3 position; +layout (location = 2) in vec2 UvCoordinates; +layout (location = 7) in vec4 Texture; +layout (location = 8) in mat4 model; +layout (location = 12) in vec3 color; +layout (location = 13) in vec2 light; +layout (location = 14) in float TextureLayer; + +out VS_OUT { + vec2 UvPosition; + vec3 Texture; + vec3 Color; + vec2 Light; +} vs_out; + +//uniform mat4 view; +//uniform mat4 projection; +uniform mat4 projView; + +vec3 TransformTextureCoord(vec4 TextureAtlasCoords, vec2 UvCoords, float Layer) { + float x = TextureAtlasCoords.x; + float y = TextureAtlasCoords.y; + float w = TextureAtlasCoords.z; + float h = TextureAtlasCoords.w; + vec2 A = vec2(x, 1 - y - h); + vec2 B = vec2(x + w, 1 - y); + vec2 transformed = A + UvCoords * (B - A); + return vec3(transformed.x, transformed.y, Layer); +} + +void main() +{ + vec4 sourcePosition = vec4(position,1.0f); + gl_Position = projView * model * sourcePosition; + + vs_out.UvPosition = vec2(UvCoordinates.x,UvCoordinates.y); + vs_out.Texture = TransformTextureCoord(Texture,UvCoordinates,TextureLayer); + vs_out.Color = color; + vs_out.Light = light; +} diff --git a/cwd/assets/altcraft/shaders/vert/fbo.vs b/cwd/assets/altcraft/shaders/vert/fbo.vs new file mode 100644 index 0000000..e1e8966 --- /dev/null +++ b/cwd/assets/altcraft/shaders/vert/fbo.vs @@ -0,0 +1,11 @@ +#version 330 core +layout (location = 0) in vec2 Pos; +layout (location = 1) in vec2 TextureCoords; + +out vec2 TexCoords; + +void main() +{ + gl_Position = vec4(Pos.x, Pos.y, 0.0, 1.0); + TexCoords = TextureCoords; +} \ No newline at end of file diff --git a/cwd/assets/altcraft/shaders/vert/sky.vs b/cwd/assets/altcraft/shaders/vert/sky.vs new file mode 100644 index 0000000..983e1f3 --- /dev/null +++ b/cwd/assets/altcraft/shaders/vert/sky.vs @@ -0,0 +1,17 @@ +#version 330 core + +uniform mat4 view; +uniform mat4 projection; +uniform mat4 model; + +layout (location = 0) in vec3 position; +layout (location = 1) in vec2 uvPosition; + +out vec2 uvPos; +out vec3 pos; + +void main(){ + uvPos = uvPosition; + pos = position; + gl_Position = projection*view*model*vec4(position,1); +} \ No newline at end of file -- cgit v1.2.3