aboutsummaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorRudy Bousset <rbousset@z2r4p3.le-101.fr>2020-02-17 16:47:59 +0100
committerRudy Bousset <rbousset@z2r4p3.le-101.fr>2020-02-17 16:47:59 +0100
commit5c908cdcd9c09ee4e5656ddc62ca1153f630354a (patch)
treef9efc3e226ca87904cab92716c65b051b11c304d /inc
parentRemoved "vim" map (diff)
parentsmall but important changes (diff)
download42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.gz
42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.bz2
42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.xz
42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.zst
42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.zip
Merge branch 'tex_fmoen' of gitlab.com into tex_fmoen
Diffstat (limited to 'inc')
-rw-r--r--inc/cub3d.h2
-rw-r--r--inc/cub3d_structs.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h
index 55c7a97..a691023 100644
--- a/inc/cub3d.h
+++ b/inc/cub3d.h
@@ -29,6 +29,8 @@
int8_t ft_init_cub3d(t_cub **clist);
t_map *ft_init_map(void);
+void ft_wall_tex_init(t_cub *clist);
+void ft_choose_tex(t_cub *clist);
void ft_hooks_and_loops(t_win *wl, t_cub *cl);
int ft_key_event(int keycode, t_cub *clist);
int ft_click_close(int keycode, t_cub *clist);
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h
index 2f032e0..38472a6 100644
--- a/inc/cub3d_structs.h
+++ b/inc/cub3d_structs.h
@@ -38,7 +38,6 @@ typedef struct s_img
int img_h;
int tex_x;
int tex_y;
-
} t_img;
typedef struct s_rgb
@@ -85,6 +84,7 @@ typedef struct s_ray
size_t sqx;
size_t sqy;
uint8_t hit;
+ double wall_hit_x;
} t_ray;
typedef struct s_map
@@ -108,6 +108,7 @@ typedef struct s_map
typedef struct s_cub
{
+ uint8_t w_side;
uint8_t minimap;
char errmsg[40];
struct s_win *wlist;