From d6a8c5cf3179c9fd7ac3668dafa02cf72d89d0d0 Mon Sep 17 00:00:00 2001 From: H3XploR Date: Sat, 15 Feb 2025 18:35:35 +0100 Subject: [PATCH] parse color finis ? --- parsing_color.c | 19 +++++++++++++++++-- tags | 5 ++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/parsing_color.c b/parsing_color.c index b0fd570..db10107 100644 --- a/parsing_color.c +++ b/parsing_color.c @@ -6,18 +6,32 @@ /* By: yantoine +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/14 20:05:49 by yantoine #+# #+# */ -/* Updated: 2025/02/14 20:25:45 by yantoine ### ########.fr */ +/* Updated: 2025/02/15 18:34:45 by yantoine ### ########.fr */ /* */ /* ************************************************************************** */ #include "miniRT.h" +static inline int range_is_ok(char **token_color) +{ + int i; + + i = 0; + while (i < 3) + { + if (ft_atoi(token_color[i]) < 0 || ft_atoi(token_color[i]) > 255) + return (0); + i++; + } + return (1); +} + t_color parse_color(const char *token, t_scene scene) { const char **token_color = ft_split(token, ','); t_color color; - if (!check_tokens(token_color, 3)) + if (!check_tokens(token_color, 3) || !range_is_ok(token_color)) { ft_free_array(tokens_color); ft_free_array(scene.token_if_exit); @@ -29,4 +43,5 @@ t_color parse_color(const char *token, t_scene scene) color.r = ft_atoi(token_color[0]) / 255; color.g = ft_atoi(token_color[1]) / 255; color.b = ft_atoi(token_color[2]) / 255; + return (color); } diff --git a/tags b/tags index 8f9ab37..798f879 100644 --- a/tags +++ b/tags @@ -100,6 +100,7 @@ color miniRT.h /^ t_vec3 color;$/;" m struct:s_sphere typeref:typename:t_vec3 create_scene scene.c /^t_scene create_scene(void)$/;" f typeref:typename:t_scene cylinders miniRT.h /^ t_cylinder cylinders[MAX_CYLINDERS];$/;" m struct:s_scene typeref:typename:t_cylinder[] dir miniRT.h /^ t_vec3 dir;$/;" m struct:s_ray typeref:typename:t_vec3 +fd_if_exit miniRT.h /^ const int fd_if_exit;$/;" m struct:s_scene typeref:typename:const int fov miniRT.h /^ float fov;$/;" m struct:s_camera typeref:typename:float fov raytracer_formatted.c /^float fov = 90.0f;$/;" v typeref:typename:float get_tokens_secure parsing_utils.c /^inline char **get_tokens_secure(t_scene scene, const int numObject, const int numObjectMax, cons/;" f typeref:typename:char ** @@ -109,7 +110,7 @@ intersectPlane raytracer_formatted.c /^float intersectPlane(Ray ray, Plane p, t_ intersectSphere raytracer_formatted.c /^float intersectSphere(Ray ray, Sphere s, t_vec3 *hitNormal)$/;" f typeref:typename:float isInShadow raytracer_formatted.c /^bool isInShadow(t_vec3 hitPoint, t_vec3 lightPos)$/;" f typeref:typename:bool lights miniRT.h /^ t_light lights[MAX_LIGHTS];$/;" m struct:s_scene typeref:typename:t_light[] -line miniRT.h /^ const char *line;$/;" m struct:s_scene typeref:typename:const char * +line_if_exit miniRT.h /^ const char *line_if_exit;$/;" m struct:s_scene typeref:typename:const char * load_config config.c /^t_scene load_config(const char *filename)$/;" f typeref:typename:t_scene load_config raytracer_formatted.c /^void load_config(const char *filename)$/;" f typeref:typename:void main raytracer_formatted.c /^int main(int argc, char *argv[])$/;" f typeref:typename:int @@ -131,6 +132,7 @@ point miniRT.h /^ t_vec3 point;$/;" m struct:s_plane typeref:typename:t_vec3 pos miniRT.h /^ t_vec3 pos;$/;" m struct:s_light typeref:typename:t_vec3 radius miniRT.h /^ float radius;$/;" m struct:s_sphere typeref:typename:float radius miniRT.h /^ float radius; \/\/ Demi-diamètre$/;" m struct:s_cylinder typeref:typename:float +range_is_ok parsing_color.c /^static inline int range_is_ok(char **token_color)$/;" f typeref:typename:int file: s_ambient miniRT.h /^typedef struct s_ambient$/;" s s_camera miniRT.h /^typedef struct s_camera$/;" s s_cylinder miniRT.h /^typedef struct s_cylinder$/;" s @@ -150,6 +152,7 @@ t_ray miniRT.h /^} t_ray;$/;" t typeref:struct:s_ray t_scene miniRT.h /^} t_scene;$/;" t typeref:struct:s_scene t_sphere miniRT.h /^} t_sphere;$/;" t typeref:struct:s_sphere t_vec3 miniRT.h /^} t_vec3;$/;" t typeref:struct:s_vec3 +token_if_exit miniRT.h /^ const char **token_if_exit;$/;" m struct:s_scene typeref:typename:const char ** trace raytracer_formatted.c /^t_vec3 trace(Ray ray)$/;" f typeref:typename:t_vec3 vec3_add calcul_de_vecteur.c /^t_vec3 vec3_add(t_vec3 a, t_vec3 b)$/;" f typeref:typename:t_vec3 vec3_cross calcul_de_vecteur.c /^t_vec3 vec3_cross(t_vec3 a, t_vec3 b)$/;" f typeref:typename:t_vec3