v1.0 - normed texture system, multiple keypress, fixes on parsing, removed trailing maps
This commit is contained in:
parent
e581c72b02
commit
3f43074d05
35 changed files with 474 additions and 438 deletions
|
|
@ -6,25 +6,22 @@
|
|||
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/11/11 19:53:42 by rparodi #+# #+# */
|
||||
/* Updated: 2024/12/05 16:55:30 by rparodi ### ########.fr */
|
||||
/* Updated: 2024/12/16 14:40:55 by bgoulard ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "cub3d.h"
|
||||
#include "cub3d_struct.h"
|
||||
|
||||
#include "mlx_functions.h"
|
||||
#include "mlx_structs.h"
|
||||
#include "ft_string.h"
|
||||
|
||||
#include "ft_math.h"
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
#include <X11/keysym.h>
|
||||
|
||||
int c3_frame_update(void *inf_ptr);
|
||||
|
||||
int key_hook(int keycode, t_info *data);
|
||||
|
||||
/* move player w keys and call to redraw screen */
|
||||
int c3_keyhook(int keycode, t_info *info)
|
||||
{
|
||||
if (keycode == XK_Escape || keycode == 65307)
|
||||
|
|
@ -41,8 +38,8 @@ t_win_list *c3_init_mlx_window(t_info *info)
|
|||
{
|
||||
mlx_get_screen_size(info->mlx_ptr, \
|
||||
&info->screen_size.x, &info->screen_size.y);
|
||||
/*info->screen_size.x *= WIN_COEF;*/
|
||||
/*info->screen_size.y *= WIN_COEF;*/
|
||||
info->screen_size.x *= WIN_COEF;
|
||||
info->screen_size.y *= WIN_COEF;
|
||||
ft_clamp(info->screen_size.x, 0, 1920);
|
||||
ft_clamp(info->screen_size.y, 0, 1080);
|
||||
return (\
|
||||
|
|
@ -58,7 +55,9 @@ int init_mlx_env(t_info *info)
|
|||
info->win_ptr = c3_init_mlx_window(info);
|
||||
if (!info->win_ptr)
|
||||
return (ERROR_MLX);
|
||||
mlx_hook(info->win_ptr, KeyPress, KeyPressMask, key_hook, info);
|
||||
mlx_hook(info->win_ptr, KeyPress, KeyPressMask, keypress_feature, info);
|
||||
mlx_hook(info->win_ptr, KeyRelease, KeyReleaseMask, keyrelease_feature, \
|
||||
info);
|
||||
mlx_hook(info->win_ptr, DestroyNotify, StructureNotifyMask, \
|
||||
c3_redcross, info);
|
||||
mlx_loop_hook(info->mlx_ptr, (int (*)())shelves_launch, info);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue