Merge remote-tracking branch 'origin/quinten' into willem

.vscode/settings.json

@@ -3,7 +3,8 @@
 		"game.h": "c",
 		"cub3d.h": "c",
 		"screen.h": "c",
-		"mlx42.h": "c"
+		"mlx42.h": "c",
+		"glfw3.h": "c"
 	},
 	"cmake.ignoreCMakeListsMissing": true
 }

inc/cub3d.h

@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
-/*                                                        ::::::::            */
+/*                                                        :::      ::::::::   */
-/*   cub3d.h                                            :+:    :+:            */
+/*   cub3d.h                                            :+:      :+:    :+:   */
-/*                                                     +:+                    */
+/*                                                    +:+ +:+         +:+     */
-/*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
+/*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
-/*                                                   +#+                      */
+/*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/15 12:22:29 by qmennen           #+#    #+#             */
-/*   Updated: 2025/04/19 14:46:34 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/04/22 17:15:32 by qmennen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -48,4 +48,6 @@
 # include "collision.h"
 # include "parser.h"
 
+int initialize_cub3d(t_game **game, const char *mapfile);
+
 #endif

inc/game.h

@@ -6,7 +6,7 @@
 /*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/04/15 15:46:16 by qmennen       #+#    #+#                 */
-/*   Updated: 2025/04/22 12:59:11 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/04/23 11:56:48 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,6 +17,7 @@
 
 int		game_create(t_game **game);
 void	game_loop(void *param);
+void	game_free(t_game *game);
 void	game_terminate(t_game *game);
 void	free_game(t_game **game);
 

inc/map.h

@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
-/*                                                        ::::::::            */
+/*                                                        :::      ::::::::   */
-/*   map.h                                              :+:    :+:            */
+/*   map.h                                              :+:      :+:    :+:   */
-/*                                                     +:+                    */
+/*                                                    +:+ +:+         +:+     */
-/*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
+/*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
-/*                                                   +#+                      */
+/*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/17 19:19:19 by qmennen           #+#    #+#             */
-/*   Updated: 2025/04/20 13:51:19 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/04/22 17:24:47 by qmennen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,7 +15,7 @@
 
 # include "cub3d.h"
 
-int	map_create(t_game **game, int argc, char **argv);
+int		map_create(t_game **game, const char *mapfile);
 void	map_free(t_map *map);
 void print_map(t_map *map);
 t_tile	get_tile(t_map * map, int x, int y);

inc/screen.h

@@ -6,7 +6,7 @@
 /*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/15 15:30:34 by qmennen           #+#    #+#             */
-/*   Updated: 2025/04/15 16:48:24 by qmennen          ###   ########.fr       */
+/*   Updated: 2025/04/22 17:20:41 by qmennen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,7 +15,7 @@
 
 #include "cub3d.h"
 
-t_screen	*screen_create();
+int			screen_create(t_game **game);
-void		screen_center(t_screen *screen);
+int			screen_display(t_screen *screen);
 
 #endif

src/game.c

@@ -6,7 +6,7 @@
 /*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/04/15 15:46:08 by qmennen       #+#    #+#                 */
-/*   Updated: 2025/04/22 15:42:09 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/04/23 11:57:06 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,12 +19,8 @@ int	game_create(t_game **game)
 		return (FAILURE);
 	(*game)->player = NULL;
 	(*game)->map = NULL;
-	(*game)->screen = screen_create();
+	(*game)->screen = NULL;
-	if ((*game)->screen == NULL)
+	(*game)->keyboard = NULL;
-		return (FAILURE);
-	if (((*game)->screen->mlx == NULL) || ((*game)->screen->img == NULL))
-		return (FAILURE);
-	mlx_image_to_window((*game)->screen->mlx, (*game)->screen->img, 0, 0);
 	return (SUCCESS);
 }
 
@@ -56,7 +52,7 @@ void	game_loop(void *param)
 	keyboard_update(game); // Goes last
 }
 
-void	game_terminate(t_game *game)
+void	game_free(t_game *game)
 {
 	if (game->screen)
 	{
@@ -72,5 +68,10 @@ void	game_terminate(t_game *game)
 	if (game->keyboard)
 		free(game->keyboard);
 	free(game);
+}
+
+void	game_terminate(t_game *game)
+{
+	game_free(game);
 	exit(EXIT_SUCCESS);
 }

src/main.c

@@ -6,70 +6,31 @@
 /*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/04/15 16:01:29 by qmennen       #+#    #+#                 */
