Fixes
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
/* By: aortigos <aortigos@student.42malaga.com +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/11/25 19:47:02 by aortigos #+# #+# */
|
||||
/* Updated: 2026/01/25 16:27:23 by aortigos ### ########.fr */
|
||||
/* Updated: 2026/01/25 16:42:38 by aortigos ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
# include "../lib/ft_printf/ft_printf.h"
|
||||
# include "../lib/gnl/get_next_line.h"
|
||||
|
||||
|
||||
# define S_W 1920
|
||||
# define S_H 1080
|
||||
# define WALL_SIZE 64
|
||||
@@ -57,8 +56,8 @@ typedef struct s_tex
|
||||
// of failing. First check, then load as texture.
|
||||
typedef struct s_texture_list
|
||||
{
|
||||
char *name;
|
||||
char *value;
|
||||
char *name;
|
||||
char *value;
|
||||
struct s_texture_list *next;
|
||||
} t_texture_list;
|
||||
|
||||
@@ -90,35 +89,34 @@ typedef struct s_ray
|
||||
// Map data
|
||||
typedef struct s_data
|
||||
{
|
||||
int p_x;
|
||||
int p_y;
|
||||
int w_map;
|
||||
int h_map;
|
||||
int fd;
|
||||
char *line;
|
||||
char *ture;
|
||||
char **texture2d;
|
||||
char *map;
|
||||
char **map2d;
|
||||
char **sq_map;
|
||||
char **cc;
|
||||
char **ff;
|
||||
int p_x;
|
||||
int p_y;
|
||||
int w_map;
|
||||
int h_map;
|
||||
int fd;
|
||||
char *line;
|
||||
char *ture;
|
||||
char **texture2d;
|
||||
char *map;
|
||||
char **map2d;
|
||||
char **sq_map;
|
||||
char **cc;
|
||||
char **ff;
|
||||
t_texture_list *t_list;
|
||||
} t_data;
|
||||
|
||||
// All global data in one unique structure
|
||||
typedef struct s_mlx
|
||||
{
|
||||
mlx_image_t *img;
|
||||
mlx_t *mlx_ptr;
|
||||
t_ray *ray;
|
||||
t_data *dt;
|
||||
t_player *ply;
|
||||
t_tex *tex;
|
||||
mlx_image_t *img;
|
||||
mlx_t *mlx_ptr;
|
||||
t_ray *ray;
|
||||
t_data *dt;
|
||||
t_player *ply;
|
||||
t_tex *tex;
|
||||
t_texture_list *l_ture;
|
||||
} t_mlx;
|
||||
|
||||
|
||||
// Functions
|
||||
// parsing.c
|
||||
int read_map(char *av, t_data *map, int *count);
|
||||
@@ -134,7 +132,7 @@ void freelist(t_texture_list **txture);
|
||||
|
||||
// lst_textures.c
|
||||
int get_index(char *line, int i);
|
||||
t_texture_list *new_texture(char *line);
|
||||
t_texture_list *new_texture(char *line);
|
||||
void lst_back_ture(t_texture_list **l_ture, t_texture_list *new);
|
||||
int lst_ture(t_data *m, t_texture_list **l_ture);
|
||||
|
||||
@@ -170,7 +168,7 @@ char *getlastline(char **map);
|
||||
int h_map(char **map);
|
||||
int v_map(char **map);
|
||||
char *fixline(char *line, int maxlen);
|
||||
int getsize_line(char **map);
|
||||
int getsize_line(char **map);
|
||||
int valid_map(t_data *m);
|
||||
|
||||
// frees.c
|
||||
@@ -185,7 +183,8 @@ void ft_reset_move(mlx_key_data_t keydata, t_mlx *mlx);
|
||||
void key_press(mlx_key_data_t keydata, void *ml);
|
||||
|
||||
// raycasting.c
|
||||
int inter_check(float angle, float *inter, float *step, int is_horizon);
|
||||
int inter_check(float angle, float *inter,
|
||||
float *step, int is_horizon);
|
||||
int wall_hit(float x, float y, t_mlx *mlx);
|
||||
float get_h_inter(t_mlx *mlx, float angl);
|
||||
float get_v_inter(t_mlx *mlx, float angl);
|
||||
@@ -212,6 +211,4 @@ int load_texture(t_tex *tex, t_texture_list *l_ture);
|
||||
void get_angle(t_mlx *mlx);
|
||||
int execution(t_data *dt);
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user