Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

multiply image color by supplied color

Browse Source 
Former-commit-id: c5e4ccde88d7170db7aa4d3bfce3e0ba1cf5e8c9
This commit is contained in:
Imbris 2019-05-02 18:42:04 -04:00
parent 89c06e8359
commit 9c07dcfcee
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
voxygen/shaders/ui.frag
View File

@ -9,14 +9,14 @@ uniform sampler2D u_tex;
out vec4 tgt_color;
void main() {
// Text
if (f_mode == uint(0)) {
tgt_color = f_color * vec4(1.0, 1.0, 1.0, texture(u_tex, f_uv).a);
// Image
} else if (f_mode == uint(1)) {
tgt_color = texture(u_tex, f_uv);
// 2D Geometry
} else if (f_mode == uint(2)) {
tgt_color = f_color;
}
// Text
if (f_mode == uint(0)) {
tgt_color = f_color * vec4(1.0, 1.0, 1.0, texture(u_tex, f_uv).a);
// Image
} else if (f_mode == uint(1)) {
tgt_color = f_color * texture(u_tex, f_uv);
// 2D Geometry
} else if (f_mode == uint(2)) {
tgt_color = f_color;
}
}

8
voxygen/shaders/ui.vert
View File

@ -12,8 +12,8 @@ flat out uint f_mode;
out vec4 f_color;
void main() {
f_uv = v_uv;
f_color = v_color;
gl_Position = vec4(v_pos, 0.0, 1.0);
f_mode = v_mode;
f_uv = v_uv;
f_color = v_color;
gl_Position = vec4(v_pos, 0.0, 1.0);
f_mode = v_mode;
}