rparodi/Cub3D
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge bgoulard branch on master

Browse source
This commit is contained in:
Baptiste GOULARD 2024-11-28 13:56:45 +01:00
commit 2568aa69a6
14 changed files with 464 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mlx_layer/mlx_init.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/11 19:53:42 by rparodi #+# #+# */
/* Updated: 2024/11/26 13:40:17 by rparodi ### ########.fr */
/* Updated: 2024/11/28 13:55:09 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,11 +20,11 @@
int c3_frame_update(void *inf_ptr);
/* move player w keys and call to redraw screen */
int c3_keyhook(int keycode, t_info *info)
{
if (keycode == XK_Escape || keycode == 65307)
return (mlx_loop_end(info->mlx_ptr), EXIT_SUCCESS);
/* move player w keys and call to redraw screen */
return (EXIT_SUCCESS);
}
@ -35,8 +35,8 @@ int c3_redcross(t_info *info)
t_win_list *c3_init_mlx_window(t_info *info)
{
int x;
int y;
int x;
int y;
x = 0;
y = 0;
@ -55,6 +55,6 @@ int init_mlx_env(t_info *info)
mlx_hook(info->win_ptr, KeyPress, KeyPressMask, c3_keyhook, info);
mlx_hook(info->win_ptr, DestroyNotify, StructureNotifyMask, c3_redcross, info);
mlx_loop_hook(info->mlx_ptr, (int (*)())shelves_launch, &info);
/*mlx_loop_hook(info->mlx_ptr, c3_frame_update, info);*/
mlx_loop_hook(info->mlx_ptr, c3_frame_update, info);
return (NO_ERROR);
}