From 0d54c93764ccd8ea70338334e29cc5b59fae00e1 Mon Sep 17 00:00:00 2001 From: Maelys Date: Fri, 1 Nov 2024 16:34:54 +0100 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D=20wip(f?= =?UTF-8?q?t=5Fpassagepietion):=20passage=20pieton=20working=20:+1:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MacroLibX | 2 +- includes/game/settings.h | 4 ++-- src/cub3d.c | 8 ++++---- src/raycasting/dda.c | 22 ++++++++++++---------- src/raycasting/key_hook.c | 2 +- src/raycasting/renderer.c | 12 ++++++++---- src/raycasting/vectwo.c | 3 +-- 7 files changed, 29 insertions(+), 24 deletions(-) diff --git a/MacroLibX b/MacroLibX index 226430f..4d640ed 160000 --- a/MacroLibX +++ b/MacroLibX @@ -1 +1 @@ -Subproject commit 226430f01e8a51ef0aff2e11e3791557edfea0e3 +Subproject commit 4d640ed70cd392f3e3311fe2779905876b7f1b6f diff --git a/includes/game/settings.h b/includes/game/settings.h index 0a36884..d183784 100644 --- a/includes/game/settings.h +++ b/includes/game/settings.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/04 14:06:39 by adjoly #+# #+# */ -/* Updated: 2024/10/29 14:55:59 by adjoly ### ########.fr */ +/* Updated: 2024/11/01 15:53:20 by madumerg ### ########.fr */ /* */ /* ************************************************************************** */ @@ -27,7 +27,7 @@ # define WINDOW_W 1600 # define PLAYER_ROT_SPEED (2 * M_PI) / 128 # define PLAYER_SPEED 0.01 -# define RAY_SIZE 1 +# define RAY_SIZE 50 # define FOV ( 60 * (M_PI / 180) ) # define CHUNK_SIZE 64 diff --git a/src/cub3d.c b/src/cub3d.c index fede1d3..0f59a86 100644 --- a/src/cub3d.c +++ b/src/cub3d.c @@ -6,7 +6,7 @@ /* By: madumerg +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/04 16:58:27 by madumerg #+# #+# */ -/* Updated: 2024/10/30 10:02:56 by adjoly ### ########.fr */ +/* Updated: 2024/11/01 16:16:52 by madumerg ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,9 +30,9 @@ int main(int ac, char **av) world.arr = ft_split("11111 10001 10001 10001 11111", ' '); world.size.x = 5; world.size.y = 5; - player.coord.x = 1; - player.coord.y = 1; - player.direction = 0; + player.coord.x = 2.5; + player.coord.y = 3.5; + player.direction = 2 * M_PI - 0.001; render.mlx = mlx_init(); render.win = mlx_new_window(render.mlx, WINDOW_W, WINDOW_H, "WTF"); render.img = mlx_new_image(render.mlx, WINDOW_W, WINDOW_H); diff --git a/src/raycasting/dda.c b/src/raycasting/dda.c index 23db3ec..71752d0 100644 --- a/src/raycasting/dda.c +++ b/src/raycasting/dda.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/07 16:55:09 by adjoly #+# #+# */ -/* Updated: 2024/10/30 14:42:06 by adjoly ### ########.fr */ +/* Updated: 2024/11/01 16:13:57 by madumerg ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,10 +14,12 @@ #include #include #include +#include -void setup_dda_hor(t_player *play, t_ray *ray, t_dda *dda) +void setup_dda_ver(t_player *play, t_ray *ray, t_dda *dda) { - dda->h = true; + dda->distance.x = 1000000; + dda->h = false; dda->s = true; ray->tan = tan(ray->angle); if (cos(ray->angle) < -0.001) @@ -36,36 +38,37 @@ void setup_dda_hor(t_player *play, t_ray *ray, t_dda *dda) } else { - dda->s = false; ray->pos.x = play->coord.x; ray->pos.y = play->coord.y; + dda->s = false; } } -void setup_dda_ver(t_player *play, t_ray *ray, t_dda *dda) +void setup_dda_hor(t_player *play, t_ray *ray, t_dda *dda) { + dda->distance.y = 1000000; dda->s = true; - dda->h = false; + dda->h = true; ray->tan = 1 / tan(ray->angle); if (sin(ray->angle) < -0.001) { ray->offset.y = CHUNK_SIZE; ray->offset.x = -CHUNK_SIZE * ray->tan; - ray->pos.y = (((int)play->coord.y >> 6) << 6) - CHUNK_SIZE; + ray->pos.y = (((int)play->coord.y >> 6) << 6) + CHUNK_SIZE; ray->pos.x = (play->coord.y - ray->pos.y) * ray->tan + play->coord.x; } else if(sin(ray->angle) > 0.001) { ray->offset.y = -CHUNK_SIZE; ray->offset.x = CHUNK_SIZE * ray->tan; - ray->pos.y = (((int)play->coord.y >> 6) << 6) + 0.001; + ray->pos.y = (((int)play->coord.y >> 6) << 6) - 0.001; ray->pos.x -= (play->coord.y - ray->pos.y) * ray->tan + play->coord.x; } else { - dda->s = false; ray->pos.x = play->coord.x; ray->pos.y = play->coord.y; + dda->s = false; } } @@ -80,7 +83,6 @@ void dda_loop(t_dda *dda, t_ray *ray, t_map *map, t_player *play) { dda->map.x = (int)(ray->pos.x / 64); dda->map.y = (int)(ray->pos.y / 64); - printf("%f, %f\n", ray->pos.x, ray->pos.y); if (dda->map.x >= 0 && dda->map.x < w && dda->map.y >= 0 && dda->map.y < h && \ map->arr[(int)dda->map.y][(int)dda->map.x] == '1') { diff --git a/src/raycasting/key_hook.c b/src/raycasting/key_hook.c index accc010..fecdc03 100644 --- a/src/raycasting/key_hook.c +++ b/src/raycasting/key_hook.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/11 16:37:56 by adjoly #+# #+# */ -/* Updated: 2024/10/29 14:57:10 by adjoly ### ########.fr */ +/* Updated: 2024/11/01 16:05:37 by madumerg ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/raycasting/renderer.c b/src/raycasting/renderer.c index 03691a6..468c981 100644 --- a/src/raycasting/renderer.c +++ b/src/raycasting/renderer.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/28 15:48:39 by adjoly #+# #+# */ -/* Updated: 2024/10/29 14:22:37 by adjoly ### ########.fr */ +/* Updated: 2024/11/01 16:30:17 by madumerg ### ########.fr */ /* */ /* ************************************************************************** */ @@ -64,9 +64,12 @@ void print_line(t_render *render, t_ray *ray, int x) y = 0; while (y < line) { - j = -1; - while (++j <= RAY_SIZE) + j = 0; + while (j < RAY_SIZE) + { mlx_set_image_pixel(render->mlx, render->img, x + j, line_start + y, WHITE); + j++; + } y++; } } @@ -89,8 +92,9 @@ void render_frame(t_render *render) ang = render->player->direction - ray.angle; fix_ang(&ang); ray.distance *= cos(ang); + printf("distance = %f\n", ray.distance); print_line(render, &ray, i); - ray.angle += (M_PI / 180) / (WINDOW_W / FOV); + ray.angle += (M_PI / 180) / ((WINDOW_W * RAY_SIZE) / FOV); fix_ang(&ray.angle); i -= RAY_SIZE; } diff --git a/src/raycasting/vectwo.c b/src/raycasting/vectwo.c index 5795d1a..1e942f7 100644 --- a/src/raycasting/vectwo.c +++ b/src/raycasting/vectwo.c @@ -6,14 +6,13 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/26 15:47:29 by adjoly #+# #+# */ -/* Updated: 2024/10/28 15:20:24 by adjoly ### ########.fr */ +/* Updated: 2024/11/01 16:07:33 by madumerg ### ########.fr */ /* */ /* ************************************************************************** */ #include "game/vectwo.h" #include - float vec2_dist(t_vec2 first, t_vec2 second) { return (sqrt(powf(second.x - first.x, 2) + powf(second.y - first.y, 2)));