Merge branch 'main' into parsing
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@ -9,5 +9,5 @@ libft/**/*.o
|
|||||||
libft/**/*.a
|
libft/**/*.a
|
||||||
src/main.c
|
src/main.c
|
||||||
vgcore.*
|
vgcore.*
|
||||||
src/cub3d.c
|
|
||||||
Makefile
|
Makefile
|
||||||
|
src/cub3d.c
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/09/11 16:38:40 by adjoly #+# #+# */
|
/* Created: 2024/09/11 16:38:40 by adjoly #+# #+# */
|
||||||
/* Updated: 2024/09/12 11:40:07 by adjoly ### ########.fr */
|
/* Updated: 2024/09/12 17:04:59 by adjoly ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -17,7 +17,6 @@ typedef struct s_cub
|
|||||||
{
|
{
|
||||||
void *mlx;
|
void *mlx;
|
||||||
void *win;
|
void *win;
|
||||||
int (*key_hook)(int, void*);
|
|
||||||
void *images;
|
void *images;
|
||||||
char **map;
|
char **map;
|
||||||
} t_cub;
|
} t_cub;
|
||||||
@ -27,6 +26,7 @@ typedef struct s_cub
|
|||||||
#define S_KEY 22
|
#define S_KEY 22
|
||||||
#define A_KEY 4
|
#define A_KEY 4
|
||||||
#define D_KEY 7
|
#define D_KEY 7
|
||||||
|
#define WHITE 0xFFFFFFFF
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief This function is used to handle keypress
|
* @brief This function is used to handle keypress
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/09/11 16:37:56 by adjoly #+# #+# */
|
/* Created: 2024/09/11 16:37:56 by adjoly #+# #+# */
|
||||||
/* Updated: 2024/09/12 11:43:02 by adjoly ### ########.fr */
|
/* Updated: 2024/09/12 14:40:22 by adjoly ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -14,11 +14,11 @@
|
|||||||
#include "mlx.h"
|
#include "mlx.h"
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
|
|
||||||
int key_hook(int key, void *mlx)
|
int key_hook(int key, t_cub *cub)
|
||||||
{
|
{
|
||||||
(void)mlx;
|
(void)mlx;
|
||||||
if (key == ESCAPE_KEY)
|
if (key == ESCAPE_KEY)
|
||||||
mlx_loop_end(mlx);
|
mlx_loop_end(cub->mlx);
|
||||||
if (key == W_KEY)
|
if (key == W_KEY)
|
||||||
printf("UP\n");
|
printf("UP\n");
|
||||||
if (key == S_KEY)
|
if (key == S_KEY)
|
||||||
|
Reference in New Issue
Block a user