diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/cub3d.h | 148 | ||||
| -rw-r--r-- | inc/cub3d_structs.h | 20 |
2 files changed, 84 insertions, 84 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index 2fefabe..8643c5c 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -22,110 +22,112 @@ ** ====== STRUCTS ====== */ -void ft_init_funptr(t_cub *clist); -int8_t ft_init_cub3d(t_cub *clist); -int ft_init_winlx(t_cub *clist); -int ft_init_winptr(t_cub *clist); -t_ray ft_init_s_ray(void); -t_rgb ft_init_rgb(void); -int8_t ft_init_map(t_map *mlist); -void ft_init_bmp(t_bmp_file *bmp_file); +void ft_init_funptr(t_cub *clist); +int8_t ft_init_cub3d(t_cub *clist); +int ft_init_winlx(t_cub *clist); +int ft_init_winptr(t_cub *clist); +t_ray ft_init_s_ray(void); +t_rgb ft_init_rgb(void); +int8_t ft_init_map(t_map *mlist); +t_bmp_file ft_init_bmp(void); +t_bmp_info ft_init_bmp_info(void); +t_bmp_colors ft_init_bmp_colors(void) /* ** ====== HOOKS ====== */ -void ft_hooks_and_loops(t_win *wl, t_cub *cl); -int ft_key_event(int keycode, t_cub *clist); -int ft_key_release(int keycode, t_cub *clist); -int ft_w_key(t_cub *clist); -int ft_a_key(t_cub *clist); -int ft_s_key(t_cub *clist); -int ft_d_key(t_cub *clist); -int ft_f1_key(t_cub *clist); -int ft_left_key(t_cub *clist); -int ft_right_key(t_cub *clist); -int ft_click_close(int keycode, t_cub *clist); -int ft_key_loop(t_cub *cl); -int32_t ft_convert_keycode(const int32_t tmp_code); +void ft_hooks_and_loops(t_win *wl, t_cub *cl); +int ft_key_event(int keycode, t_cub *clist); +int ft_key_release(int keycode, t_cub *clist); +int ft_w_key(t_cub *clist); +int ft_a_key(t_cub *clist); +int ft_s_key(t_cub *clist); +int ft_d_key(t_cub *clist); +int ft_f1_key(t_cub *clist); +int ft_left_key(t_cub *clist); +int ft_right_key(t_cub *clist); +int ft_click_close(int keycode, t_cub *clist); +int ft_key_loop(t_cub *cl); +int32_t ft_convert_keycode(const int32_t tmp_code); /* ** ====== TEXTURES ====== */ -void ft_wall_tex_init(t_cub *clist); -void ft_choose_tex(t_cub *clist); -void ft_calc_tex(t_cub *clist); +void ft_wall_tex_init(t_cub *clist); +void ft_choose_tex(t_cub *clist); +void ft_calc_tex(t_cub *clist); /* ** ====== DRAW ====== */ -void ft_draw_square(int a, int b, int rgb, t_cub *clist); -void ft_draw_map(char **map, t_cub *clist); -void ft_draw_texture(t_cub *cl, int x, int y, int tex_y); -void ft_draw_hud(t_cub *clist); -void ft_draw_scene(t_cub *clist); -void ft_draw_scene_bmp(t_cub *clist); -void ft_draw_sprite(t_cub *cl, int i); -void ft_draw_circle(float a, float b, +void ft_draw_square(int a, int b, int rgb, t_cub *clist); +void ft_draw_map(char **map, t_cub *clist); +void ft_draw_texture(t_cub *cl, int x, int y, int tex_y); +void ft_draw_hud(t_cub *clist); +void ft_draw_scene(t_cub *clist); +void ft_draw_scene_bmp(t_cub *clist); +void ft_draw_sprite(t_cub *cl, int i); +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, +int8_t ft_draw_verline(t_cub *cl, int32_t x, int32_t y1, int32_t y2); /* ** ====== PARSING ====== */ -void ft_parse_map(const char *map_path, t_cub *clist); -void ft_get_player_spawn(t_player *plist, t_cub *clist); -void ft_get_nlvl_pos(t_map *ml); -int8_t ft_select_get(char **words, t_cub *clist); -int8_t ft_get_screen_size(t_win *wlist); -int8_t ft_get_res(char **words, t_cub *clist); -int8_t ft_get_tex_no(char **words, t_cub *clist); -int8_t ft_get_tex_so(char **words, t_cub *clist); -int8_t ft_get_tex_ea(char **words, t_cub *clist); -int8_t ft_get_tex_we(char **words, t_cub *clist); -int8_t ft_get_sprite(char **words, t_cub *clist); -int8_t ft_get_f_color(char **words, t_cub *clist); -int8_t ft_get_c_color(char **words, t_cub *clist); -int8_t ft_get_path_nl(char **words, t_cub *clist); -int8_t ft_get_tex_nl(char **words, t_cub *clist); -int8_t ft_get_music(char **words, t_cub *clist); -size_t ft_get_map_h(char **map); -size_t ft_get_map_w(char **map); -int8_t ft_check_map_line(char *line, uint8_t l, t_cub *clist); -int8_t ft_check_ext(const char *filep, const char *ext); -int8_t ft_check_not_found(const char *path); -int ft_get_map_first_line(char *line, t_cub *clist); -int ft_get_map_core(int fd, t_cub *clist); -void ft_check_map_surrounds(t_map *ml, t_cub *cl); -int ft_check_missing(t_cub *clist); -int ft_missing_error(const char *err, t_cub *clist); -int ft_map_error(const char *errmsg, t_cub *clist); -size_t ft_get_line_len(char *line); +void ft_parse_map(const char *map_path, t_cub *clist); +void ft_get_player_spawn(t_player *plist, t_cub *clist); +void ft_get_nlvl_pos(t_map *ml); +int8_t ft_select_get(char **words, t_cub *clist); +int8_t ft_get_screen_size(t_win *wlist); +int8_t ft_get_res(char **words, t_cub *clist); +int8_t ft_get_tex_no(char **words, t_cub *clist); +int8_t ft_get_tex_so(char **words, t_cub *clist); +int8_t ft_get_tex_ea(char **words, t_cub *clist); +int8_t ft_get_tex_we(char **words, t_cub *clist); +int8_t ft_get_sprite(char **words, t_cub *clist); +int8_t ft_get_f_color(char **words, t_cub *clist); +int8_t ft_get_c_color(char **words, t_cub *clist); +int8_t ft_get_path_nl(char **words, t_cub *clist); +int8_t ft_get_tex_nl(char **words, t_cub *clist); +int8_t ft_get_music(char **words, t_cub *clist); +size_t ft_get_map_h(char **map); +size_t ft_get_map_w(char **map); +int8_t ft_check_map_line(char *line, uint8_t l, t_cub *clist); +int8_t ft_check_ext(const char *filep, const char *ext); +int8_t ft_check_not_found(const char *path); +int ft_get_map_first_line(char *line, t_cub *clist); +int ft_get_map_core(int fd, t_cub *clist); +void ft_check_map_surrounds(t_map *ml, t_cub *cl); +int ft_check_missing(t_cub *clist); +int ft_missing_error(const char *err, t_cub *clist); +int ft_map_error(const char *errmsg, t_cub *clist); +size_t ft_get_line_len(char *line); /* ** ====== ARGS ====== */ -uint8_t ft_check_map_arg(int argc, const char *argv[]); -uint8_t ft_use_args(int argc, const char *argv[], t_cub *clist); +uint8_t ft_check_map_arg(int argc, const char *argv[]); +uint8_t ft_use_args(int argc, const char *argv[], t_cub *clist); /* ** ====== OTHER ====== */ -void ft_set_minimap_scale(t_cub *clist); -void *ft_music_thread(void *vargp); -void ft_detect(t_cub *cl); -void ft_castray(t_cub *cl); -int8_t ft_save_to_bmp(t_bmp_file *bmp_file, void *img, t_cub *cl); -int ft_error(uint8_t retval, const char *errmsg, t_cub *clist); -uint8_t ft_free_words(char **words); -int8_t ft_warp_level(t_cub *cl); -int ft_exit(uint8_t exit_code, t_cub *clist); -uint32_t ft_rgb_to_hex(t_rgb rgb); +void ft_set_minimap_scale(t_cub *clist); +void *ft_music_thread(void *vargp); +void ft_detect(t_cub *cl); +void ft_castray(t_cub *cl); +int8_t ft_save_to_bmp(t_bmp_file *bmp_file, void *img, t_cub *cl); +int ft_error(uint8_t retval, const char *errmsg, t_cub *clist); +uint8_t ft_free_words(char **words); +int8_t ft_warp_level(t_cub *cl); +int ft_exit(uint8_t exit_code, t_cub *clist); +uint32_t ft_rgb_to_hex(t_rgb rgb); # endif diff --git a/inc/cub3d_structs.h b/inc/cub3d_structs.h index af39fdd..1eb6f08 100644 --- a/inc/cub3d_structs.h +++ b/inc/cub3d_structs.h @@ -30,6 +30,15 @@ typedef struct s_win # pragma pack(push, 1) +typedef struct s_bmp_file +{ + uint16_t file_type; + uint32_t file_size; + uint16_t reserv_one; + uint16_t reserv_two; + uint32_t offset_data; +} t_bmp_file; + typedef struct s_bmp_info { uint32_t size; @@ -55,17 +64,6 @@ typedef struct s_bmp_colors uint32_t unused[16]; } t_bmp_colors; -typedef struct s_bmp_file -{ - uint16_t file_type; - uint32_t file_size; - uint16_t reserv_one; - uint16_t reserv_two; - uint32_t offset_data; - struct s_bmp_info bmp_info; - struct s_bmp_colors bmp_colors; -} t_bmp_file; - # pragma pack(pop) typedef struct s_img |