From d32c5bd01c034c8801a89c80df99709424fa0f13 Mon Sep 17 00:00:00 2001
From: H3XploR <yannisantoine1207@gmail.com>
Date: Wed, 19 Feb 2025 16:53:36 +0100
Subject: [PATCH] pudate miniRT.h nomr

---
 intersect_objects.c |  64 ++++++++++++++++-----------------
 miniRT              | Bin 355072 -> 355064 bytes
 miniRT.h            |  14 ++++----
 parsing_ambiant.c   |   6 ++--
 parsing_camera.c    |   6 ++--
 parsing_cylinder.c  |  18 +++++-----
 parsing_light.c     |  12 +++----
 parsing_plane.c     |  12 +++----
 parsing_sphere.c    |  12 +++----
 shadows.c           |   8 ++---
 tags                |  18 +++++-----
 trace.c             |  84 +++++++++++++++++++++++++-------------------
 12 files changed, 134 insertions(+), 120 deletions(-)

diff --git a/intersect_objects.c b/intersect_objects.c
index 882e283..4e98b29 100644
--- a/intersect_objects.c
+++ b/intersect_objects.c
@@ -6,23 +6,23 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/19 16:07:55 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/19 16:16:52 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:47:28 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "miniRT.h"
 
 static bool	intersect_spheres(const t_ray ray, t_hit *hit, t_sphere *spheres,
-		int numSpheres)
+		int num_spheres)
 {
 	int		i;
-	bool	hitAny;
-		t_vec3 n;
+	bool	hit_any;
+	t_vec3	n;
 	float	t;
 
 	i = 0;
-	hitAny = false;
-	while (i < numSpheres)
+	hit_any = false;
+	while (i < num_spheres)
 	{
 		t = intersect_sphere(ray, spheres[i], &n);
 		if (t > 1e-3f && t < hit->t)
@@ -30,24 +30,24 @@ static bool	intersect_spheres(const t_ray ray, t_hit *hit, t_sphere *spheres,
 			hit->t = t;
 			hit->normal = n;
 			hit->color = spheres[i].color;
-			hitAny = true;
+			hit_any = true;
 		}
 		i++;
 	}
-	return (hitAny);
+	return (hit_any);
 }
 
 static bool	intersect_planes(const t_ray ray, t_hit *hit, t_plane *planes,
-		int numPlanes)
+		int num_planes)
 {
 	int		i;
-	bool	hitAny;
-		t_vec3 n;
+	bool	hit_any;
+	t_vec3	n;
 	float	t;
 
 	i = 0;
-	hitAny = false;
-	while (i < numPlanes)
+	hit_any = false;
+	while (i < num_planes)
 	{
 		t = intersect_plane(ray, planes[i], &n);
 		if (t > 1e-3f && t < hit->t)
@@ -55,24 +55,24 @@ static bool	intersect_planes(const t_ray ray, t_hit *hit, t_plane *planes,
 			hit->t = t;
 			hit->normal = n;
 			hit->color = planes[i].color;
-			hitAny = true;
+			hit_any = true;
 		}
 		i++;
 	}
-	return (hitAny);
+	return (hit_any);
 }
 
 static bool	intersect_cylinders(const t_ray ray, t_hit *hit,
-		t_cylinder *cylinders, int numCylinders)
+		t_cylinder *cylinders, int num_cylinders)
 {
 	int		i;
-	bool	hitAny;
-		t_vec3 n;
+	bool	hit_any;
+	t_vec3	n;
 	float	t;
 
 	i = 0;
-	hitAny = false;
-	while (i < numCylinders)
+	hit_any = false;
+	while (i < num_cylinders)
 	{
 		t = intersect_cylinder(ray, cylinders[i], &n);
 		if (t > 1e-3f && t < hit->t)
@@ -80,33 +80,33 @@ static bool	intersect_cylinders(const t_ray ray, t_hit *hit,
 			hit->t = t;
 			hit->normal = n;
 			hit->color = cylinders[i].color;
-			hitAny = true;
+			hit_any = true;
 		}
 		i++;
 	}
-	return (hitAny);
+	return (hit_any);
 }
 
 bool	intersect_objects(float *tMin, t_vec3 *hitNormal, t_vec3 *objColor,
 		t_scene scene)
 {
 	t_hit	hit;
-	bool	hitFound;
+	bool	hit_found;
 
-	hitFound = false;
+	hit_found = false;
 	hit.t = *tMin;
-	if (intersect_spheres(scene.ray, &hit, scene.spheres, scene.numSpheres))
-		hitFound = true;
-	if (intersect_planes(scene.ray, &hit, scene.planes, scene.numPlanes))
-		hitFound = true;
+	if (intersect_spheres(scene.ray, &hit, scene.spheres, scene.num_spheres))
+		hit_found = true;
+	if (intersect_planes(scene.ray, &hit, scene.planes, scene.num_planes))
+		hit_found = true;
 	if (intersect_cylinders(scene.ray, &hit, scene.cylinders,
-			scene.numCylinders))
-		hitFound = true;
-	if (hitFound)
+			scene.num_cylinders))
+		hit_found = true;
+	if (hit_found)
 	{
 		*tMin = hit.t;
 		*hitNormal = hit.normal;
 		*objColor = hit.color;
 	}
