chercher d'autre bug
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
/* By: yantoine <yantoine@student.42.fr> +#+ +:+ +#+ */
|
/* By: yantoine <yantoine@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2025/02/14 18:28:42 by yantoine #+# #+# */
|
/* Created: 2025/02/14 18:28:42 by yantoine #+# #+# */
|
||||||
/* Updated: 2025/02/25 01:44:31 by yantoine ### ########.fr */
|
/* Updated: 2025/03/05 16:18:05 by yantoine ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@@ -24,3 +24,20 @@ int check_if_max(t_scene scene, const int to_test, const int max)
|
|||||||
return (0);
|
return (0);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int check_nb_element(t_scene scene)
|
||||||
|
{
|
||||||
|
if (scene.num_spheres > MAX_SPHERES)
|
||||||
|
return (0);
|
||||||
|
if (scene.num_planes > MAX_PLANES)
|
||||||
|
return (0);
|
||||||
|
if (scene.num_cylinders > MAX_CYLINDERS)
|
||||||
|
return (0);
|
||||||
|
if (scene.num_lights > MAX_LIGHTS)
|
||||||
|
return (0);
|
||||||
|
if (scene.num_ambient > MAX_AMBIENT)
|
||||||
|
return (0);
|
||||||
|
if (scene.num_camera > MAX_CAMERA)
|
||||||
|
return (0);
|
||||||
|
return (1);
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
/* By: yantoine <yantoine@student.42.fr> +#+ +:+ +#+ */
|
/* By: yantoine <yantoine@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2025/02/14 01:41:17 by yantoine #+# #+# */
|
/* Created: 2025/02/14 01:41:17 by yantoine #+# #+# */
|
||||||
/* Updated: 2025/03/05 14:53:12 by yantoine ### ########.fr */
|
/* Updated: 2025/03/05 16:27:44 by yantoine ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@@ -85,8 +85,12 @@ t_scene load_config(const char *filename)
|
|||||||
line = scene.all_file[i];
|
line = scene.all_file[i];
|
||||||
if (!line)
|
if (!line)
|
||||||
break ;
|
break ;
|
||||||
|
if (!check_nb_element(scene))
|
||||||
|
{
|
||||||
|
ft_free_array(scene.all_file);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
scene = parsing_line(line, scene);
|
scene = parsing_line(line, scene);
|
||||||
|
|
||||||
}
|
}
|
||||||
ft_free_array(scene.all_file);
|
ft_free_array(scene.all_file);
|
||||||
return (scene);
|
return (scene);
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
/* By: yantoine <yantoine@student.42.fr> +#+ +:+ +#+ */
|
/* By: yantoine <yantoine@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2025/02/13 20:02:36 by yantoine #+# #+# */
|
/* Created: 2025/02/13 20:02:36 by yantoine #+# #+# */
|
||||||
/* Updated: 2025/03/05 14:29:14 by yantoine ### ########.fr */
|
/* Updated: 2025/03/05 16:05:28 by yantoine ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@@ -241,6 +241,7 @@ int check_tokens(char **tokens, int expected);
|
|||||||
int isdigit_token(char **tokens);
|
int isdigit_token(char **tokens);
|
||||||
int have_extension(const char *line);
|
int have_extension(const char *line);
|
||||||
int check_if_max(t_scene scene, const int to_test, const int max);
|
int check_if_max(t_scene scene, const int to_test, const int max);
|
||||||
|
int check_nb_element(t_scene scene);
|
||||||
|
|
||||||
// Intersection
|
// Intersection
|
||||||
float intersect_cylinder(t_ray ray, t_cylinder cy, t_vec3 *hitNormal);
|
float intersect_cylinder(t_ray ray, t_cylinder cy, t_vec3 *hitNormal);
|
||||||
|
|||||||
Reference in New Issue
Block a user