diff --git a/game/.game.h.swp b/game/.game.h.swp index 8de16d6..f392d08 100644 Binary files a/game/.game.h.swp and b/game/.game.h.swp differ diff --git a/game/game.h b/game/game.h index 8709a06..813103f 100644 --- a/game/game.h +++ b/game/game.h @@ -6,7 +6,7 @@ /* By: erey-bet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/26 15:29:34 by erey-bet #+# #+# */ -/* Updated: 2023/05/02 15:56:17 by erey-bet ### ########.fr */ +/* Updated: 2023/05/03 12:42:31 by erey-bet ### ########.fr */ /* */ /* ************************************************************************** */ @@ -48,6 +48,9 @@ typedef struct s_dda int step_y; int hit; int side; + int line_height; + int draw_start; + int draw_end; } t_dda; typedef struct s_game @@ -60,7 +63,7 @@ typedef struct s_game } t_game; /* INIT */ -t_game *init(t_map *map); +void init(t_map *map, t_game *game); /* MANAGE */ void manage(mlx_key_data_t keydata, void *param); diff --git a/game/init.c b/game/init.c index f343418..403166a 100644 --- a/game/init.c +++ b/game/init.c @@ -6,7 +6,7 @@ /* By: erey-bet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/27 14:50:22 by erey-bet #+# #+# */ -/* Updated: 2023/05/02 15:18:05 by erey-bet ### ########.fr */ +/* Updated: 2023/05/03 12:44:19 by erey-bet ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,18 +20,21 @@ void init_ply(t_map *map, t_ply *ply) void init_ray(t_ray *ray) { - ray->x = 0; - ray->y = 0; + ray->dir_x = 0; + ray->dir_y = 0; } -void init(t_map *map, t_game &game) +void init(t_map *map, t_game *game) { t_ply ply; t_ray ray; - game.mlx = mlx_init(WIDTH, HEIGHT, "jan lili", true); - if (!game.mlx) - return (NULL); - game.map = map; + game->mlx = mlx_init(WIDTH, HEIGHT, "jan lili", true); + if (!game->mlx) + return ; + game->map = map; init_ply(map, &ply); + game->ply = &ply; + init_ray(&ray); + game->ray = &ray; } diff --git a/game/manage_keys.c b/game/manage_keys.c index d58fcd7..acde5d5 100644 --- a/game/manage_keys.c +++ b/game/manage_keys.c @@ -6,7 +6,7 @@ /* By: erey-bet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/27 14:14:51 by erey-bet #+# #+# */ -/* Updated: 2023/04/28 12:50:21 by erey-bet ### ########.fr */ +/* Updated: 2023/05/03 12:44:41 by erey-bet ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ int movement(t_ply *ply, int key) { - else if (key == MLX_KEY_W) + if (key == MLX_KEY_W) ply->pos_y -= 0.1; else if (key == MLX_KEY_S) ply->pos_y += 0.1; diff --git a/game/raycasting.c b/game/raycasting.c index 742dbf0..46c80c9 100644 --- a/game/raycasting.c +++ b/game/raycasting.c @@ -6,7 +6,7 @@ /* By: erey-bet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/27 14:30:29 by erey-bet #+# #+# */ -/* Updated: 2023/05/02 15:56:09 by erey-bet ### ########.fr */ +/* Updated: 2023/05/03 12:45:15 by erey-bet ### ########.fr */ /* */ /* ************************************************************************** */ @@ -28,12 +28,12 @@ int ray(t_game *game) ray->dir_x = p->dir_x + p->pla_x * camera; ray->dir_y = p->dir_y + p->pla_y * camera; } + return(0); } int raycasting(t_game *game) { - (void)game; - ray(game) + ray(game); write(1, "raycasting...\n", 14); return (0); }