From 41fbca10f6c6cdd9c1623f1347e7ecb40f5e7f59 Mon Sep 17 00:00:00 2001 From: Mel Date: Sat, 8 Jul 2023 01:20:53 +0200 Subject: Add crude texture transparency --- assets/images/atlas.png | Bin 4653 -> 4671 bytes assets/images/atlas.ppm | 700 +++++++++++++++++++++---------------------- assets/shaders/fragment.glsl | 6 +- 3 files changed, 355 insertions(+), 351 deletions(-) (limited to 'assets') diff --git a/assets/images/atlas.png b/assets/images/atlas.png index 72ff329..37e6457 100644 Binary files a/assets/images/atlas.png and b/assets/images/atlas.png differ diff --git a/assets/images/atlas.ppm b/assets/images/atlas.ppm index bf31022..b5599d3 100644 --- a/assets/images/atlas.ppm +++ b/assets/images/atlas.ppm @@ -6245,9 +6245,9 @@ P3 44 113 68 -39 -92 -67 +192 +0 +255 44 113 68 @@ -6257,9 +6257,9 @@ P3 44 113 68 -39 -92 -67 +192 +0 +255 44 113 68 @@ -6269,21 +6269,21 @@ P3 44 113 68 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 44 113 68 @@ -6434,51 +6434,51 @@ P3 89 51 43 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 44 113 68 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 44 113 68 -39 -92 -67 +192 +0 +255 39 128 70 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 44 113 68 44 113 68 -39 -92 -67 +192 +0 +255 44 113 68 @@ -6626,9 +6626,9 @@ P3 89 51 43 -39 -92 -67 +192 +0 +255 39 128 70 @@ -6638,18 +6638,18 @@ P3 39 128 70 -39 -92 -67 +192 +0 +255 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 @@ -6659,21 +6659,21 @@ P3 39 128 70 -39 -92 -67 +192 +0 +255 44 113 68 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 192 0 255 @@ -6818,9 +6818,9 @@ P3 89 51 43 -39 -92 -67 +192 +0 +255 39 128 70 @@ -6839,9 +6839,9 @@ P3 44 113 68 -39 -92 -67 +192 +0 +255 39 128 70 @@ -6854,12 +6854,12 @@ P3 39 128 70 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 @@ -7010,12 +7010,12 @@ P3 89 51 43 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 @@ -7031,12 +7031,12 @@ P3 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 @@ -7046,12 +7046,12 @@ P3 39 128 70 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 @@ -7205,27 +7205,27 @@ P3 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 -39 -92 -67 +192 +0 +255 44 113 68 44 113 68 -39 -92 -67 +192 +0 +255 44 113 68 @@ -7241,12 +7241,12 @@ P3 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 44 113 68 @@ -7400,33 +7400,33 @@ P3 44 113 68 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -128 -70 +128 +70 39 128 70 44 113 68 -39 -92 -67 +192 +0 +255 44 113 68 @@ -7436,9 +7436,9 @@ P3 44 113 68 -39 -92 -67 +192 +0 +255 44 113 68 @@ -7589,24 +7589,24 @@ P3 44 113 68 -39 -92 -67 +192 +0 +255 39 128 70 39 128 70 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 39 128 70 @@ -7616,24 +7616,24 @@ P3 39 128 70 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 44 113 68 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 192 0 255 @@ -7778,12 +7778,12 @@ P3 89 51 43 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 @@ -7793,39 +7793,39 @@ P3 39 128 70 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 39 128 70 39 128 70 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 192 0 255 @@ -7973,33 +7973,33 @@ P3 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 -39 -92 -67 +192 +0 +255 39 128 70 39 128 70 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 44 113 68 @@ -8012,9 +8012,9 @@ P3 44 113 68 -39 -92 -67 +192 +0 +255 44 113 68 @@ -8168,15 +8168,15 @@ P3 44 113 68 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 39 128 70 @@ -8186,9 +8186,9 @@ P3 39 128 70 -39 -92 -67 +192 +0 +255 44 113 68 @@ -8201,12 +8201,12 @@ P3 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 44 113 68 @@ -8357,21 +8357,21 @@ P3 44 113 68 -39 -92 -67 +192 +0 +255 39 128 70 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 39 128 70 @@ -8390,18 +8390,18 @@ P3 44 113 68 -39 -92 -67 +192 +0 +255 39 128 70 39 128 70 -39 -92 -67 +192 +0 +255 192 0 255 @@ -8546,9 +8546,9 @@ P3 89 51 43 -39 -92 -67 +192 +0 +255 39 128 70 @@ -8558,33 +8558,33 @@ P3 39 128 70 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 39 128 70 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 39 128 70 @@ -8738,9 +8738,9 @@ P3 89 51 43 -39 -92 -67 +192 +0 +255 39 128 70 @@ -8753,39 +8753,39 @@ P3 39 128 70 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 +192 +0 +255 39 128 70 39 128 70 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 -39 -92 -67 +192 +0 +255 192 0 255 @@ -8930,12 +8930,12 @@ P3 89 51 43 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 @@ -8945,21 +8945,21 @@ P3 39 128 70 -39 -92 -67 +192 +0 +255 44 113 68 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 @@ -8969,15 +8969,15 @@ P3 39 128 70 -39 -92 -67 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 +192 +0 +255 192 0 255 @@ -9122,24 +9122,24 @@ P3 71 39 32 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 44 113 68 39 128 70 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 44 113 68 @@ -9149,21 +9149,21 @@ P3 44 113 68 -39 -92 -67 -39 -92 -67 +192 +0 +255 +192 +0 +255 39 128 70 39 128 70 -39 -92 -67 +192 +0 +255 44 113 68 diff --git a/assets/shaders/fragment.glsl b/assets/shaders/fragment.glsl index 71435ef..a7f019d 100644 --- a/assets/shaders/fragment.glsl +++ b/assets/shaders/fragment.glsl @@ -14,6 +14,10 @@ void main() { float brightness = dot(normalize(surface_normal), normalize(-sun_direction)); vec3 diffuse = vec3(max(brightness, 0.3)); - color = vec4(diffuse, 1.0) * texture(tex, frag_tex_coord); + vec4 texture_color = texture(tex, frag_tex_coord); + if (texture_color.a < 0.5) { + discard; + } + color = vec4(diffuse, 1.0) * texture_color; color = mix(vec4(sky_color, 1.0), color, 1 - depth); } \ No newline at end of file -- cgit 1.4.1