DEBOGAGE

config.c

@@ -6,56 +6,56 @@
 /*   By: yantoine <yantoine@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/14 01:41:17 by yantoine          #+#    #+#             */
-/*   Updated: 2025/02/15 19:56:05 by yantoine         ###   ########.fr       */
+/*   Updated: 2025/02/17 21:52:57 by yantoine         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "miniRT.h"
 
-static inline t_scene	parsing_line(const char *line, t_scene scene)
+static inline t_scene	parsing_line(char *line, t_scene scene)
 {
-	scene->line_if_exit = line;
+	scene.line_if_exit = line;
 	if (line[0] == '#')
-		return ;
+		return (scene);
 	else if (line[0] == 'A')
-		parsing_ambiant(line, scene);
+		scene = parsing_ambiant(scene);
 	else if (line[0] == 'C')
-		parsing_camera(line, scene);
+		scene = parsing_camera(scene);
 	else if (line[0] == 'L')
-		parsing_light(line, scene);
+		scene = parsing_light(scene);
 	else if (ft_strncmp(line, "sp", 2) == 0)
-		parsing_sphere(line, scene);
+		scene = parsing_sphere(scene);
 	else if (ft_strncmp(line, "pl", 2) == 0)
-		parsing_plane(line, scene);
+		scene = parsing_plane(scene);
 	else if (ft_strncmp(line, "cy", 2) == 0)
-		parsing_cylindre(line, scene);
+		scene = parsing_cylindre(scene);
 	else
 		printf("Erreur : ligne non reconnue\n");
+	return (scene);
 }
 
 // ----- Parsing du fichier de configuration -----
 t_scene	load_config(const char *filename)
 {
 	int			fd;
-	char		line[256];
-	const char		*line;
+	char		*line;
 	t_scene		scene;
 
-	scene = create_scene(void);
-	fd = open(filename, "r");
+	scene = create_scene();
+	fd = open(filename, O_RDONLY);
 	if (!fd)
 	{
 		printf("Erreur : impossible d'ouvrir %s\n", filename);
-		return ;
+		return (scene);
 	}
 	scene.fd_if_exit = fd;
 	while (1)
 	{
-		line = (const char *)get_next_line(fd);
+		line = get_next_line(fd);
 		if (!line)
 			break ;
-		free(line);
 		parsing_line(line, scene);
+		free(line);
 	}
 	return (scene);
 }