feat: free and destory images when occur error at load_bumpmap()

moromin · May 17, 2022 · be9b5aa · be9b5aa
1 parent 6a5ac7f
commit be9b5aa
Show file tree

Hide file tree

Showing 10 changed files with 1,255 additions and 24 deletions.
diff --git a/images/geo.xpm b/images/geo.xpm
diff --git a/include/free.h b/include/free.h
@@ -0,0 +1,10 @@
+#ifndef FREE_H
+# define FREE_H
+
+#include <stdlib.h>
+#include "../include/miniRT.h"
+#include "../include/slice.h"
+
+void	destroy_object_images(t_program *p);
+
+#endif
diff --git a/include/miniRT.h b/include/miniRT.h
@@ -18,19 +18,6 @@
 //# define EPSILON (1.0 / 512)
 # define EPSILON 0.000001
 
-// TODO: replace 'image.h'?
-// typedef struct s_img	t_img;
-
-// struct s_img {
-// 	void	*image;
-// 	int		bits_per_pixel;
-// 	int		size_line;
-// 	int		endian;
-// 	char	*buffer;
-// 	int		height;
-// 	int		width;
-// };
-
 typedef struct s_program {
 	void		*mlx;
 	void		*win;

diff --git a/scenes_bonus/err_invalid_file_path.rt b/scenes_bonus/err_invalid_file_path.rt
@@ -0,0 +1,6 @@
+A  0.1      255,255,255
+L  0,150,-150  0.9         255,255,255
+C  0,3,-5    0,-0.3,1    45
+
+pl 0,-1,0   0,1,0       176,176,176
+bm images/hoge.xpm  1 1
diff --git a/scenes_bonus/err_real_invalid.rt b/scenes_bonus/err_real_invalid.rt
@@ -4,4 +4,5 @@ C  0,0,-10    0.3,-0.1,1    30
 # C  0,10,0    0,-1,-0    100
 
 sp 6,0.5,1       2.0          176,176,176
-ch 10a 10 255,255,255 0,0,255
+# ch 10a 10 255,255,255 0,0,255
+bm images/geo.xpm  1a 1
diff --git a/src/free_utils.c b/src/free_utils.c
@@ -0,0 +1,24 @@
+#include "../include/free.h"
+#include "../minilibx-linux/mlx.h"
+
+void	destroy_object_images(t_program *p)
+{
+	int			i;
+	t_object	*object;
+	t_bumpmap	*bm;
+
+	i = 0;
+	while (i < (int)len(p->objects))
+	{
+		object = get_x2(p->objects, i, 0);
+		if (object->material.flag & 1 << MFLAG_BUMPMAP)
+		{
+			bm = (t_bumpmap *)object->image;
+			if (bm->super.image)
+				mlx_destroy_image(p->mlx, bm->super.image);
+			free(bm);
+			bm = NULL;
+		}
+		i++;
+	}
+}
diff --git a/src/mlx_hooks.c b/src/mlx_hooks.c
@@ -1,9 +1,11 @@
 #include "../include/mlx_hooks.h"
+#include "../include/free.h"
 
 #define ESC_KEY 65307
 
 static int	close_window(t_program *p)
 {
+	destroy_object_images(p);
 	delete_recursively(p->lights, 1);
 	delete_recursively(p->objects, 1);
 	mlx_destroy_image(p->mlx, p->img.image);

diff --git a/src/rt_params.c b/src/rt_params.c
@@ -117,7 +117,6 @@ char	*load_bumpmap(t_program *p, char **info)
 {
 	t_object	*object;
 	t_bumpmap	*bm;
-	t_img		image;
 
 	if (len(p->objects) == 0)
 		return (ERR_UNRESOLVED_MATERIAL);
@@ -126,21 +125,22 @@ char	*load_bumpmap(t_program *p, char **info)
 		return (ERR_DUPLICATE_MATERIAL);
 	object->material.flag |= (1 << MFLAG_BUMPMAP);
 
-	// TODO: mlx error handling or wrapping
 	bm = x_malloc(sizeof(t_bumpmap));
-	image.image = mlx_xpm_file_to_image(p->mlx, info[0], &image.width, &image.height);
-	if (!image.image)
+	object->image = (t_img *)bm;
+	bm->super.image = NULL;
+	bm->super.buffer = NULL;
+	bm->super.image = mlx_xpm_file_to_image(p->mlx, info[0], &bm->super.width, &bm->super.height);
+	if (!bm->super.image)
 		return (ERR_MISCONFIGURED_BUMPMAP);
-	image.buffer = mlx_get_data_addr(image.image, &image.bits_per_pixel, &image.size_line, &image.endian);
-	if (!image.buffer)
+	bm->super.buffer = mlx_get_data_addr(bm->super.image,
+						&bm->super.bits_per_pixel, &bm->super.size_line, &bm->super.endian);
+	if (!bm->super.buffer)
 		return (ERR_MISCONFIGURED_BUMPMAP);
-	bm->super = image;
 
 	if (!(atoi_strict(info[1], &bm->freq_u) && 1 <= bm->freq_u))
 		return (ERR_MISCONFIGURED_BUMPMAP);
 	if (!(atoi_strict(info[2], &bm->freq_v) && 1 <= bm->freq_v))
 		return (ERR_MISCONFIGURED_BUMPMAP);
 
-	object->image = (t_img *)bm;
 	return (NO_ERR);
 }
diff --git a/src/rt_params_obj.c b/src/rt_params_obj.c
@@ -111,7 +111,6 @@ char	*load_cone(t_program *p, char **info)
 				ft_putendl_fd(WARNING_NOT_NORMALIZED, STDERR_FILENO);
 				normal = vec_normalize(normal);
 			}
-			// TODO: define aperture range
 			if (!(ft_strtod(info[2], &aperture) && 0.0 <= aperture && aperture < 180.0))
 				return (ERR_MISCONFIGURED_CONE);
 			if (!(get_color_from_str(info[3], &k_diffuse) && check_color_range(k_diffuse, 0.0, 255.0)))

diff --git a/src/scene.c b/src/scene.c
@@ -1,4 +1,5 @@
 #include "../include/scene.h"
+#include "../include/free.h"
 #include "../minilibx-linux/mlx.h"
 
 static const char	*g_env_idents[] = {"A", "C", "L", NULL};
@@ -98,9 +99,10 @@ static void	read_rt_file(char *filename, t_program *p)
 	x_close(fd);
 	if (err != NO_ERR)
 	{
-		// TODO: free mlx
+		destroy_object_images(p);
 		delete_recursively(p->lights, 1);
 		delete_recursively(p->objects, 1);
+		mlx_destroy_display(p->mlx);
 		exit_with_error_message(err);
 	}
 }