aboutsummaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-03-18 20:07:20 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-03-18 20:07:20 +0100
commit3ce74f6396bf76650853aba3bfc307847adb0bba (patch)
tree57f6040f2d1fd1e8ef59f20c3aa4c2157f404b5c /inc
parentReady to merge (diff)
parentcangelog (diff)
download42-cub3d-3ce74f6396bf76650853aba3bfc307847adb0bba.tar.gz
42-cub3d-3ce74f6396bf76650853aba3bfc307847adb0bba.tar.bz2
42-cub3d-3ce74f6396bf76650853aba3bfc307847adb0bba.tar.xz
42-cub3d-3ce74f6396bf76650853aba3bfc307847adb0bba.tar.zst
42-cub3d-3ce74f6396bf76650853aba3bfc307847adb0bba.zip
Merge branch 'better_sprites'
Diffstat (limited to 'inc')
-rw-r--r--inc/cub3d.h4
-rw-r--r--inc/cub3d_structs.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h
index 61c4f01..042faa3 100644
--- a/inc/cub3d.h
+++ b/inc/cub3d.h
@@ -78,8 +78,8 @@ void ft_draw_circle(float a, float b,
int32_t color, t_cub *cl);
int8_t ft_draw_verline(t_cub *cl, int32_t x,
int32_t y1, int32_t y2);
-void ft_sprite_width(t_cub *cl, t_sprite *sprite);
-void ft_sprite_height(t_cub *cl, t_sprite *sprite);
+void ft_sprite_h_w(t_cub *cl, t_sprite *sprite);
+void ft_sort_sprites(t_cub *cl);
void ft_calc_sprite(t_cub *cl);
void ft_draw_sprite(t_cub *cl, t_sprite *sprite);
void ft_calc_trap(t_cub *cl);
diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h
index a08d7b2..66f139d 100644
--- a/inc/cub3d_structs.h
+++ b/inc/cub3d_structs.h
@@ -204,7 +204,7 @@ typedef struct s_map
size_t mapl_len;
int32_t sprite_nbr;
uint8_t sprite_var;
- int32_t sprite_order[4096];
+ int32_t sprite_order[8][4096];
int32_t traps_nbr;
int32_t traps_order[512];
size_t line_chk;