rays verticals and horizontals are working

This commit is contained in:
hugogogo
2022-04-28 08:52:21 +02:00
parent 3501a20abb
commit 4f0e5fcd00
3 changed files with 51 additions and 20 deletions

View File

@@ -20,8 +20,20 @@ static void init_raycast(t_rcast *rcast, t_vec *ray)
rcast->next_cell_x = -rcast->ray_sign_x;
rcast->next_cell_y = -rcast->ray_sign_y;
// ray steps in both axis
rcast->ray_step_x = ft_abs(rcast->cell * rcast->slope_y);
rcast->ray_step_y = ft_abs(rcast->cell * rcast->slope_x);
rcast->ray_step_x = 0;
if (rcast->slope_x)
{
rcast->ray_step_x = ft_abs(rcast->cell);
if (rcast->slope_y)
rcast->ray_step_x *= ft_abs(rcast->slope_y);
}
rcast->ray_step_y = 0;
if (rcast->slope_y)
{
rcast->ray_step_y = ft_abs(rcast->cell);
if (rcast->slope_x)
rcast->ray_step_y *= ft_abs(rcast->slope_x);
}
// tmp
if (rcast->tmp)
@@ -42,8 +54,12 @@ static void init_first_step(t_rcast *rcast, t_vec *ray)
rcast->first_next_y = ray->start.y % rcast->cell;
if (rcast->ray_sign_y < 0)
rcast->first_next_y -= rcast->cell;
rcast->next_x = ft_abs(rcast->first_next_x * rcast->slope_y);
rcast->next_y = ft_abs(rcast->first_next_y * rcast->slope_x);
rcast->next_x = ft_abs(rcast->first_next_x);
if (rcast->slope_y != 0)
rcast->next_x *= ft_abs(rcast->slope_y);
rcast->next_y = ft_abs(rcast->first_next_y);
if (rcast->slope_x != 0)
rcast->next_y *= ft_abs(rcast->slope_x);
// tmp
if (rcast->tmp)
@@ -60,7 +76,7 @@ static void next_cell(t_rcast *rcast)
printf("\n [next_x(%i) > next_y(%i) ?]", rcast->next_x, rcast->next_y);
//tmp
if (rcast->slope_x == 0 || rcast->next_x > rcast->next_y)
if (!rcast->slope_x || (rcast->next_x > rcast->next_y && rcast->slope_y))
{
rcast->cell_y += rcast->next_cell_y;
rcast->next_y += rcast->ray_step_y;