-	return (hitFound);
+	return (hit_found);
 }
diff --git a/miniRT b/miniRT
index a4eb0e87817de645545ad67635235f4a46687195..deee9a06e3244c06f0e7d359c2b27a0e7aba7325 100755
GIT binary patch
delta 22845
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

delta 22856
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

diff --git a/miniRT.h b/miniRT.h
index d74ef76..85931dc 100644
--- a/miniRT.h
+++ b/miniRT.h
@@ -6,7 +6,7 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/13 20:02:36 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/19 16:37:07 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:48:27 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -124,12 +124,12 @@ typedef struct s_scene
 	t_ambient	ambient;
 	t_camera	camera;
 	t_ray		ray;
-	int			numSpheres;
-	int			numPlanes;
-	int			numCylinders;
-	int			numCamera;
-	int			numLights;
-	int			numAmbient;
+	int			num_spheres;
+	int			num_planes;
+	int			num_cylinders;
+	int			num_camera;
+	int			num_lights;
+	int			num_ambient;
 	char		*line_if_exit;
 	char		**token_if_exit;
 	int			fd_if_exit;
diff --git a/parsing_ambiant.c b/parsing_ambiant.c
index 159ac8e..70c4a1d 100644
--- a/parsing_ambiant.c
+++ b/parsing_ambiant.c
@@ -6,7 +6,7 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/14 18:04:39 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/17 21:53:34 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:48:50 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,11 +16,11 @@ t_scene	parsing_ambiant(t_scene scene)
 {
 	char	**tokens;
 
-	tokens = get_tokens_secure(scene, scene.numAmbient, MAX_AMBIENT, 3);
+	tokens = get_tokens_secure(scene, scene.num_ambient, MAX_AMBIENT, 3);
 	scene.token_if_exit = tokens;
 	scene.ambient.ratio = ft_atof(tokens[1]);
 	scene.ambient.color = parse_color(tokens[2], scene);
 	ft_free_array(tokens);
-	scene.numAmbient++;
+	scene.num_ambient++;
 	return (scene);
 }
diff --git a/parsing_camera.c b/parsing_camera.c
index 5dd63a3..5a396a3 100644
--- a/parsing_camera.c
+++ b/parsing_camera.c
@@ -6,7 +6,7 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/14 20:02:29 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/17 21:24:12 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:49:01 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,7 +16,7 @@ t_scene	parsing_camera(t_scene scene)
 {
 	char	**tokens;
 
-	tokens = get_tokens_secure(scene, scene.numCamera, MAX_CAMERA, 4);
+	tokens = get_tokens_secure(scene, scene.num_camera, MAX_CAMERA, 4);
 	scene.token_if_exit = tokens;
 	scene.camera.camPos = parse_vector(tokens[1], scene);
 	scene.camera.camDir = parse_vector_normalize(tokens[2], scene);
@@ -24,6 +24,6 @@ t_scene	parsing_camera(t_scene scene)
 	scene.camera.yaw = atan2f(scene.camera.camDir.x, -scene.camera.camDir.z);
 	scene.camera.pitch = asinf(scene.camera.camDir.y);
 	ft_free_array(tokens);
-	scene.numCamera++;
+	scene.num_camera++;
 	return (scene);
 }
diff --git a/parsing_cylinder.c b/parsing_cylinder.c
index 757d697..770c188 100644
--- a/parsing_cylinder.c
+++ b/parsing_cylinder.c
@@ -6,7 +6,7 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/15 19:54:13 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/18 17:24:08 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:53:04 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,15 +16,17 @@ t_scene	parsing_cylindre(t_scene scene)
 {
 	char	**tokens;
 
-	tokens = get_tokens_secure(scene, scene.numCylinders, MAX_CYLINDERS, 6);
+	tokens = get_tokens_secure(scene, scene.num_cylinders, MAX_CYLINDERS, 6);
 	scene.token_if_exit = tokens;
-	scene.cylinders[scene.numCylinders].center = parse_vector(tokens[1], scene);
-	scene.cylinders[scene.numCylinders].axis = parse_vector_normalize(tokens[2],
+	scene.cylinders[scene.num_cylinders].center = \
+		parse_vector(tokens[1], scene);
+	scene.cylinders[scene.num_cylinders].axis = \
+		parse_vector_normalize(tokens[2],
 			scene);
-	scene.cylinders[scene.numCylinders].radius = ft_atof(tokens[3]);
-	scene.cylinders[scene.numCylinders].height = ft_atof(tokens[4]);
-	scene.cylinders[scene.numCylinders].color = parse_color(tokens[5], scene);
+	scene.cylinders[scene.num_cylinders].radius = ft_atof(tokens[3]);
+	scene.cylinders[scene.num_cylinders].height = ft_atof(tokens[4]);
+	scene.cylinders[scene.num_cylinders].color = parse_color(tokens[5], scene);
 	ft_free_array(tokens);
-	scene.numCylinders++;
+	scene.num_cylinders++;
 	return (scene);
 }
diff --git a/parsing_light.c b/parsing_light.c
index 9b06b15..cf580f1 100644
--- a/parsing_light.c
+++ b/parsing_light.c
@@ -6,7 +6,7 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/15 19:39:08 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/17 21:29:55 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:49:57 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,12 +16,12 @@ t_scene	parsing_light(t_scene scene)
 {
 	char	**tokens;
 
-	tokens = get_tokens_secure(scene, scene.numLights, MAX_LIGHTS, 4);
+	tokens = get_tokens_secure(scene, scene.num_lights, MAX_LIGHTS, 4);
 	scene.token_if_exit = tokens;
-	scene.lights[scene.numLights].pos = parse_vector(tokens[1], scene);
-	scene.lights[scene.numLights].brightness = ft_atof(tokens[2]);
-	scene.lights[scene.numLights].color = parse_color(tokens[3], scene);
+	scene.lights[scene.num_lights].pos = parse_vector(tokens[1], scene);
+	scene.lights[scene.num_lights].brightness = ft_atof(tokens[2]);
+	scene.lights[scene.num_lights].color = parse_color(tokens[3], scene);
 	ft_free_array(tokens);
-	scene.numLights++;
+	scene.num_lights++;
 	return (scene);
 }
diff --git a/parsing_plane.c b/parsing_plane.c
index 9be62ad..60e2a99 100644
--- a/parsing_plane.c
+++ b/parsing_plane.c
@@ -6,7 +6,7 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/15 19:49:41 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/18 20:34:02 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:50:10 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,14 +16,14 @@ t_scene	parsing_plane(t_scene scene)
 {
 	char	**tokens;
 
-	tokens = get_tokens_secure(scene, scene.numPlanes, MAX_PLANES, 4);
+	tokens = get_tokens_secure(scene, scene.num_planes, MAX_PLANES, 4);
 	scene.token_if_exit = tokens;
-	scene.planes[scene.numPlanes].point = parse_vector(tokens[1], scene);
-	scene.planes[scene.numPlanes].normal = parse_vector_normalize(tokens[2],
+	scene.planes[scene.num_planes].point = parse_vector(tokens[1], scene);
+	scene.planes[scene.num_planes].normal = parse_vector_normalize(tokens[2],
 			scene);
-	scene.planes[scene.numPlanes].color = parse_color(tokens[3], scene);
+	scene.planes[scene.num_planes].color = parse_color(tokens[3], scene);
 	ft_free_array(tokens);
-	scene.numPlanes++;
+	scene.num_planes++;
 	return (scene);
 }
 
diff --git a/parsing_sphere.c b/parsing_sphere.c
index 19bacf0..46d8526 100644
--- a/parsing_sphere.c
+++ b/parsing_sphere.c
@@ -6,7 +6,7 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/15 19:46:16 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/18 20:39:35 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:50:19 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,13 +16,13 @@ t_scene	parsing_sphere(t_scene scene)
 {
 	char	**tokens;
 
-	tokens = get_tokens_secure(scene, scene.numSpheres, MAX_SPHERES, 4);
+	tokens = get_tokens_secure(scene, scene.num_spheres, MAX_SPHERES, 4);
 	scene.token_if_exit = tokens;
-	scene.spheres[scene.numSpheres].center = parse_vector(tokens[1], scene);
-	scene.spheres[scene.numSpheres].radius = ft_atof(tokens[2]) / 2.0f;
-	scene.spheres[scene.numSpheres].color = parse_color(tokens[3], scene);
+	scene.spheres[scene.num_spheres].center = parse_vector(tokens[1], scene);
+	scene.spheres[scene.num_spheres].radius = ft_atof(tokens[2]) / 2.0f;
+	scene.spheres[scene.num_spheres].color = parse_color(tokens[3], scene);
 	ft_free_array(tokens);
-	scene.numSpheres++;
+	scene.num_spheres++;
 	return (scene);
 }
 
diff --git a/shadows.c b/shadows.c
index 86922d1..8dd5d95 100644
--- a/shadows.c
+++ b/shadows.c
@@ -6,7 +6,7 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/17 18:58:42 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/18 20:32:30 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:50:54 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,7 +22,7 @@ static bool	check_shadow_sphere(const t_ray shadow_ray, float max_t,
 	float		t;
 
 	i = 0;
-	while (i < scene.numSpheres)
+	while (i < scene.num_spheres)
 	{
 		t = intersect_sphere(shadow_ray, scene.spheres[i], &dummy);
 		if (t > epsilon && t < max_t)
@@ -42,7 +42,7 @@ static bool	check_shadow_plane(const t_ray shadow_ray, float max_t,
 	float		t;
 
 	i = 0;
-	while (i < scene.numPlanes)
+	while (i < scene.num_planes)
 	{
 		t = intersect_plane(shadow_ray, scene.planes[i], &dummy);
 		if (t > epsilon && t < max_t)
@@ -62,7 +62,7 @@ static bool	check_shadow_cylinder(const t_ray shadow_ray, float max_t,
 	float		t;
 
 	i = 0;
-	while (i < scene.numCylinders)
+	while (i < scene.num_cylinders)
 	{
 		t = intersect_cylinder(shadow_ray, scene.cylinders[i], &dummy);
 		if (t > epsilon && t < max_t)
diff --git a/tags b/tags
index e729cf1..686118f 100644
--- a/tags
+++ b/tags
@@ -284,8 +284,8 @@ bpp3	minilibx-linux/test/main.c	/^int	bpp3;$/;"	v	typeref:typename:int
 bpp4	minilibx-linux/test/main.c	/^int	bpp4;$/;"	v	typeref:typename:int
 brightness	miniRT.h	/^	float		brightness;$/;"	m	struct:s_light	typeref:typename:float
 c	miniRT.h	/^	float		c;$/;"	m	struct:s_calc	typeref:typename:float
-calc_light_contribution	trace.c	/^static t_vec3 calc_light_contribution(t_hit_info hit, t_light light, t_camera camera, t_scene sc/;"	f	typeref:typename:t_vec3	file:
-calc_lighting	trace.c	/^t_vec3 calc_lighting(t_vec3 hit_point, t_vec3 hit_normal, t_vec3 obj_color, t_scene scene)$/;"	f	typeref:typename:t_vec3
+calc_light_contribution	trace.c	/^static t_vec3	calc_light_contribution(t_hit_info hit, t_light light,$/;"	f	typeref:typename:t_vec3	file:
+calc_lighting	trace.c	/^t_vec3	calc_lighting(t_vec3 hit_point, t_vec3 hit_normal, t_vec3 obj_color,$/;"	f	typeref:typename:t_vec3
 camDir	miniRT.h	/^	t_vec3		camDir;$/;"	m	struct:s_camera	typeref:typename:t_vec3
 camPos	miniRT.h	/^	t_vec3		camPos;$/;"	m	struct:s_camera	typeref:typename:t_vec3
 camera	miniRT.h	/^	t_camera	camera;$/;"	m	struct:s_scene	typeref:typename:t_camera
@@ -298,7 +298,7 @@ check_shadow_plane	shadows.c	/^static bool	check_shadow_plane(const t_ray shadow
 check_shadow_sphere	shadows.c	/^static bool	check_shadow_sphere(const t_ray shadow_ray, float max_t,$/;"	f	typeref:typename:bool	file:
 check_sign	ft_atof.c	/^inline static char	*check_sign(char *str, int *sign)$/;"	f	typeref:typename:char *	file:
 check_tokens	check.c	/^int	check_tokens(char **tokens, int expected)$/;"	f	typeref:typename:int
-clamp_color	trace.c	/^static t_vec3 clamp_color(t_vec3 color)$/;"	f	typeref:typename:t_vec3	file:
+clamp_color	trace.c	/^static t_vec3	clamp_color(t_vec3 color)$/;"	f	typeref:typename:t_vec3	file:
 clean	libft/Makefile	/^clean:$/;"	t
 clean	makefile	/^clean:$/;"	t
 clean	minilibx-linux/Makefile	/^clean	:$/;"	t
@@ -572,12 +572,12 @@ next	minilibx-linux/mlx_int.h	/^	struct s_win_list	*next;$/;"	m	struct:s_win_lis
 normal	miniRT.h	/^	t_vec3		normal;$/;"	m	struct:s_plane	typeref:typename:t_vec3
 normal	miniRT.h	/^    t_vec3	normal;$/;"	m	struct:s_hit	typeref:typename:t_vec3
 normal	miniRT.h	/^    t_vec3 normal;$/;"	m	struct:s_hit_info	typeref:typename:t_vec3
-numAmbient	miniRT.h	/^	int			numAmbient;$/;"	m	struct:s_scene	typeref:typename:int
-numCamera	miniRT.h	/^	int			numCamera;$/;"	m	struct:s_scene	typeref:typename:int
-numCylinders	miniRT.h	/^	int			numCylinders;$/;"	m	struct:s_scene	typeref:typename:int
-numLights	miniRT.h	/^	int			numLights;$/;"	m	struct:s_scene	typeref:typename:int
-numPlanes	miniRT.h	/^	int			numPlanes;$/;"	m	struct:s_scene	typeref:typename:int
-numSpheres	miniRT.h	/^	int			numSpheres;$/;"	m	struct:s_scene	typeref:typename:int
+num_ambient	miniRT.h	/^	int			num_ambient;$/;"	m	struct:s_scene	typeref:typename:int
+num_camera	miniRT.h	/^	int			num_camera;$/;"	m	struct:s_scene	typeref:typename:int
+num_cylinders	miniRT.h	/^	int			num_cylinders;$/;"	m	struct:s_scene	typeref:typename:int
+num_lights	miniRT.h	/^	int			num_lights;$/;"	m	struct:s_scene	typeref:typename:int
+num_planes	miniRT.h	/^	int			num_planes;$/;"	m	struct:s_scene	typeref:typename:int
+num_spheres	miniRT.h	/^	int			num_spheres;$/;"	m	struct:s_scene	typeref:typename:int
 oc	miniRT.h	/^	t_vec3		oc;$/;"	m	struct:s_calc	typeref:typename:t_vec3
 oc_dot_v	miniRT.h	/^	float		oc_dot_v;$/;"	m	struct:s_calc	typeref:typename:float
 oc_perp	miniRT.h	/^	t_vec3		oc_perp;$/;"	m	struct:s_calc	typeref:typename:t_vec3
diff --git a/trace.c b/trace.c
index f65fb01..f405e67 100644
--- a/trace.c
+++ b/trace.c
@@ -6,52 +6,64 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/17 19:07:07 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/19 16:37:40 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/19 16:52:23 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "miniRT.h"
 
-static t_vec3 clamp_color(t_vec3 color)
+static t_vec3	clamp_color(t_vec3 color)
 {
-    if (color.x > 1.0f)
-        color.x = 1.0f;
-    if (color.y > 1.0f)
-        color.y = 1.0f;
-    if (color.z > 1.0f)
-        color.z = 1.0f;
-    return color;
+	if (color.x > 1.0f)
+		color.x = 1.0f;
+	if (color.y > 1.0f)
+		color.y = 1.0f;
+	if (color.z > 1.0f)
+		color.z = 1.0f;
+	return (color);
 }
 
-static t_vec3 calc_light_contribution(t_hit_info hit, t_light light, t_camera camera, t_scene scene)
+static t_vec3	calc_light_contribution(t_hit_info hit, t_light light,
+		t_camera camera, t_scene scene)
 {
-    t_vec3 l = vec3_normalize(vec3_sub(light.pos, hit.point));   // Variable 1
-    if (is_in_shadow(hit.point, light.pos, scene))
-        return (t_vec3){0, 0, 0};
-    float diff = fmaxf(0.0f, vec3_dot(hit.normal, l));             // Variable 2
-    t_vec3 view_dir = vec3_normalize(vec3_sub(camera.camPos, hit.point)); // Variable 3
-    t_vec3 half_dir = vec3_normalize(vec3_add(l, view_dir));         // Variable 4
-    float spec = powf(fmaxf(0.0f, vec3_dot(hit.normal, half_dir)), 32.0f); // Variable 5
-    return vec3_add(
-           vec3_scale(vec3_mul(hit.color, light.color), diff * light.brightness),
-           vec3_scale((t_vec3){1, 1, 1}, spec * light.brightness));
+	t_vec3	l;
+	float	diff;
+	t_vec3	view_dir;
+	t_vec3	half_dir;
+	float	spec;
+
+	l = vec3_normalize(vec3_sub(light.pos, hit.point));
+	if (is_in_shadow(hit.point, light.pos, scene))
+		return ((t_vec3){0, 0, 0});
+	diff = fmaxf(0.0f, vec3_dot(hit.normal, l));
+	view_dir = vec3_normalize(vec3_sub(camera.camPos, hit.point));
+	half_dir = vec3_normalize(vec3_add(l, view_dir));
+	spec = powf(fmaxf(0.0f, vec3_dot(hit.normal, half_dir)), 32.0f);
+	return (vec3_add(vec3_scale(vec3_mul(hit.color, \
+			light.color), diff * light.brightness), \
+			vec3_scale((t_vec3){1, 1, 1}, \
+			spec * light.brightness)));
 }
 
-t_vec3 calc_lighting(t_vec3 hit_point, t_vec3 hit_normal, t_vec3 obj_color, t_scene scene)
+t_vec3	calc_lighting(t_vec3 hit_point, t_vec3 hit_normal, t_vec3 obj_color,
+		t_scene scene)
 {
-    t_vec3 color = vec3_scale(obj_color, scene.ambient.ratio);  // Variable 1
-    t_hit_info hit;                                             // Variable 2
-    hit.point = hit_point;
-    hit.normal = hit_normal;
-    hit.color = obj_color;
-    int i = 0;                                                  // Variable 3
-    while (i < scene.numLights)
-    {
-        color = vec3_add(color,
-                calc_light_contribution(hit, scene.lights[i], scene.camera, scene));
-        i++;
-    }
-    return clamp_color(color);
+	t_vec3		color;
+	t_hit_info	hit;
+	int			i;
+
+	color = vec3_scale(obj_color, scene.ambient.ratio);
+	hit.point = hit_point;
+	hit.normal = hit_normal;
+	hit.color = obj_color;
+	i = 0;
+	while (i < scene.num_lights)
+	{
+		color = vec3_add(color, calc_light_contribution(hit, scene.lights[i],
+					scene.camera, scene));
+		i++;
+	}
+	return (clamp_color(color));
 }
 
 // Fonction principale de lancer de rayon (trace)
@@ -68,8 +80,8 @@ t_vec3	trace(t_ray ray, t_scene scene)
 	scene.ray = ray;
 	if (intersect_objects(&t_min, &hit_normal, &obj_color, scene))
 	{
-		hit_point = vec3_add(scene.ray.origin, \
-			vec3_scale(scene.ray.dir, t_min));
+		hit_point = vec3_add(scene.ray.origin, vec3_scale(scene.ray.dir,
+					t_min));
 		return (calc_lighting(hit_point, hit_normal, obj_color, scene));
 	}
 	return ((t_vec3){0, 0, 0});