Load sun/moon texture from respective file

Author: xtreme8000

assets/terrain/moon.png

@@ -184,7 +184,6 @@ void gutil_sky_box(mat4 view_matrix, float celestial_angle, vec3 color_top,
 	gfx_fog(false);
 	gfx_texture(true);
 	gfx_blending(MODE_BLEND2);
-	gfx_bind_texture(&texture_gui2);
 
 	mat4 tmp;
 	glm_translate_to(view_matrix,
@@ -193,19 +192,20 @@ void gutil_sky_box(mat4 view_matrix, float celestial_angle, vec3 color_top,
 	glm_rotate_x(tmp, glm_rad(celestial_angle * 360.0F), model_view);
 	gfx_matrix_modelview(model_view);
 
+	gfx_bind_texture(&texture_sun);
 	gfx_draw_quads(
 		4, (int16_t[]) {-30, 100, -30, -30, 100, 30, 30, 100, 30, 30, 100, -30},
 		(uint8_t[]) {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 					 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-		(uint16_t[]) {201, 65, 201, 65 + 32, 201 + 32, 65 + 32, 201 + 32, 65});
+		(uint16_t[]) {0, 0, 0, 256, 256, 256, 256, 0});
 
-	gfx_draw_quads(
-		4,
-		(int16_t[]) {-20, -100, -20, 20, -100, -20, 20, -100, 20, -20, -100,
-					 20},
-		(uint8_t[]) {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-					 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-		(uint16_t[]) {201, 32, 201, 32 + 32, 201 + 32, 32 + 32, 201 + 32, 32});
+	gfx_bind_texture(&texture_moon);
+	gfx_draw_quads(4,
+				   (int16_t[]) {-20, -100, -20, 20, -100, -20, 20, -100, 20,
+								-20, -100, 20},
+				   (uint8_t[]) {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+								0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+				   (uint16_t[]) {0, 0, 0, 256, 256, 256, 256, 0});
 
 	gfx_blending(MODE_OFF);
 	gfx_write_buffers(true, true, true);

assets/terrain/sun.png

@@ -36,6 +36,8 @@ struct tex_gfx texture_gui2;
 struct tex_gfx texture_controls;
 struct tex_gfx texture_pointer;
 struct tex_gfx texture_clouds;
+struct tex_gfx texture_sun;
+struct tex_gfx texture_moon;
 
 #define distance_2d(x1, y1, x2, y2)                                            \
 	(((x1) - (x2)) * ((x1) - (x2)) + ((y1) - (y2)) * ((y1) - (y2)))
@@ -72,6 +74,8 @@ void tex_init() {
 	tex_gfx_load_file(&texture_pointer, "pointer.png", TEX_FMT_RGBA16, false);
 	tex_gfx_load_file(&texture_clouds, "environment/clouds.png", TEX_FMT_IA4,
 					  false);
+	tex_gfx_load_file(&texture_sun, "terrain/sun.png", TEX_FMT_RGB16, false);
+	tex_gfx_load_file(&texture_moon, "terrain/moon.png", TEX_FMT_RGB16, false);
 
 	size_t fog_size = 128;
 	uint8_t* fog = malloc(fog_size * fog_size * 4);

source/graphics/gfx_util.c

@@ -62,6 +62,8 @@ extern struct tex_gfx texture_gui2;
 extern struct tex_gfx texture_controls;
 extern struct tex_gfx texture_pointer;
 extern struct tex_gfx texture_clouds;
+extern struct tex_gfx texture_sun;
+extern struct tex_gfx texture_moon;
 
 void tex_init(void);