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

norme: fixed norme issues

Browse source
This commit is contained in:
Theo Champion 2025-10-02 00:12:16 +02:00
parent 94fd8779e2
commit f325eb3dbf
5 changed files with 72 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/raycast/ray.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/31 11:55:41 by kcolin #+# #+# */
/* Updated: 2025/10/01 14:10:46 by tchampio ### ########.fr */
/* Updated: 2025/10/02 00:10:20 by tchampio ### ########.fr */
/* */
/* ************************************************************************** */
@ -19,10 +19,7 @@
#include "../cub3d_data.h"
#include <float.h>
#include <math.h>
#include <stdlib.h>
#include "../map/collision.h"
#include "../player/pay.h"
#include "../../libft/includes/libft.h"
void init_ray(t_ray *ray, int pos_x, t_player *player)
{
@ -59,53 +56,16 @@ void ray_calculate_step(t_ray *ray, t_player *player)
}
}
void handle_door_ray(t_ray *ray, t_cub3d_data *data)
{
if ((data->map->map[ray->map_y][ray->map_x] == 'd' || data->map->map[ray->map_y][ray->map_x] == 'i' || data->map->map[ray->map_y][ray->map_x] == 'P') && ray->wall_dist < 1.5)
{
//ft_printf("map[%d][%d] = door reachable\n", ray->map_y, ray->map_x);
data->player.closest_door[0] = ray->map_x;
data->player.closest_door[1] = ray->map_y;
data->player.can_open_door = true;
if (data->keypresses.is_f_pressed)
{
data->keypresses.is_f_pressed = false;
if (data->map->map[ray->map_y][ray->map_x] == 'd')
data->map->map[ray->map_y][ray->map_x] = 'i';
else if (data->map->map[ray->map_y][ray->map_x] == 'P' && pay(data, data->door_amount, true))
data->map->map[ray->map_y][ray->map_x] = '0';
else if (data->map->map[ray->map_y][ray->map_x] == 'i')
data->map->map[ray->map_y][ray->map_x] = 'd';
}
}
else
{
data->player.closest_door[0] = -1;
data->player.closest_door[1] = -1;
data->player.can_open_door = false;
}
}
void calculate_wall_dist(t_ray *ray, int x, t_cub3d_data *data)
{
while (true)
{
if (x == WIDTH / 2)
check_for_zombies(ray, data);
if (!blocks_view(data->map, ray->map_x, ray->map_y) && data->map->map[ray->map_y][ray->map_x] == 'i')
if (!blocks_view(data->map, ray->map_x, ray->map_y)
&& data->map->map[ray->map_y][ray->map_x] == 'i')
handle_door_ray(ray, data);
if (ray->side_dist_x < ray->side_dist_y)
{
ray->side_dist_x += ray->delta_dist_x;
ray->map_x += ray->step_x;
ray->side = NORTH;
}
else
{
ray->side_dist_y += ray->delta_dist_y;
ray->map_y += ray->step_y;
ray->side = SOUTH;
}
step_ray(ray);
if (blocks_view(data->map, ray->map_x, ray->map_y))
{
if (x == WIDTH / 2)

6
src/raycast/ray.h
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/08/05 12:49:49 by kcolin #+# #+# */
/* Updated: 2025/09/09 14:01:28 by tchampio ### ########.fr */
/* Updated: 2025/10/02 00:11:01 by tchampio ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,6 +15,7 @@
# include "../map/mapdata.h"
# define BARRICADE_TICK 55000
# include "../cub3d_data.h"
/*
* plane - plan de camera (vectoriel)
@ -53,4 +54,7 @@ typedef struct s_ray
double wall_x;
} t_ray;
void handle_door_ray(t_ray *ray, t_cub3d_data *data);
void step_ray(t_ray *ray);
#endif // RAY_H

60
src/raycast/ray2.c Normal file
View file

@ -0,0 +1,60 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ray2.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tchampio <tchampio@student.42lehavre.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/10/02 00:09:16 by tchampio #+# #+# */
/* Updated: 2025/10/02 00:11:51 by tchampio ### ########.fr */
/* */
/* ************************************************************************** */
#include "ray.h"
#include "../../libft/includes/libft.h"
#include "../player/pay.h"
void handle_door_ray(t_ray *ray, t_cub3d_data *data)
{
char current_tile;
current_tile = data->map->map[ray->map_y][ray->map_x];
if (ft_strchr("diP", current_tile) && ray->wall_dist < 1.5)
{
data->player.closest_door[0] = ray->map_x;
data->player.closest_door[1] = ray->map_y;
data->player.can_open_door = true;
if (data->keypresses.is_f_pressed)
{
data->keypresses.is_f_pressed = false;
if (current_tile == 'd')
data->map->map[ray->map_y][ray->map_x] = 'i';
else if (current_tile == 'P' && pay(data, data->door_amount, true))
data->map->map[ray->map_y][ray->map_x] = '0';
else if (current_tile == 'i')
data->map->map[ray->map_y][ray->map_x] = 'd';
}
}
else
{
data->player.closest_door[0] = -1;
data->player.closest_door[1] = -1;
data->player.can_open_door = false;
}
}
void step_ray(t_ray *ray)
{
if (ray->side_dist_x < ray->side_dist_y)
{
ray->side_dist_x += ray->delta_dist_x;
ray->map_x += ray->step_x;
ray->side = NORTH;
}
else
{
ray->side_dist_y += ray->delta_dist_y;
ray->map_y += ray->step_y;
ray->side = SOUTH;
}
}

4
src/raycast/walls.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/31 13:17:39 by kcolin #+# #+# */
/* Updated: 2025/10/01 14:12:44 by tchampio ### ########.fr */
/* Updated: 2025/10/01 23:00:52 by tchampio ### ########.fr */
/* */
/* ************************************************************************** */
@ -66,7 +66,7 @@ static int get_color(t_cub3d_data *data, t_ray *ray, int tex_y)
if (ft_strchr("234567", data->map->map[ray->map_y][ray->map_x]))
return (my_mlx_pixel_get(get_right_barricade(data,
data->map->map[ray->map_y][ray->map_x]), tex_x, tex_y));
if (data->map->map[ray->map_y][ray->map_x] == 'd' || data->map->map[ray->map_y][ray->map_x] == 'P')
if (ft_strchr("dP", data->map->map[ray->map_y][ray->map_x]))
return (my_mlx_pixel_get(data->door_texture, tex_x, tex_y));
if (dir == NORTH)
texture = data->no_texture;