From 14d4e44cb54758a2e9c045bddbe74479adef9f1d Mon Sep 17 00:00:00 2001 From: salaaad2 Date: Fri, 20 Mar 2020 20:30:35 +0100 Subject: R E A L I S T I C S H O O T I N G --- inc/cub3d.h | 2 ++ map/map_one.cub | 10 ++++----- src/ft_detect.c | 4 ++-- src/ft_extra_keys.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 7 deletions(-) diff --git a/inc/cub3d.h b/inc/cub3d.h index ee2da75..2465e48 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -152,6 +152,8 @@ uint8_t ft_use_args(int argc, const char *argv[], void ft_castray(t_cub *cl); void ft_detect(t_cub *cl); +void ft_detection_init_x(t_cub *cl); +void ft_detection_init_y(t_cub *cl); void ft_floor_cast(t_cub *cl); void ft_floor_cast_inits(uint16_t y, t_ray *rl, t_cub *cl); diff --git a/map/map_one.cub b/map/map_one.cub index 1690c81..511492f 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,4 +1,4 @@ -R 1600 1000 +R 800 800 NO ./media/img/tex/wood_wall_1.xpm SO ./media/img/tex/wood_wall_1.xpm @@ -19,8 +19,8 @@ SH 2 1111111 111111111111000001 100000000+00222201 -10000E000T00333301 -100000000000444401 +1@000E000T00333301 +1!0000000000444401 100100000+00000001 101100000111000001 111111111111110011 @@ -30,8 +30,8 @@ SH 2 111101111111110111 100000001101010111 120202020200000011 -1@0000000000000011 -1!0000000000000011 +100000000000000011 +100000000000000011 120202020200000011 110000001101000111 111101111111010111 diff --git a/src/ft_detect.c b/src/ft_detect.c index 7ec0473..0ef8831 100644 --- a/src/ft_detect.c +++ b/src/ft_detect.c @@ -14,7 +14,7 @@ #include #include -static void +void ft_detection_init_y(t_cub *cl) { cl->rlist.y_delta_dist = sqrt(1 + (cl->rlist.x_ray_dir * @@ -34,7 +34,7 @@ static void } } -static void +void ft_detection_init_x(t_cub *cl) { cl->rlist.x_delta_dist = sqrt(1 + (cl->rlist.y_ray_dir * diff --git a/src/ft_extra_keys.c b/src/ft_extra_keys.c index a78f821..a801dee 100644 --- a/src/ft_extra_keys.c +++ b/src/ft_extra_keys.c @@ -12,8 +12,10 @@ #include #include +#include #include #include +#include #include int @@ -68,6 +70,63 @@ int return (0); } +void +ft_hitscan(t_cub *cl) +{ + uint8_t hit; + + hit = 0; + while (hit == 0) + { + if (cl->rlist.x_side_dist < cl->rlist.y_side_dist) + { + cl->rlist.x_side_dist += cl->rlist.x_delta_dist; + cl->rlist.sqx += cl->mlist.x_step; + cl->rlist.side = 0; + } + else + { + cl->rlist.y_side_dist += cl->rlist.y_delta_dist; + cl->rlist.sqy += cl->mlist.y_step; + cl->rlist.side = 1; + } + if (ft_ischarset("234567", + cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy])) + { + hit = 1; + puts("hit"); + } + else if (ft_ischarset("1", + cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy])) + { + hit = 1; + puts("wall (you missed retard)"); + } + } +} + +void + ft_shoot(t_cub *cl, uint16_t i) +{ + t_win *wl; + t_player *pl; + + 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; + cl->rlist.x_ray_dir = pl->dir_x + pl->plane_x * + pl->cam_x; + cl->rlist.y_ray_dir = pl->dir_y + pl->plane_y * + pl->cam_x; + cl->rlist.sqx = (int16_t)cl->rlist.x_ray_pos; + cl->rlist.sqy = (int16_t)cl->rlist.y_ray_pos; + ft_detection_init_x(cl); + ft_detection_init_y(cl); + ft_hitscan(cl); +} + int ft_space_key(t_cub *clist) { @@ -75,6 +134,7 @@ int { clist->sfx[clist->plist.handles_weapon + 7].sfx_play(clist->sfx); clist->plist.fire = 1; + ft_shoot(clist, clist->wlist.x_size / 2); } return (0); } -- cgit v1.2.3 From 86ad3ddaeea002da77612eb32c85e8eac916a4e8 Mon Sep 17 00:00:00 2001 From: salaaad2 Date: Fri, 20 Mar 2020 22:37:38 +0100 Subject: before norme --- src/ft_extra_keys.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/ft_extra_keys.c b/src/ft_extra_keys.c index a801dee..96636a8 100644 --- a/src/ft_extra_keys.c +++ b/src/ft_extra_keys.c @@ -71,11 +71,8 @@ int } void -ft_hitscan(t_cub *cl) + ft_hitscan(t_cub *cl, uint16_t hit) { - uint8_t hit; - - hit = 0; while (hit == 0) { if (cl->rlist.x_side_dist < cl->rlist.y_side_dist) @@ -90,18 +87,16 @@ ft_hitscan(t_cub *cl) cl->rlist.sqy += cl->mlist.y_step; cl->rlist.side = 1; } - if (ft_ischarset("234567", + if (ft_ischarset("23456", cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy])) { hit = 1; - puts("hit"); + cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy] = '0'; + ft_get_sprite_spawn(cl); } else if (ft_ischarset("1", cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy])) - { hit = 1; - puts("wall (you missed retard)"); - } } } @@ -124,7 +119,7 @@ void cl->rlist.sqy = (int16_t)cl->rlist.y_ray_pos; ft_detection_init_x(cl); ft_detection_init_y(cl); - ft_hitscan(cl); + ft_hitscan(cl, 0); } int -- cgit v1.2.3 From 06538ab3ac3f2a0ef4a8199ce3292b164f5d09a5 Mon Sep 17 00:00:00 2001 From: salaaad2 Date: Fri, 20 Mar 2020 22:46:39 +0100 Subject: GAME AWARDS 2020 --- Makefile | 1 + inc/cub3d.h | 1 + src/ft_extra_keys.c | 52 ----------------------------------------- src/ft_shoot.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 52 deletions(-) create mode 100644 src/ft_shoot.c diff --git a/Makefile b/Makefile index 60c2e2d..71f7fc0 100644 --- a/Makefile +++ b/Makefile @@ -114,6 +114,7 @@ SRCS_NAME += ft_draw_weapons.c SRCS_NAME += ft_draw_weapons_extra.c SRCS_NAME += ft_draw_handweap.c SRCS_NAME += ft_switch_weapons.c +SRCS_NAME += ft_shoot.c #--------------------------------------------------------------------------------------------------# SRCS = $(addprefix ${SRCS_DIR},${SRCS_NAME}) #--------------------------------------------------------------------------------------------------# diff --git a/inc/cub3d.h b/inc/cub3d.h index 2465e48..d426bba 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -204,5 +204,6 @@ void ft_get_fps_count(clock_t delta_time, t_cub *cl); void ft_find_item(t_player *pl, t_map *ml, t_cub *cl); int8_t ft_switch_weap_one(t_cub *cl); int8_t ft_switch_weap_two(t_cub *cl); +void ft_shoot(t_cub *cl, uint16_t center); # endif diff --git a/src/ft_extra_keys.c b/src/ft_extra_keys.c index 96636a8..f5a501a 100644 --- a/src/ft_extra_keys.c +++ b/src/ft_extra_keys.c @@ -70,58 +70,6 @@ int return (0); } -void - ft_hitscan(t_cub *cl, uint16_t hit) -{ - while (hit == 0) - { - if (cl->rlist.x_side_dist < cl->rlist.y_side_dist) - { - cl->rlist.x_side_dist += cl->rlist.x_delta_dist; - cl->rlist.sqx += cl->mlist.x_step; - cl->rlist.side = 0; - } - else - { - cl->rlist.y_side_dist += cl->rlist.y_delta_dist; - cl->rlist.sqy += cl->mlist.y_step; - cl->rlist.side = 1; - } - if (ft_ischarset("23456", - cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy])) - { - hit = 1; - cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy] = '0'; - ft_get_sprite_spawn(cl); - } - else if (ft_ischarset("1", - cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy])) - hit = 1; - } -} - -void - ft_shoot(t_cub *cl, uint16_t i) -{ - t_win *wl; - t_player *pl; - - 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; - cl->rlist.x_ray_dir = pl->dir_x + pl->plane_x * - pl->cam_x; - cl->rlist.y_ray_dir = pl->dir_y + pl->plane_y * - pl->cam_x; - cl->rlist.sqx = (int16_t)cl->rlist.x_ray_pos; - cl->rlist.sqy = (int16_t)cl->rlist.y_ray_pos; - ft_detection_init_x(cl); - ft_detection_init_y(cl); - ft_hitscan(cl, 0); -} - int ft_space_key(t_cub *clist) { diff --git a/src/ft_shoot.c b/src/ft_shoot.c new file mode 100644 index 0000000..ab820e6 --- /dev/null +++ b/src/ft_shoot.c @@ -0,0 +1,66 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_extra_keys.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rbousset +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/14 17:22:32 by rbousset #+# #+# */ +/* Updated: 2020/02/14 17:23:42 by rbousset ### ########lyon.fr */ +/* */ +/* ************************************************************************** */ + +#include +#include + +static void + ft_hitscan(t_cub *cl, uint16_t hit) +{ + while (hit == 0) + { + if (cl->rlist.x_side_dist < cl->rlist.y_side_dist) + { + cl->rlist.x_side_dist += cl->rlist.x_delta_dist; + cl->rlist.sqx += cl->mlist.x_step; + cl->rlist.side = 0; + } + else + { + cl->rlist.y_side_dist += cl->rlist.y_delta_dist; + cl->rlist.sqy += cl->mlist.y_step; + cl->rlist.side = 1; + } + if (ft_ischarset("23456", + cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy])) + { + hit = 1; + cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy] = '0'; + ft_get_sprite_spawn(cl); + } + else if (ft_ischarset("1", + cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy])) + hit = 1; + } +} + +void + ft_shoot(t_cub *cl, uint16_t i) +{ + t_win *wl; + t_player *pl; + + 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; + cl->rlist.x_ray_dir = pl->dir_x + pl->plane_x * + pl->cam_x; + cl->rlist.y_ray_dir = pl->dir_y + pl->plane_y * + pl->cam_x; + cl->rlist.sqx = (int16_t)cl->rlist.x_ray_pos; + cl->rlist.sqy = (int16_t)cl->rlist.y_ray_pos; + ft_detection_init_x(cl); + ft_detection_init_y(cl); + ft_hitscan(cl, 0); +} -- cgit v1.2.3 From 006862cd0998804a979180c509d0e2da4afec948 Mon Sep 17 00:00:00 2001 From: salad Date: Mon, 23 Mar 2020 18:00:29 +0100 Subject: about to norm this mans whole career --- map/map_one.cub | 4 ++-- minilibx_linux/Makefile.gen | 2 +- minilibx_linux/test/Makefile.gen | 2 +- src/ft_get_sprite_spawns.c | 2 ++ src/ft_shoot.c | 15 +++++++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/map/map_one.cub b/map/map_one.cub index 511492f..46486be 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -19,8 +19,8 @@ SH 2 1111111 111111111111000001 100000000+00222201 -1@000E000T00333301 -1!0000000000444401 +1000E0@00T00333301 +100000!00000444401 100100000+00000001 101100000111000001 111111111111110011 diff --git a/minilibx_linux/Makefile.gen b/minilibx_linux/Makefile.gen index f93b892..798f98c 100644 --- a/minilibx_linux/Makefile.gen +++ b/minilibx_linux/Makefile.gen @@ -1,5 +1,5 @@ INC=/usr/include -HT=x86_64 +HT=Linux DOCP=do_cp ## ## Makefile for MiniLibX in /home/boulon/work/c/raytraceur/minilibx diff --git a/minilibx_linux/test/Makefile.gen b/minilibx_linux/test/Makefile.gen index c13f70c..7c67f50 100644 --- a/minilibx_linux/test/Makefile.gen +++ b/minilibx_linux/test/Makefile.gen @@ -1,5 +1,5 @@ INC=/usr/include -HT=x86_64 +HT=Linux DOCP=do_cp diff --git a/src/ft_get_sprite_spawns.c b/src/ft_get_sprite_spawns.c index d7b6677..b00ef97 100644 --- a/src/ft_get_sprite_spawns.c +++ b/src/ft_get_sprite_spawns.c @@ -23,6 +23,7 @@ void y = 0; i = 0; + clist->mlist.sprite_nbr[s_n] = 0; while (clist->mlist.map[++y]) { while (clist->mlist.map[y][++x]) @@ -54,6 +55,7 @@ void x = 1; y = 1; i = 0; + clist->mlist.sprite_nbr[0] = 0; while (clist->mlist.map[y]) { while (clist->mlist.map[y][x]) diff --git a/src/ft_shoot.c b/src/ft_shoot.c index ab820e6..73a9617 100644 --- a/src/ft_shoot.c +++ b/src/ft_shoot.c @@ -12,6 +12,20 @@ #include #include +#include + +static void + ft_reset_sprites(t_cub *cl) +{ + uint16_t i; + uint16_t tmp; + + tmp = cl->mlist.sprite_var; + while(++i < tmp + 1) + { + ft_bzero(cl->sprites[i], sizeof(t_sprite)); + } +} static void ft_hitscan(t_cub *cl, uint16_t hit) @@ -35,6 +49,7 @@ static void { hit = 1; cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy] = '0'; + ft_reset_sprites(cl); ft_get_sprite_spawn(cl); } else if (ft_ischarset("1", -- cgit v1.2.3 From c4085f097c743f11d2bfa20462818899831a88b8 Mon Sep 17 00:00:00 2001 From: salad Date: Mon, 23 Mar 2020 18:05:40 +0100 Subject: normed --- src/ft_get_sprite_spawns.c | 6 +++--- src/ft_shoot.c | 14 -------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/ft_get_sprite_spawns.c b/src/ft_get_sprite_spawns.c index b00ef97..c2db153 100644 --- a/src/ft_get_sprite_spawns.c +++ b/src/ft_get_sprite_spawns.c @@ -23,7 +23,7 @@ void y = 0; i = 0; - clist->mlist.sprite_nbr[s_n] = 0; + clist->mlist.sprite_nbr[s_n] = 0; while (clist->mlist.map[++y]) { while (clist->mlist.map[y][++x]) @@ -39,7 +39,7 @@ void x = 0; } if (clist->sprites[s_n][(i - 1 < 0) ? (0) : (i - 1)].s_pos_x != 0 - && s_n + 1 < 7) + && s_n + 1 < 7) { ft_get_next_sprite(clist, s_n + 1, c + 1, 0); } @@ -55,7 +55,7 @@ void x = 1; y = 1; i = 0; - clist->mlist.sprite_nbr[0] = 0; + clist->mlist.sprite_nbr[0] = 0; while (clist->mlist.map[y]) { while (clist->mlist.map[y][x]) diff --git a/src/ft_shoot.c b/src/ft_shoot.c index 73a9617..084d8d2 100644 --- a/src/ft_shoot.c +++ b/src/ft_shoot.c @@ -14,19 +14,6 @@ #include #include -static void - ft_reset_sprites(t_cub *cl) -{ - uint16_t i; - uint16_t tmp; - - tmp = cl->mlist.sprite_var; - while(++i < tmp + 1) - { - ft_bzero(cl->sprites[i], sizeof(t_sprite)); - } -} - static void ft_hitscan(t_cub *cl, uint16_t hit) { @@ -49,7 +36,6 @@ static void { hit = 1; cl->mlist.map[cl->rlist.sqx][cl->rlist.sqy] = '0'; - ft_reset_sprites(cl); ft_get_sprite_spawn(cl); } else if (ft_ischarset("1", -- cgit v1.2.3 From dc0e87ebf47b1520c574b1532374c4386862d635 Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Mon, 23 Mar 2020 18:43:32 +0100 Subject: Gonna merge --- minilibx_linux/Makefile.gen | 2 +- minilibx_linux/test/Makefile.gen | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/minilibx_linux/Makefile.gen b/minilibx_linux/Makefile.gen index 798f98c..f93b892 100644 --- a/minilibx_linux/Makefile.gen +++ b/minilibx_linux/Makefile.gen @@ -1,5 +1,5 @@ INC=/usr/include -HT=Linux +HT=x86_64 DOCP=do_cp ## ## Makefile for MiniLibX in /home/boulon/work/c/raytraceur/minilibx diff --git a/minilibx_linux/test/Makefile.gen b/minilibx_linux/test/Makefile.gen index 7c67f50..c13f70c 100644 --- a/minilibx_linux/test/Makefile.gen +++ b/minilibx_linux/test/Makefile.gen @@ -1,5 +1,5 @@ INC=/usr/include -HT=Linux +HT=x86_64 DOCP=do_cp -- cgit v1.2.3