diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-23 18:04:38 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-23 18:04:38 +0100 |
| commit | 50759fcc4f3b939ad35254ce220c206056f3f31e (patch) | |
| tree | fd28f91d64ccefe142927eeaf9dc85e5719c3666 /src/ft_draw_traps.c | |
| parent | Good tweak (diff) | |
| download | 42-cub3d-50759fcc4f3b939ad35254ce220c206056f3f31e.tar.gz 42-cub3d-50759fcc4f3b939ad35254ce220c206056f3f31e.tar.bz2 42-cub3d-50759fcc4f3b939ad35254ce220c206056f3f31e.tar.xz 42-cub3d-50759fcc4f3b939ad35254ce220c206056f3f31e.tar.zst 42-cub3d-50759fcc4f3b939ad35254ce220c206056f3f31e.zip | |
Fixed
Diffstat (limited to '')
| -rw-r--r-- | src/ft_draw_traps.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/ft_draw_traps.c b/src/ft_draw_traps.c index 05e8446..ed53dc0 100644 --- a/src/ft_draw_traps.c +++ b/src/ft_draw_traps.c @@ -12,6 +12,7 @@ #include <cub3d.h> #include <stdint.h> +#include <math.h> static void ft_sort_traps_norme(float *dist_tab, int32_t it, t_cub *cl) @@ -58,22 +59,19 @@ static void ft_put_trap(t_sprite *sprite, t_cub *cl) { float dist; - float calc; + t_rgb rgb; - if ((dist = cl->rlist.wall_dist_tab[sprite->x]) <= 0) + if ((dist = sqrtf(powf(cl->plist.pos_x - sprite->s_pos_x, 2) + + powf(cl->plist.pos_y - sprite->s_pos_y, 2))) <= 0) dist = 0.0001; - calc = (dist * 0.1 * cl->mlist.darklvl); - calc = (calc >= 255) ? (255) : (calc); - calc = (calc < 1) ? (1) : (calc); - cl->img.ptr[sprite->x * 4 + (sprite->y * cl->img.sizeline)] = - (uint8_t)cl->tlist[15].ptr[sprite->tex_x * 4 + 4 * - cl->tlist[15].img_h * sprite->tex_y] / calc; - cl->img.ptr[sprite->x * 4 + (sprite->y * cl->img.sizeline) + 1] = - (uint8_t)cl->tlist[15].ptr[sprite->tex_x * 4 + 4 * - cl->tlist[15].img_h * sprite->tex_y + 1] / calc; - cl->img.ptr[sprite->x * 4 + (sprite->y * cl->img.sizeline) + 2] = - (uint8_t)cl->tlist[15].ptr[sprite->tex_x * 4 + 4 * - cl->tlist[15].img_h * sprite->tex_y + 2] / calc; + rgb.r = (uint8_t)cl->tlist[15].ptr[sprite->tex_x * 4 + 4 * + cl->tlist[15].img_h * sprite->tex_y + 2]; + rgb.g = (uint8_t)cl->tlist[15].ptr[sprite->tex_x * 4 + 4 * + cl->tlist[15].img_h * sprite->tex_y + 1]; + rgb.b = (uint8_t)cl->tlist[15].ptr[sprite->tex_x * 4 + 4 * + cl->tlist[15].img_h * sprite->tex_y]; + *(int*)(cl->img.ptr + ((uint16_t)sprite->x * 4 + + (sprite->y * cl->img.sizeline))) = ft_rgb_to_hex(dist, rgb, cl); } void |