logistic-bot/cub3d
1
0
Fork 0
mirror of https://codeberg.org/ACME-Corporation/cub3d.git synced 2025-12-06 01:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(player): reworked angles for player and added player initialization

Browse source
This commit is contained in:
Theo Champion 2025-07-29 12:14:44 +02:00
parent 6c5a15915f
commit fa3cb8da4a
4 changed files with 79 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/consts.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/28 14:33:12 by kcolin #+# #+# */
/* Updated: 2025/07/28 15:03:16 by kcolin ### ########.fr */
/* Updated: 2025/07/29 12:01:33 by tchampio ### ########.fr */
/* */
/* ************************************************************************** */

5
src/consts.h
View file

@ -6,7 +6,11 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/17 14:54:36 by kcolin #+# #+# */
<<<<<<< Updated upstream
/* Updated: 2025/07/29 11:42:20 by kcolin ### ########.fr */
=======
/* Updated: 2025/07/29 12:02:08 by tchampio ### ########.fr */
>>>>>>> Stashed changes
/* */
/* ************************************************************************** */
@ -31,6 +35,7 @@ extern const float g_southeast;
# define RESSOURCE_DIR "ressources"
# define MOVEMENT_SPEED 6.4
# define ROTATION_SPEED 0.1
# define PLANE_VALUE 0.66
# ifdef BONUS
# define COMPILED_TEXT "Compiled with bonuses"
# else

67
src/player/player.c Normal file
View file

@ -0,0 +1,67 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* player.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tchampio <tchampio@student.42lehavre. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/29 11:42:44 by tchampio #+# #+# */
/* Updated: 2025/07/29 12:04:52 by tchampio ### ########.fr */
/* */
/* ************************************************************************** */
#include "player.h"
#include "../map/mapdata.h"
#include "../consts.h"
// east west
void init_lon(t_player *player, char dir)
{
if (dir == 'N')
{
player->dir_x = 0;
player->dir_y = -1;
player->plane_x = PLANE_VALUE;
player->plane_y = 0;
}
else
{
player->dir_x = 0;
player->dir_y = 1;
player->plane_x = -PLANE_VALUE;
player->plane_y = 0;
}
}
// north south
void init_lat(t_player *player, char dir)
{
if (dir == 'E')
{
player->dir_x = 1;
player->dir_y = 0;
player->plane_x = 0;
player->plane_y = PLANE_VALUE;
}
else
{
player->dir_x = -1;
player->dir_y = 0;
player->plane_x = 0;
player->plane_y = -PLANE_VALUE;
}
}
void init_player(t_player *player, t_mapdata *map)
{
char dir;
dir = map->map[map->starty][map->startx];
player->x = map->startx + 0.5;
player->y = map->starty + 0.5;
player->health = 100;
player->points = 500;
if (dir == 'N' || dir == 'S')
init_lon(player, dir);
else
init_lat(player, dir);
}

8
src/player/player.h
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/17 15:51:29 by kcolin #+# #+# */
/* Updated: 2025/07/24 14:07:09 by tchampio ### ########.fr */
/* Updated: 2025/07/29 12:01:02 by tchampio ### ########.fr */
/* */
/* ************************************************************************** */
@ -23,8 +23,12 @@ typedef struct s_player
{
double x;
double y;
double yaw;
double dir_x;
double dir_y;
double plane_x;
double plane_y;
int health;
int points;
t_vec2 movement;
} t_player;