s'occuper des intersections
This commit is contained in:
+8
-7
@@ -6,7 +6,7 @@
|
||||
/* By: yantoine <yantoine@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/02/14 20:05:49 by yantoine #+# #+# */
|
||||
/* Updated: 2025/02/15 18:34:45 by yantoine ### ########.fr */
|
||||
/* Updated: 2025/02/15 19:23:20 by yantoine ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -19,17 +19,17 @@ static inline int range_is_ok(char **token_color)
|
||||
i = 0;
|
||||
while (i < 3)
|
||||
{
|
||||
if (ft_atoi(token_color[i]) < 0 || ft_atoi(token_color[i]) > 255)
|
||||
if (ft_atof(token_color[i]) < 0 || ft_atof(token_color[i]) > 255)
|
||||
return (0);
|
||||
i++;
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
|
||||
t_color parse_color(const char *token, t_scene scene)
|
||||
t_vec3 parse_color(const char *token, t_scene scene)
|
||||
{
|
||||
const char **token_color = ft_split(token, ',');
|
||||
t_color color;
|
||||
t_vec3 color;
|
||||
|
||||
if (!check_tokens(token_color, 3) || !range_is_ok(token_color))
|
||||
{
|
||||
@@ -40,8 +40,9 @@ t_color parse_color(const char *token, t_scene scene)
|
||||
close(scene.fd);
|
||||
exit(1);
|
||||
}
|
||||
color.r = ft_atoi(token_color[0]) / 255;
|
||||
color.g = ft_atoi(token_color[1]) / 255;
|
||||
color.b = ft_atoi(token_color[2]) / 255;
|
||||
color.x = ft_atof(token_color[0]) / 255;
|
||||
color.y = ft_atof(token_color[1]) / 255;
|
||||
color.z = ft_atof(token_color[2]) / 255;
|
||||
ft_free_array(tokens_color);
|
||||
return (color);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user