From e690233ffa0786b52f5e69f0820cb5ba473c9fd8 Mon Sep 17 00:00:00 2001 From: RAPH HENNESSY Date: Tue, 13 Aug 2019 10:51:43 +1000 Subject: [PATCH 1/2] Pass scale & camera position to shaders --- src/main/resources/assets/rockbottom/shader/break.vert | 4 +++- src/main/resources/assets/rockbottom/shader/gui.vert | 4 +++- src/main/resources/assets/rockbottom/shader/world.vert | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/rockbottom/shader/break.vert b/src/main/resources/assets/rockbottom/shader/break.vert index 4e56b5c..080a47b 100644 --- a/src/main/resources/assets/rockbottom/shader/break.vert +++ b/src/main/resources/assets/rockbottom/shader/break.vert @@ -13,11 +13,13 @@ uniform mat4 model; uniform mat4 view; uniform mat4 projection; +uniform vec3 camera; + void main(){ vertexColorPass = color; texCoordPass = texCoord; breakTexCoordPass = breakTexCoord; mat4 mvp = projection * view * model; - gl_Position = mvp * vec4(position, 0.0, 1.0); + gl_Position = mvp * vec4(vec2((position.xy - camera.xy) * camera.z), 0.0, 1.0); } \ No newline at end of file diff --git a/src/main/resources/assets/rockbottom/shader/gui.vert b/src/main/resources/assets/rockbottom/shader/gui.vert index dd810ed..7128f72 100644 --- a/src/main/resources/assets/rockbottom/shader/gui.vert +++ b/src/main/resources/assets/rockbottom/shader/gui.vert @@ -11,10 +11,12 @@ uniform mat4 model; uniform mat4 view; uniform mat4 projection; +uniform vec2 scale; + void main(){ vertexColorPass = color; texCoordPass = texCoord; mat4 mvp = projection * view * model; - gl_Position = mvp * vec4(position, 0.0, 1.0); + gl_Position = mvp * vec4(position * scale, 0.0, 1.0); } \ No newline at end of file diff --git a/src/main/resources/assets/rockbottom/shader/world.vert b/src/main/resources/assets/rockbottom/shader/world.vert index dd810ed..a039ef7 100644 --- a/src/main/resources/assets/rockbottom/shader/world.vert +++ b/src/main/resources/assets/rockbottom/shader/world.vert @@ -11,10 +11,12 @@ uniform mat4 model; uniform mat4 view; uniform mat4 projection; +uniform vec3 camera; + void main(){ vertexColorPass = color; texCoordPass = texCoord; mat4 mvp = projection * view * model; - gl_Position = mvp * vec4(position, 0.0, 1.0); + gl_Position = mvp * vec4(vec2((position.xy - camera.xy) * camera.z), 0.0, 1.0); } \ No newline at end of file From 6f2016f32b244bd4957e2cf7856a63bd765d724d Mon Sep 17 00:00:00 2001 From: Raph Hennessy Date: Tue, 13 Aug 2019 15:39:11 +1000 Subject: [PATCH 2/2] Fix the sky --- src/main/resources/assets/rockbottom/shader/gui.vert | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/rockbottom/shader/gui.vert b/src/main/resources/assets/rockbottom/shader/gui.vert index 7128f72..6cddfd0 100644 --- a/src/main/resources/assets/rockbottom/shader/gui.vert +++ b/src/main/resources/assets/rockbottom/shader/gui.vert @@ -11,7 +11,7 @@ uniform mat4 model; uniform mat4 view; uniform mat4 projection; -uniform vec2 scale; +uniform float scale; void main(){ vertexColorPass = color;