Skip to content

Lighting & Shaders Improvements #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raphydaphy wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Lighting & Shaders Improvements #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e690233
Pass scale & camera position to shaders
raphydaphy Aug 13, 2019
6f2016f
Fix the sky
raphydaphy Aug 13, 2019
ecf7cf4
Merge branch 'master' of https://github.com/RockBottomGame/Assets int…
raphydaphy Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/resources/assets/rockbottom/shader/break.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/rockbottom/shader/gui.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ uniform mat4 model;
uniform mat4 view;
uniform mat4 projection;

uniform float 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);
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/rockbottom/shader/world.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}