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

feat(player): redid all the movement code more details in desc

Browse source 
- had to tamper at init with the map pointer to allow player to move
- tweaked movement speed
- allowed for multiple keys to be pressed at the same time
- added collisions
- had to modify minimap code because it segfaulted due to old code
This commit is contained in:
Theo Champion 2025-07-29 14:58:30 +02:00
parent ac94e9e937
commit faf5127829
11 changed files with 143 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/main.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/17 14:14:30 by kcolin #+# #+# */
/* Updated: 2025/07/29 13:28:35 by tchampio ### ########.fr */
/* Updated: 2025/07/29 14:00:36 by tchampio ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,6 +16,7 @@
#include "consts.h"
#include "cub3d_data.h"
#include "draw/drawutils.h"
#include "player/move.h"
#include "map/map_checker.h"
#include "draw/draw_map.h"
#include "map/mapdata.h"
@ -57,21 +58,21 @@ bool touch(float px, float py, t_mapdata *map)
// }
// }
t_cardinal_dir angle_cardinal_dir(float angle)
{
if (angle >= g_southwest || (angle > g_south && angle < g_southeast))
return (SOUTH);
if (angle >= g_southeast && angle < g_northeast)
return (EAST);
if (angle >= g_northeast && angle < g_northwest)
return (NORTH);
return (WEST);
}
t_cardinal_dir player_cardinal_dir(t_player player)
{
return (angle_cardinal_dir(player.yaw));
}
// t_cardinal_dir angle_cardinal_dir(float angle)
// {
// if (angle >= g_southwest || (angle > g_south && angle < g_southeast))
// return (SOUTH);
// if (angle >= g_southeast && angle < g_northeast)
// return (EAST);
// if (angle >= g_northeast && angle < g_northwest)
// return (NORTH);
// return (WEST);
// }
//
// t_cardinal_dir player_cardinal_dir(t_player player)
// {
// return (angle_cardinal_dir(player.yaw));
// }
t_intercardinal_dir angle_intercardinal_dir(float angle)
{
@ -84,10 +85,10 @@ t_intercardinal_dir angle_intercardinal_dir(float angle)
return (SOUTHWEST);
}
t_intercardinal_dir player_intercardinal_dir(t_player player)
{
return (angle_intercardinal_dir(player.yaw));
}
// t_intercardinal_dir player_intercardinal_dir(t_player player)
// {
// return (angle_intercardinal_dir(player.yaw));
// }
/*
** Converts a coordinate from global map space to local tile space.
@ -104,6 +105,7 @@ int game_loop(t_cub3d_data *data)
{
mlx_destroy_image(data->mlx, data->img_data->img);
data->img_data->img = mlx_new_image(data->mlx, WIDTH, HEIGHT);
move_player(data);
// if (player_intercardinal_dir(data->player) == SOUTHEAST)
// ft_printf("southeast ");