From 81e3dc680b3895a8542d633d21b3698d4d41eaad Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Fri, 10 May 2024 17:39:41 +0200
Subject: Add tilemap loading

---
 src/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index cf517b6..53fb23d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,16 +6,20 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/08 14:14:13 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/10 10:53:37 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/10 17:30:38 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "so_long.h"
 
-int	main(void)
+int	main(int argc, char *argv[])
 {
 	t_game	game;
 
+	if (argc != 2)
+		return (1);
+	if (load_map_from_file(&game.map, argv[1]))
+		return (1);
 	init(&game);
 	mlx_loop(game.mlx);
 }
-- 
cgit v1.2.3


From e597be4f58e7252333192cb1e4211d74522b6102 Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Sat, 11 May 2024 16:27:45 +0200
Subject: Add wall rendering

---
 include/so_long.h |   3 ++-
 src/draw.c        |  30 +++++++++++++++++++++++++++++-
 src/main.c        |   3 ++-
 textures/wall.png | Bin 0 -> 99 bytes
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 textures/wall.png

(limited to 'src/main.c')

diff --git a/include/so_long.h b/include/so_long.h
index 47443aa..e9097d1 100644
--- a/include/so_long.h
+++ b/include/so_long.h
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/08 14:14:02 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/10 17:28:23 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/11 16:10:26 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -81,6 +81,7 @@ int				load_map_from_file(t_tilemap *tilemap, char *filename);
 int				init(t_game *game);
 void			loop(void *params);
 int				draw(t_game *game);
+int				draw_map(t_game *game);
 void			on_key_input(mlx_key_data_t event, void *params);
 
 #endif // SO_LONG_H
diff --git a/src/draw.c b/src/draw.c
index de4ba48..b5e5455 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -6,13 +6,41 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/09 17:58:23 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/10 11:58:52 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/11 16:00:17 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "MLX42/MLX42.h"
 #include "libft.h"
 #include "so_long.h"
 
+int draw_map(t_game *game)
+{
+	int x;
+	int y;
+	mlx_texture_t *wall_texture;
+	mlx_image_t *wall_image;
+
+	wall_texture = mlx_load_png("textures/wall.png");
+	wall_image = mlx_texture_to_image(game->mlx, wall_texture);
+	mlx_resize_image(wall_image, 48, 48);
+	game->map.tile_size.x = 48;
+	game->map.tile_size.y = 48;
+	x = 0;
+	while (x < game->map.grid_size.x)
+	{
+		y = 0;
+		while (y < game->map.grid_size.y)
+		{
+			if (game->map.tiles[y * game->map.grid_size.x + x] == WALL)
+				mlx_image_to_window(game->mlx, wall_image, x * game->map.tile_size.x, y * game->map.tile_size.y);
+			y++;
+		}
+		x++;
+	}
+	return (0);
+}
+
 int	draw(t_game *game)
 {
 	game->player.img->instances[0].x = game->player.position.x;
diff --git a/src/main.c b/src/main.c
index 53fb23d..f7352f4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/08 14:14:13 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/10 17:30:38 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/11 15:58:31 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,5 +21,6 @@ int	main(int argc, char *argv[])
 	if (load_map_from_file(&game.map, argv[1]))
 		return (1);
 	init(&game);
+	draw_map(&game);
 	mlx_loop(game.mlx);
 }
diff --git a/textures/wall.png b/textures/wall.png
new file mode 100644
index 0000000..358cdfb
Binary files /dev/null and b/textures/wall.png differ
-- 
cgit v1.2.3