diff options
Diffstat (limited to 'src/ft_raycasting.c')
| -rw-r--r-- | src/ft_raycasting.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/ft_raycasting.c b/src/ft_raycasting.c index cd34014..50bdbf9 100644 --- a/src/ft_raycasting.c +++ b/src/ft_raycasting.c @@ -21,38 +21,38 @@ /* { */ /* 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.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.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.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->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) */ +/* * (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; */ +/* 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); */ /* } */ @@ -60,10 +60,10 @@ void ft_calc_tex(t_cub *clist) { if (clist->rlist.side == 0) - clist->rlist.wall_hit_x = (clist->plist->pos_x) + + clist->rlist.wall_hit_x = (clist->plist.pos_x) + clist->rlist.wall_dist * clist->rlist.y_ray_dir; else - clist->rlist.wall_hit_x = (clist->plist->pos_y) + + 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->tlist[clist->w_side].tex_x = (int)(clist->rlist.wall_hit_x * @@ -82,8 +82,8 @@ static void t_win *wl; t_player *pl; - wl = cl->wlist; - pl = cl->plist; + wl = &cl->wlist; + pl = &cl->plist; pl->cam_x = 2 * i / (float)(wl->x_size) - 1; cl->rlist.x_ray_pos = pl->pos_y; cl->rlist.y_ray_pos = pl->pos_x; @@ -97,11 +97,11 @@ static void if (cl->rlist.side == 0) { cl->rlist.wall_dist = (cl->rlist.sqx - cl->rlist.x_ray_pos + - (1 - cl->mlist->x_step) / 2) / cl->rlist.x_ray_dir; + (1 - cl->mlist.x_step) / 2) / cl->rlist.x_ray_dir; } else cl->rlist.wall_dist = (cl->rlist.sqy - cl->rlist.y_ray_pos + - (1 - cl->mlist->y_step) / 2) / cl->rlist.y_ray_dir; + (1 - cl->mlist.y_step) / 2) / cl->rlist.y_ray_dir; } void @@ -111,7 +111,7 @@ void t_win *wl; i = 0; - wl = cl->wlist; + wl = &cl->wlist; while (i < wl->x_size) { ft_initray(cl, i); |