diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 5 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 9 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 9 |
3 files changed, 13 insertions, 10 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 8625705..a6131b7 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -25,6 +25,7 @@ ** 3: failed mlx init ** 4: map error ** 5: no map +** 6: read error */ int8_t ft_init_cub3d(t_cub **clist); @@ -81,6 +82,10 @@ int ft_key_loop(t_cub *cl); void ft_draw_circle(int32_t a, int32_t b, int32_t color, t_cub *cl); void ft_draw_texture(t_cub *cl, int x, int y, int tex_y); +<<<<<<< HEAD +int8_t ft_check_not_found(const char *path); +======= void ft_calc_tex(t_cub *clist); +>>>>>>> textures_fix # endif diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index 209d0bc..9f54dda 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -50,8 +50,8 @@ */ # define FT_MOVE_SPEED 0.1 -# define FT_STRAFE_SPEED 0.05 -# define FT_ROT_SPEED 0.07 +# define FT_STRAFE_SPEED 0.1 +# define FT_ROT_SPEED 0.09 /* ** ====== SCREEN ====== @@ -82,6 +82,11 @@ # define FT_ERR_ILL_MAP "map contains illegal char" # define FT_ERR_MULT_SPAWN "multiple spawn points" # define FT_ERR_MAP_L_L "last line is invalid" +# define FT_ERR_RD_NO "could not find north side texture file" +# define FT_ERR_RD_SO "could not find south side texture file" +# define FT_ERR_RD_EA "could not find east side texture file" +# define FT_ERR_RD_WE "could not find west side texture file" +# define FT_ERR_RD_SP "could not find sprite texture file" /* ** ====== MISSING ERROR MSG ====== diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 9e19e2b..66686eb 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -47,14 +47,6 @@ typedef struct s_rgb int16_t b; } t_rgb; -/* -** player view_side: -** 1: North -** 2: East -** 3: South -** 4: West -*/ - typedef struct s_player { float pos_x; @@ -72,6 +64,7 @@ typedef struct s_ray { uint16_t line_h; float wall_dist; + float mid_dist; float x_ray_pos; float y_ray_pos; float x_ray_dir; |