-/*   Updated: 2025/04/22 16:06:53 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/04/23 11:58:04 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
 # include "cub3d.h"
 
-static int init_game(t_game **game, int argc, char **argv)
-{
-	if (!game_create(game))
-		return (FAILURE);
-	if (!player_create(game))
-		return (FAILURE);
-	if (!map_create(game, argc, argv))
-		return (FAILURE);
-	if (!keyboard_create(game))
-		return (FAILURE);
-	screen_center((*game)->screen);
-	mlx_key_hook((*game)->screen->mlx, keyhandle, *game);
-	mlx_loop_hook((*game)->screen->mlx, game_loop, *game);
-	return (SUCCESS);
-}
-
-
 int	main(int argc, char **argv)
 {
 	t_game	*game;
 
 	errno = 0;
 	game = NULL;
-	if (!init_game(&game, argc, argv))
+	if (argc != 2)
 	{
-		ft_putstr_fd("Error initializing game\n", 2);
+		ft_putstr_fd("Usage: ./cub3d <map.cub>\n", 2);
-		free_game(&game);
 		return (EXIT_FAILURE);
 	}
+	if (!initialize_cub3d(&game, argv[1]))
+	{
+		perror("initialize_cub3d");
+		game_free(game);
+		return (EXIT_FAILURE);
+	}
+	perror("after init");
 	mlx_loop(game->screen->mlx);
 	game_terminate(game);
 	return (EXIT_SUCCESS);
 }
-
-
-// int main(int argc, char **argv)
-// {
-// 	t_map	map;
-// 	char	*buffer;
-
-// 	if (argc != 2)
-// 	{
-// 		ft_putstr_fd("Usage: ./cub3d <map.cub>\n", 2);
-// 		return (1);
-// 	}
-// 	buffer = read_map_file(argv[1]);
-// 	if (!buffer)
-// 	{
-// 		perror("Error reading map file");
-// 		return (1);
-// 	}
-// 	if (parse_file(buffer, &map) == FAILURE)
-// 	{
-// 		ft_putstr_fd("Error parsing map file\n", 2);
-// 		free(buffer);
-// 		return (1);
-// 	}
-// 	print_map(&map);
-// 	free(buffer);
-// 	return (0);
-// }

src/map.c

@@ -6,7 +6,7 @@
 /*   By: whaffman <whaffman@student.codam.nl>         +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/04/22 13:20:51 by whaffman      #+#    #+#                 */
-/*   Updated: 2025/04/22 16:09:18 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/04/23 12:00:48 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -99,17 +99,11 @@ int enclosed_map(t_map *map)
 	return SUCCESS;
 }
 
-
+static int parse_args(const char *mapfile, t_map *map)
-static int parse_args(int argc, char **argv, t_map *map)
 {
 	char	*buffer;
 
-	if (argc != 2)
+	buffer = read_map_file(mapfile);
-	{
-		ft_putstr_fd("Usage: ./cub3d <map.cub>\n", 2);
-		return (FAILURE);
-	}
-	buffer = read_map_file(argv[1]);
 	if (!buffer)
 	{
 		perror("Error reading map file");
@@ -186,7 +180,7 @@ void grid_free(t_tile **grid, int height)
 	free(grid);
 }
 
-int	map_create(t_game **game, int argc, char **argv)
+int	map_create(t_game **game, const char *mapfile)
 
 {
 	t_map	*map;
@@ -200,7 +194,7 @@ int	map_create(t_game **game, int argc, char **argv)
 		perror("Error allocating memory for map");
 		return (FAILURE);
 	}
-	parse_args(argc, argv, map);
+	parse_args(mapfile, map);
 	print_map(map);
 	grid = copy_map(map->grid, map->width, map->height);
 	if (!grid)

src/screen.c

@@ -6,15 +6,13 @@
 /*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/15 15:30:27 by qmennen           #+#    #+#             */
-/*   Updated: 2025/04/15 19:21:23 by qmennen          ###   ########.fr       */
+/*   Updated: 2025/04/22 17:25:13 by qmennen          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "screen.h"
-#include "MLX42.h"
-#include <GLFW/glfw3.h>
 
-t_screen	*screen_create()
+int	screen_create(t_game **game)
 {
 	t_screen	*screen;
 	mlx_image_t	*img;
@@ -22,29 +20,40 @@ t_screen	*screen_create()
 
 	screen = malloc(sizeof(t_screen));
 	if (!screen)
-		return (NULL);
+		return (FAILURE);
 	screen->width = WIDTH;
 	screen->height = HEIGHT;
 	mlx = mlx_init(WIDTH, HEIGHT, TITLE, false);
+	if (!mlx)
+		return (FAILURE);
 	//TODO: figure out why errno = 11 after this call
 	screen->mlx = mlx;
 	img = mlx_new_image(screen->mlx, WIDTH, HEIGHT);
+	if (!img)
+		return (FAILURE);
 	screen->img = img;
-	return (screen);
+	(*game)->screen = screen;
+	return (SUCCESS);
 }
 
-void	screen_center(t_screen *screen)
+int	screen_display(t_screen *screen)
 {
 	int	m_width;
 	int	m_height;
 
 	m_width = 0;
 	m_height = 0;
+	if (mlx_image_to_window(screen->mlx, screen->img, 0, 0) < 0)
+	{
+		printf(RED"Failed to display buffer image\n"RESET);
+		return (FAILURE);
+	}
 	mlx_get_monitor_size(0, &m_width, &m_height);
 	if (m_width == 0 || m_height == 0)
 	{
 		printf(RED"Failed to retrieve monitor size to center window\n"RESET);
-		return ;
+		return (FAILURE);
 	}
 	mlx_set_window_pos(screen->mlx, (m_width - screen->width) / 2, (m_height - screen->height) / 2);
+	return (SUCCESS);
 }

src/util/initialize.c

@@ -0,0 +1,32 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   initialize.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2025/04/22 17:08:26 by qmennen           #+#    #+#             */
+/*   Updated: 2025/04/22 17:21:37 by qmennen          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "cub3d.h"
+
+int initialize_cub3d(t_game **game, const char *mapfile)
+{
+	if (!game_create(game))
+		return (FAILURE);
+	if (!map_create(game, mapfile))
+		return (FAILURE);
+	if (!screen_create(game))
+		return (FAILURE);
+	if (!player_create(game))
+		return (FAILURE);
+	if (!keyboard_create(game))
+		return (FAILURE);
+	if (!screen_display((*game)->screen))
+		return (FAILURE);
+	mlx_key_hook((*game)->screen->mlx, keyhandle, *game);
+	mlx_loop_hook((*game)->screen->mlx, game_loop, *game);
+	return (SUCCESS);
+}