diff options
| author | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-24 19:11:47 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-24 19:11:47 +0100 |
| commit | f49dd0a1102c89cedc3bdb67470ebaa8758db48c (patch) | |
| tree | d70b7a85468b13c7a73c1d2de8bf1d794c15ac78 | |
| parent | Merge branch 'sprites' (diff) | |
| download | 42-cub3d-f49dd0a1102c89cedc3bdb67470ebaa8758db48c.tar.gz 42-cub3d-f49dd0a1102c89cedc3bdb67470ebaa8758db48c.tar.bz2 42-cub3d-f49dd0a1102c89cedc3bdb67470ebaa8758db48c.tar.xz 42-cub3d-f49dd0a1102c89cedc3bdb67470ebaa8758db48c.tar.zst 42-cub3d-f49dd0a1102c89cedc3bdb67470ebaa8758db48c.zip | |
indent
Diffstat (limited to '')
| -rw-r--r-- | src/ft_draw_sprite.c | 52 | ||||
| -rw-r--r-- | src/ft_raycasting.c | 2 |
2 files changed, 27 insertions, 27 deletions
diff --git a/src/ft_draw_sprite.c b/src/ft_draw_sprite.c index c90c9ac..b7b9e5d 100644 --- a/src/ft_draw_sprite.c +++ b/src/ft_draw_sprite.c @@ -6,36 +6,36 @@ #include <math.h> void -ft_draw_verline_sprite(t_cub *cl, int x, int y, int tex_y) + ft_draw_verline_sprite(t_cub *cl, int x, int y, int tex_y) { - if (cl->tlist[4].tex_x) - cl->img.ptr[x * 4 + (cl->img.sizeline * y)] = - (char)cl->tlist[4].ptr[cl->tlist[4].tex_x * 4 + 4 * - cl->tlist[4].img_h * tex_y]; - cl->img.ptr[x * 4 + (cl->img.sizeline * y) + 1] = - (char)cl->tlist[4].ptr[cl->tlist[4].tex_x * 4 + 4 * - cl->tlist[4].img_h * tex_y + 1]; - cl->img.ptr[x * 4 + (cl->img.sizeline * y) + 2] = - (char)cl->tlist[4].ptr[cl->tlist[4].tex_x * 4 + 4 * - cl->tlist[4].img_h * tex_y + 2]; - cl->img.ptr[x * 4 + cl->wlist->x_size * y + 3] = (char)0; + if (cl->tlist[4].tex_x) + cl->img.ptr[x * 4 + (cl->img.sizeline * y)] = + (char)cl->tlist[4].ptr[cl->tlist[4].tex_x * 4 + 4 * + cl->tlist[4].img_h * tex_y]; + cl->img.ptr[x * 4 + (cl->img.sizeline * y) + 1] = + (char)cl->tlist[4].ptr[cl->tlist[4].tex_x * 4 + 4 * + cl->tlist[4].img_h * tex_y + 1]; + cl->img.ptr[x * 4 + (cl->img.sizeline * y) + 2] = + (char)cl->tlist[4].ptr[cl->tlist[4].tex_x * 4 + 4 * + cl->tlist[4].img_h * tex_y + 2]; + cl->img.ptr[x * 4 + cl->wlist->x_size * y + 3] = (char)0; } void - ft_draw_sprite(t_cub *cl, int x) + ft_draw_sprite(t_cub *cl, int x) { - int hor_it;/*y*/ - int d; - int tex_y; + int hor_it;/*y*/ + int d; + int tex_y; - hor_it = cl->sp_list.s_start_y; - while (hor_it < cl->sp_list.s_end_y) - { - d = hor_it * 256 - cl->wlist->y_size * 128 + cl->rlist.line_h * 128; - d = (d <= 0) ? (-d) : (d); - tex_y = ((d * cl->tlist[4].img_h) / cl->rlist.line_h) / 256; - (tex_y < 0) ? (tex_y = 0) : 0; - ft_draw_verline_sprite(cl, x, hor_it, tex_y); - hor_it++; - } + hor_it = cl->sp_list.s_start_y; + while (hor_it < cl->sp_list.s_end_y) + { + d = hor_it * 256 - cl->wlist->y_size * 128 + cl->rlist.line_h * 128; + d = (d <= 0) ? (-d) : (d); + tex_y = ((d * cl->tlist[4].img_h) / cl->rlist.line_h) / 256; + (tex_y < 0) ? (tex_y = 0) : 0; + ft_draw_verline_sprite(cl, x, hor_it, tex_y); + hor_it++; + } } diff --git a/src/ft_raycasting.c b/src/ft_raycasting.c index dd68cd3..9c0bbdc 100644 --- a/src/ft_raycasting.c +++ b/src/ft_raycasting.c @@ -41,7 +41,7 @@ void cl->sp_list.s_end_x = cl->wlist->x_size - 1; } -static void +void ft_calc_tex(t_cub *clist) { if (clist->rlist.side == 0) |