From 433c3b7d89e7df3f64f3f6c47703cbb217127ca8 Mon Sep 17 00:00:00 2001 From: whaffman Date: Fri, 18 Apr 2025 16:17:58 +0200 Subject: [PATCH] fixed minimap orientation and directions of movement --- src/main.c | 4 ++-- src/player.c | 22 +++++++++++----------- src/render/render.c | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main.c b/src/main.c index 32f9c5b..2c56e11 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ */ /* +#+ */ /* Created: 2025/04/15 16:01:29 by qmennen #+# #+# */ -/* Updated: 2025/04/18 10:56:08 by whaffman ######## odam.nl */ +/* Updated: 2025/04/18 11:58:31 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ static int init_game(t_game **game) { - if (! game_create(game)) + if (!game_create(game)) return (FAILURE); if (!player_create(game)) return (FAILURE); diff --git a/src/player.c b/src/player.c index 2e8c682..746c70e 100644 --- a/src/player.c +++ b/src/player.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ -/* player.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/04/15 18:53:19 by qmennen #+# #+# */ -/* Updated: 2025/04/17 20:04:25 by qmennen ### ########.fr */ +/* :::::::: */ +/* player.c :+: :+: */ +/* +:+ */ +/* By: qmennen +#+ */ +/* +#+ */ +/* Created: 2025/04/15 18:53:19 by qmennen #+# #+# */ +/* Updated: 2025/04/18 12:15:31 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -32,8 +32,8 @@ int player_create(t_game **game) static void move(t_player *player, int dir, float delta) { - player->pos.x += dir * (cos(player->angle) * player->speed * delta); - player->pos.y += dir * (sin(player->angle) * player->speed * delta); + player->pos.x += dir * (sin(player->angle) * player->speed * delta); + player->pos.y += dir * -1 * (cos(player->angle) * player->speed * delta); } static void rotate(t_player *player, int dir) @@ -60,7 +60,7 @@ void player_render(t_screen *screen, t_player *player) if (player->pos.x < 0 || player->pos.x >= screen->width || player->pos.y < 0 || player->pos.y >= screen->height) return ; render_circle(screen, player->pos, 4, 0x3294a8ff); - direction.x = player->pos.x + cos(player->angle) * 30; - direction.y = player->pos.y + sin(player->angle) * 30; + direction.x = player->pos.x + sin(player->angle) * 30; + direction.y = player->pos.y - cos(player->angle) * 30; render_line(screen, player->pos, direction, 0xa83232ff); } diff --git a/src/render/render.c b/src/render/render.c index 0f20a4f..966f079 100644 --- a/src/render/render.c +++ b/src/render/render.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ -/* render.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/04/15 16:28:10 by qmennen #+# #+# */ -/* Updated: 2025/04/17 20:14:43 by qmennen ### ########.fr */ +/* :::::::: */ +/* render.c :+: :+: */ +/* +:+ */ +/* By: qmennen +#+ */ +/* +#+ */ +/* Created: 2025/04/15 16:28:10 by qmennen #+# #+# */ +/* Updated: 2025/04/18 11:21:21 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -51,7 +51,7 @@ void render_map(t_screen *screen, t_map *map) y = i / map->height; if (x < 0 || x >= map->width || y < 0 || y >= map->height) continue; - render_tile(screen, x * TILE_SIZE, y * TILE_SIZE, map->grid[x][y]); + render_tile(screen, x * TILE_SIZE, y * TILE_SIZE, map->grid[y][x]); i++; } }