diff options
| author | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-24 20:30:54 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-24 20:30:54 +0100 |
| commit | 67d655e4a48aa7fdfaea58ece5e8f990b7e3b2ba (patch) | |
| tree | ede8bd74820eb05c50d8a071b1934604803fd63c /src/ft_raycasting.c | |
| parent | Commented ft_draw_sprite in ft_castray (diff) | |
| download | 42-cub3d-67d655e4a48aa7fdfaea58ece5e8f990b7e3b2ba.tar.gz 42-cub3d-67d655e4a48aa7fdfaea58ece5e8f990b7e3b2ba.tar.bz2 42-cub3d-67d655e4a48aa7fdfaea58ece5e8f990b7e3b2ba.tar.xz 42-cub3d-67d655e4a48aa7fdfaea58ece5e8f990b7e3b2ba.tar.zst 42-cub3d-67d655e4a48aa7fdfaea58ece5e8f990b7e3b2ba.zip | |
Norme
Diffstat (limited to '')
| -rw-r--r-- | src/ft_raycasting.c | 55 |
1 files changed, 35 insertions, 20 deletions
diff --git a/src/ft_raycasting.c b/src/ft_raycasting.c index 7bfe82e..d51b77f 100644 --- a/src/ft_raycasting.c +++ b/src/ft_raycasting.c @@ -16,29 +16,44 @@ #include <stdlib.h> #include <math.h> -void +static void + ft_calc_sprite_norme(t_cub *cl) +{ + if (cl->sp_list.s_start_y < 0) + cl->sp_list.s_start_y = 0; + cl->sp_list.s_end_y = cl->sp_list.s_h / 2 + cl->wlist->y_size / 2; + if (cl->sp_list.s_end_y > (int)cl->wlist->y_size) + cl->sp_list.s_end_y = cl->wlist->y_size - 1; + cl->sp_list.s_w = abs((int)(cl->wlist->x_size + * cl->sp_list.sprite_transform_y)); /*sprite width*/ + cl->sp_list.s_start_x = -cl->sp_list.s_w / 2 + cl->sp_list.s_screen_x; + if (cl->sp_list.s_start_x < 0) + cl->sp_list.s_start_y = 0; + cl->sp_list.s_end_x = cl->sp_list.s_w / 2 + cl->wlist->x_size; + if (cl->sp_list.s_end_x < (int)cl->wlist->x_size) + cl->sp_list.s_end_x = cl->wlist->x_size - 1; +} + +static void ft_calc_sprite(t_cub *cl) { cl->sp_list.s_x = cl->sp_list.s_pos_x - cl->plist->pos_x; cl->sp_list.s_y = cl->sp_list.s_pos_y - cl->plist->pos_y; - cl->sp_list.inv_c_m = 1.0 / (cl->plist->plane_x * cl->plist->dir_x - cl->plist->dir_y * cl->plist->plane_y); - cl->sp_list.sprite_transform_x = cl->sp_list.inv_c_m * (cl->plist->dir_y * cl->sp_list.s_x - cl->plist->dir_x * cl->sp_list.s_y); - cl->sp_list.sprite_transform_y = cl->sp_list.inv_c_m * (cl->plist->plane_y * cl->sp_list.s_x - cl->plist->plane_x * cl->sp_list.s_y); - cl->sp_list.s_screen_x = (int)((cl->wlist->y_size / 2) * (1 + cl->sp_list.sprite_transform_x / cl->sp_list.sprite_transform_y)); - cl->sp_list.s_h = abs((int)(cl->wlist->y_size * cl->sp_list.sprite_transform_y)); /*sprite height*/ - cl->sp_list.s_start_y = -cl->sp_list.s_h / 2 + cl->wlist->y_size / 2; - if (cl->sp_list.s_start_y < 0) - cl->sp_list.s_start_y = 0; - cl->sp_list.s_end_y = cl->sp_list.s_h / 2 + cl->wlist->y_size / 2; - if (cl->sp_list.s_end_y > (int)cl->wlist->y_size) - cl->sp_list.s_end_y = cl->wlist->y_size - 1;; - cl->sp_list.s_w = abs((int)(cl->wlist->x_size * cl->sp_list.sprite_transform_y)); /*sprite width*/ - cl->sp_list.s_start_x = -cl->sp_list.s_w / 2 + cl->sp_list.s_screen_x; - if (cl->sp_list.s_start_x < 0) - cl->sp_list.s_start_y = 0; - cl->sp_list.s_end_x = cl->sp_list.s_w / 2 + cl->wlist->x_size; - if (cl->sp_list.s_end_x < (int)cl->wlist->x_size) - cl->sp_list.s_end_x = cl->wlist->x_size - 1; + cl->sp_list.inv_c_m = 1.0 / (cl->plist->plane_x * cl->plist->dir_x + - cl->plist->dir_y * cl->plist->plane_y); + cl->sp_list.sprite_transform_x = cl->sp_list.inv_c_m + * (cl->plist->dir_y * cl->sp_list.s_x + - cl->plist->dir_x * cl->sp_list.s_y); + cl->sp_list.sprite_transform_y = cl->sp_list.inv_c_m + * (cl->plist->plane_y * cl->sp_list.s_x + - cl->plist->plane_x * cl->sp_list.s_y); + cl->sp_list.s_screen_x = (int)((cl->wlist->y_size / 2) + * (1 + cl->sp_list.sprite_transform_x + / cl->sp_list.sprite_transform_y)); + cl->sp_list.s_h = + abs((int)(cl->wlist->y_size * cl->sp_list.sprite_transform_y)); + cl->sp_list.s_start_y = -cl->sp_list.s_h / 2 + cl->wlist->y_size / 2; + ft_calc_sprite_norme(cl); } void @@ -50,7 +65,7 @@ void else clist->rlist.wall_hit_x = (clist->plist->pos_y) + clist->rlist.wall_dist * clist->rlist.x_ray_dir; - clist->rlist.wall_hit_x -= floor(clist->rlist.wall_hit_x); + clist->rlist.wall_hit_x -= floor(clist->rlist.wall_hit_x); clist->tlist[clist->w_side].tex_x = (int)(clist->rlist.wall_hit_x * (double)clist->tlist[clist->w_side].img_w); if (clist->rlist.side == 0 && clist->rlist.x_ray_dir > 0) |