From c7743a590b5781248d90e2753472af104af94d0e Mon Sep 17 00:00:00 2001 From: Etienne Rey-bethbeder Date: Wed, 26 Apr 2023 15:45:21 +0200 Subject: [PATCH] Avancement game --- Makefile | 4 ++-- cube3D.h | 3 ++- game/game.c | 25 ++++++++++++++++++++----- game/game.h | 29 +++++++++++++++++++++++++++++ main.c | 4 +++- 5 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 game/game.h diff --git a/Makefile b/Makefile index 4e2409c..efb580f 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ SRCS = main.c game/game.c OBJS = ${SRCS:.c=.o} CC = clang -LIBS = libftx/libftx.a MLX42/build/libmlx42.a -CFLAGS = -g -Wall -Wextra -Werror +LIBS = libftx/libftx.a MLX42/build/libmlx42.a -ldl -lglfw -lm +CFLAGS = -g -Wall -Wextra -Werror -Wno-conversion -Ofast NAME = cub3D all: ${NAME} diff --git a/cube3D.h b/cube3D.h index baf11c3..e3fa20c 100644 --- a/cube3D.h +++ b/cube3D.h @@ -6,7 +6,7 @@ /* By: erey-bet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/26 12:34:04 by erey-bet #+# #+# */ -/* Updated: 2023/04/26 14:51:27 by erey-bet ### ########.fr */ +/* Updated: 2023/04/26 15:20:47 by erey-bet ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,6 +18,7 @@ # include # include # include +# include // img: 0=Nord, 1=WEST, 2=SUD, 3=EAST; diff --git a/game/game.c b/game/game.c index 0f94117..3eb3e19 100644 --- a/game/game.c +++ b/game/game.c @@ -6,7 +6,7 @@ /* By: erey-bet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/26 12:59:53 by erey-bet #+# #+# */ -/* Updated: 2023/04/26 14:47:50 by erey-bet ### ########.fr */ +/* Updated: 2023/04/26 15:44:55 by erey-bet ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,12 +14,27 @@ int start_game(t_map *map) { - mlx_t *mlx; + t_game *game; (void)map; - mlx = mlx_init(1920, 1080, "jan lili", true); - mlx_loop(mlx); - mlx_terminate(mlx); + game->mlx = mlx_init(1920, 1080, "jan lili", true) + if (mlx) + return (1); + game->window = mlx_new_image(game->mlx, 128, 128); + if (game->image) + { + mlx_close_window(game->mlx); + return(1); + } + if (mlx_image_to_window(game->mlx, game->window, 0, 0) == -1) + { + mlx_close_window(game->mlx); + return(1); + } + + mlx_loop_hook(game->mlx, manage, game) + mlx_loop(game->mlx); + mlx_terminate(game->mlx); return (0); } diff --git a/game/game.h b/game/game.h new file mode 100644 index 0000000..d51d761 --- /dev/null +++ b/game/game.h @@ -0,0 +1,29 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* game.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: erey-bet +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/04/26 15:29:34 by erey-bet #+# #+# */ +/* Updated: 2023/04/26 15:38:47 by erey-bet ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef GAME_H +# define GAME_H + +typedef struct s_player +{ + double pos_x; + double pos_y; +} t_ply; + +typedef struct s_game +{ + mlx_t *mlx; + mlx_image_t *windows; + t_ply *ply; +} t_game; + +#endif diff --git a/main.c b/main.c index fa87949..cbd44ce 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: erey-bet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/26 12:44:55 by erey-bet #+# #+# */ -/* Updated: 2023/04/26 14:50:46 by erey-bet ### ########.fr */ +/* Updated: 2023/04/26 15:20:32 by erey-bet ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,6 +18,7 @@ int main(int argc, char **argv) if (argc != 2) { + printf("No argument"); return (1); } /*map = map_parsing(argv[1]); @@ -27,6 +28,7 @@ int main(int argc, char **argv) }*/ (void)argv; map = malloc(sizeof(t_map)); + map->map = malloc(sizeof(char *) * 5); map->map[0] = "11111"; map->map[1] = "10001"; map->map[2] = "10S01";