42_adjoly/so_long
Archived
1
0
Fork 0
Code

ça a avancé

Browse Source
This commit is contained in:
Adam Joly
2024-01-07 22:45:08 +01:00
parent 9e19633e10
commit b04a3e73e3
5 changed files with 81 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -6,7 +6,7 @@
# By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ # # By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/11/01 11:03:22 by adjoly #+# #+# # # Created: 2023/11/01 11:03:22 by adjoly #+# #+# #
# Updated: 2024/01/06 17:13:23 by adjoly ### ########.fr # # Updated: 2024/01/07 19:32:37 by adjoly ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -15,14 +15,16 @@ NAME = so_long
CC = cc CC = cc
SRCS = main.c \ SRCS = main.c \
ft_move_character.c
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
FLAGS = -Werror -Wall -Wextra FLAGS = -Werror -Wall -Wextra -g
HEADER = so_long.h HEADER = so_long.h
MLX_OBJ = MacroLibX/libmlx.so MLX_OBJ = MacroLibX/libmlx.so \
libft/libft.a
MLX_FLAGS = -lSDL2 MLX_FLAGS = -lSDL2
@ -30,6 +32,7 @@ $(NAME): $(OBJS)
$(CC) $(FLAGS) $(MLX_FLAGS) $(OBJS) $(MLX_OBJ) -o $(NAME) $(CC) $(FLAGS) $(MLX_FLAGS) $(OBJS) $(MLX_OBJ) -o $(NAME)
%.o: %.c %.o: %.c
make -C libft
$(CC) $(FLAGS) -I $(HEADER) $< -c -o $@ $(CC) $(FLAGS) -I $(HEADER) $< -c -o $@
all: $(NAME) all: $(NAME)

47
ft_move_character.c Normal file
View File

@ -0,0 +1,47 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_move_character.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/07 19:13:01 by adjoly #+# #+# */
/* Updated: 2024/01/07 22:37:53 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
#include "so_long.h"
int ft_move_up(void *param)
{
}
int ft_move_down(void *param)
{
}
int ft_move_left(void *param)
{
}
int ft_move_right(void *param)
{
}
int ft_move_character(int key, void *param)
{
if (key == 26)
ft_move_up(param);
else if (key == 22)
ft_move_down(param);
else if (key == 4)
ft_move_right(param);
else if (key == 7)
ft_move_left(param);
ft_putnbr_fd(key, 1);
return (0);
}

1
libft Submodule

Submodule libft added at e391b9b0f7

35
main.c
View File

@ -6,10 +6,11 @@
/* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/06 16:18:56 by adjoly #+# #+# */ /* Created: 2024/01/06 16:18:56 by adjoly #+# #+# */
/* Updated: 2024/01/06 17:10:58 by adjoly ### ########.fr */ /* Updated: 2024/01/07 19:12:34 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "MacroLibX/includes/mlx.h"
#include "so_long.h" #include "so_long.h"
int key_close(int key, void *param) int key_close(int key, void *param)
@ -26,22 +27,32 @@ int win_close(int event, void *param)
return (0); return (0);
} }
int win_update(void *param)
{
t_window *win;
win = (t_window *)param;
mlx_pixel_put(win->mlx, win->win, 100, 100, 0xFFFFFF);
mlx_clear_window(win->mlx, win->win);
return (0);
}
int main(int ac, char **av) int main(int ac, char **av)
{ {
t_window win; t_window *win;
(void) ac; (void) ac;
(void) av; (void) av;
win.mlx = mlx_init(); win = ft_calloc(sizeof(t_window), 1);
win.win = mlx_new_window(win.mlx, 1600, 900, "so_fluffy"); win->mlx = mlx_init();
win->win = mlx_new_window(win->mlx, 1600, 900, "so_fluffy");
mlx_on_event(win.mlx, win.win, MLX_KEYDOWN, key_close, win.mlx);
mlx_on_event(win.mlx, win.win, MLX_WINDOW_EVENT, win_close, win.mlx);
mlx_loop(win.mlx);
mlx_destroy_window(win.mlx, win.win);
mlx_destroy_display(win.mlx);
mlx_on_event(win->mlx, win->win, MLX_KEYDOWN, key_close, win->mlx);
mlx_on_event(win->mlx, win->win, MLX_WINDOW_EVENT, win_close, win->mlx);
mlx_on_event(win->mlx, win->win, MLX_KEYDOWN, ft_move_character, win->mlx);
mlx_loop_hook(win->mlx, win_update, win);
mlx_loop(win->mlx);
mlx_destroy_window(win->mlx, win->win);
mlx_destroy_display(win->mlx);
return (0); return (0);
} }

6
so_long.h
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/06 16:19:42 by adjoly #+# #+# */ /* Created: 2024/01/06 16:19:42 by adjoly #+# #+# */
/* Updated: 2024/01/06 17:07:29 by adjoly ### ########.fr */ /* Updated: 2024/01/07 19:24:27 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,13 +14,15 @@
# define SO_LONG_H # define SO_LONG_H
# include "MacroLibX/includes/mlx.h" # include "MacroLibX/includes/mlx.h"
# include "libft/libft.h"
typedef struct s_window typedef struct s_window
{ {
void *mlx; void *mlx;
void *win; void *win;
void *img_win;
} t_window; } t_window;
int ft_move_character(int key, void *param);
int key_close(int key, void *param);
#endif #endif