From: Dominik Kaiser <dkaiser@1-C-7.42heilbronn.de>
Date: Thu, 9 May 2024 17:25:14 +0000 (+0200)
Subject: Add player image
X-Git-Url: https://git.dkaiser.de/?a=commitdiff_plain;h=9306ce8b7950960d72a8e0871d917df181d900fa;p=42%2Fso_long.git

Add player image
---

diff --git a/include/so_long.h b/include/so_long.h
index 1661dbe..bff3115 100644
--- a/include/so_long.h
+++ b/include/so_long.h
@@ -6,13 +6,15 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/08 14:14:02 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/09 17:59:42 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/09 19:24:00 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef SO_LONG_H
 # define SO_LONG_H
 
+# define PLAYER_MOVE_SPEED 3
+
 # include "libft.h"
 # include "mlx.h"
 
@@ -36,6 +38,7 @@ typedef struct s_player
 	t_vector	position;
 	t_vector    direction;
 	t_vector	velocity;
+	void *img;
 }				t_player;
 
 typedef struct s_game
diff --git a/src/draw.c b/src/draw.c
index 759f03f..ce23842 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/09 17:58:23 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/09 18:05:58 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/09 19:24:37 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,6 +15,7 @@
 
 int	draw(t_game *game)
 {
+	mlx_clear_window(game->mlx, game->window);
 	if (game->input_direction & UP)
 		mlx_string_put(game->mlx, game->window, 150, 100, 0x00FFFFFF, "^");
 	if (game->input_direction & DOWN)
@@ -27,7 +28,7 @@ int	draw(t_game *game)
 		ft_itoa(game->player.direction.x));
 	mlx_string_put(game->mlx, game->window, 550, 500, 0x00FFFFFF,
 		ft_itoa(game->player.direction.y));
-
-    mlx_pixel_put(game->mlx, game->window, game->player.position.x, game->player.position.y, 0x00FFFF00);
+	mlx_put_image_to_window(game->mlx, game->window, game->player.img,
+		game->player.position.x, game->player.position.y);
 	return (0);
 }
diff --git a/src/init.c b/src/init.c
index 7c9645b..0aa6664 100644
--- a/src/init.c
+++ b/src/init.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/09 14:50:09 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/09 17:48:10 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/09 18:37:18 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,6 +25,8 @@ int	init(t_game *game)
 	init_hooks(game);
 	init_player(&game->player, 960, 540);
 	// TODO: make player spawn point dynamic
+	int w, h;
+    game->player.img = mlx_xpm_file_to_image(game->mlx, "textures/player.xpm", &w, &h);
 	return (0);
 }
 
diff --git a/src/loop.c b/src/loop.c
index 89eabba..d0d9fe5 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/09 15:09:24 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/09 18:03:03 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/09 19:08:51 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,15 +16,14 @@
 
 int	loop(t_game *game)
 {
-	mlx_clear_window(game->mlx, game->window);
 
 	game->player.direction.x = ((game->input_direction & RIGHT) != 0)
 		- ((game->input_direction & LEFT) != 0);
 	game->player.direction.y = ((game->input_direction & DOWN) != 0)
 		- ((game->input_direction & UP) != 0);
 
-    game->player.position.x += game->player.direction.x;
-    game->player.position.y += game->player.direction.y;
+    game->player.position.x += game->player.direction.x * PLAYER_MOVE_SPEED;
+    game->player.position.y += game->player.direction.y * PLAYER_MOVE_SPEED;
 
     draw(game);
 	return (0);