diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 4 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 22ce582..d2594f9 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -78,7 +78,11 @@ int ft_key_release(int keycode, t_cub *clist); int8_t ft_check_ext(const char *filep, const char *ext); int32_t ft_convert_keycode(const int32_t tmp_code); int ft_key_loop(t_cub *cl); +<<<<<<< HEAD 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); +>>>>>>> textures # endif diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index 908b007..18edfd8 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -36,6 +36,8 @@ typedef struct s_img int endian; int img_w; int img_h; + int tex_x; + int tex_y; } t_img; typedef struct s_rgb @@ -83,8 +85,7 @@ typedef struct s_ray size_t sqy; uint8_t hit; double wall_hit_x; - int tex_x; - int tex_y; + double step_tex_v; } t_ray; typedef struct s_map |