starnakin/42_cube3D
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KYS MICHEL

Browse Source
This commit is contained in:
Etienne Rey-bethbeder
2023-05-11 16:25:29 +02:00
parent 5c5d23c5f7
commit f73e499a75
11 changed files with 208 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,5 +1,5 @@
SRCS_GAME := main.c game/game.c game/init.c game/manage.c \ SRCS_GAME := main.c game/game.c game/init.c game/manage.c \
game/manage_keys.c game/raycasting.c game/dda.c game/manage_keys.c game/raycasting.c game/dda.c game/draw.c game/utils.c
SRCS_MAP := parsing.c parsing_header.c parsing_header2.c parsing_meta.c parsing_body.c map.c SRCS_MAP := parsing.c parsing_header.c parsing_header2.c parsing_meta.c parsing_body.c map.c
SRCS_MAP := $(addprefix map/, $(SRCS_MAP)) SRCS_MAP := $(addprefix map/, $(SRCS_MAP))
@ -9,7 +9,7 @@ SRCS := ${SRCS_MAP} \
OBJS := ${SRCS:.c=.o} OBJS := ${SRCS:.c=.o}
CC := clang CC := clang
LIBS := libftx/libftx.a MLX42/build/libmlx42.a -ldl -lglfw -lm LIBS := libftx/libftx.a MLX42/build/libmlx42.a -ldl -lglfw -lm
CFLAGS := -g -Wall -Wextra -Werror -Wno-conversion #-Ofast CFLAGS := -g -Wall -Wextra -Werror -Wno-conversion
NAME := cub3D NAME := cub3D
all: ${NAME} all: ${NAME}

119
game/dda.c
View File

@ -6,26 +6,14 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/05/02 15:49:00 by erey-bet #+# #+# */ /* Created: 2023/05/02 15:49:00 by erey-bet #+# #+# */
/* Updated: 2023/05/10 13:40:52 by erey-bet ### ########.fr */ /* Updated: 2023/05/11 16:22:58 by erey-bet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "game.h" #include "game.h"
double ft_abs(double nb) void init_dda(t_dda *dda, t_ply *ply, t_ray *ray)
{ {
if (nb < 0)
return (-nb);
return (nb);
}
void init_dda(t_game *game, t_dda *dda)
{
t_ray *ray;
t_ply *ply;
ray = &game->ray;
ply = &game->ply;
dda->map_x = (int)ply->pos_x; dda->map_x = (int)ply->pos_x;
dda->map_y = (int)ply->pos_y; dda->map_y = (int)ply->pos_y;
if (ray->dir_x == 0) if (ray->dir_x == 0)
@ -39,17 +27,15 @@ void init_dda(t_game *game, t_dda *dda)
dda->step_x = 1; dda->step_x = 1;
dda->step_y = 1; dda->step_y = 1;
if (ray->dir_x < 0) if (ray->dir_x < 0)
{
dda->step_x = -1; dda->step_x = -1;
if (ray->dir_y < 0)
dda->step_y = -1;
if (ray->dir_x < 0)
dda->side_dist_x = (ply->pos_x - dda->map_x) * dda->delta_dist_x; dda->side_dist_x = (ply->pos_x - dda->map_x) * dda->delta_dist_x;
}
else else
dda->side_dist_x = (dda->map_x + 1.0 - ply->pos_x) * dda->delta_dist_x; dda->side_dist_x = (dda->map_x + 1.0 - ply->pos_x) * dda->delta_dist_x;
if (ray->dir_y < 0) if (ray->dir_y < 0)
{
dda->step_y = -1;
dda->side_dist_y = (ply->pos_y - dda->map_y) * dda->delta_dist_y; dda->side_dist_y = (ply->pos_y - dda->map_y) * dda->delta_dist_y;
}
else else
dda->side_dist_y = (dda->map_y + 1.0 - ply->pos_y) * dda->delta_dist_y; dda->side_dist_y = (dda->map_y + 1.0 - ply->pos_y) * dda->delta_dist_y;
dda->hit = 0; dda->hit = 0;
@ -71,26 +57,30 @@ void loop_dda(t_game *game, t_dda *dda)
dda->map_y += dda->step_y; dda->map_y += dda->step_y;
dda->side = 1; dda->side = 1;
} }
if (dda->map_x < 0 || dda->map_y < 0 if (dda->map_x < 0 || dda->map_y < 0 || dda->map_y >= game->map.size_y
|| dda->map_y >= (int)game->map.size_y
|| dda->map_x >= (int)ft_strlen(game->map.map[dda->map_y])) || dda->map_x >= (int)ft_strlen(game->map.map[dda->map_y]))
{ {
dda->perp_wall_dist = 1e30; dda->perp_wall_dist = 1e30;
return ; return ;
} }
else
dda->perp_wall_dist = 0;
if (game->map.map[dda->map_y][dda->map_x] == '1') if (game->map.map[dda->map_y][dda->map_x] == '1')
dda->hit = 1; dda->hit = 1;
} }
if(dda->side == 0)
dda->perp_wall_dist = dda->side_dist_x - dda->delta_dist_x;
else
dda->perp_wall_dist = dda->side_dist_y - dda->delta_dist_y;
} }
void ray_dda(t_dda *dda) void ray_dda(t_dda *dda)
{ {
if (dda->perp_wall_dist != 1e30)
{
if (dda->side == 0)
dda->perp_wall_dist = dda->side_dist_x - dda->delta_dist_x;
else
dda->perp_wall_dist = dda->side_dist_y - dda->delta_dist_y;
if (dda->perp_wall_dist == 0) if (dda->perp_wall_dist == 0)
dda->perp_wall_dist = 1e30; dda->perp_wall_dist = 1e30;
}
dda->line_height = (int)(HEIGHT / dda->perp_wall_dist); dda->line_height = (int)(HEIGHT / dda->perp_wall_dist);
dda->draw_start = -(dda->line_height) / 2 + HEIGHT / 2; dda->draw_start = -(dda->line_height) / 2 + HEIGHT / 2;
if (dda->draw_start < 0) if (dda->draw_start < 0)
@ -100,84 +90,15 @@ void ray_dda(t_dda *dda)
dda->draw_end = HEIGHT - 1; dda->draw_end = HEIGHT - 1;
} }
unsigned int get_rgba(int r, int g, int b, int a)
{
return (r << 24 | g << 16 | b << 8 | a);
}
static uint32_t switch_color_bytes(uint32_t bad)
{
uint32_t good;
good = ((bad & 0xff) << 24) | (((bad >> 8) & 0xff) << 16)
| (((bad >> 16) & 0xff) << 8) | bad >> 24;
return (good);
}
uint32_t get_pixel_color(mlx_texture_t *texture, uint32_t x, uint32_t y) {
return switch_color_bytes(*(uint32_t*)(texture->pixels + (y * texture->width + x) * texture->bytes_per_pixel));
}
int get_texture_side(t_dda *dda)
{
if (dda->side == 0 && dda->step_x < 0)
return (0);
if (dda->side == 0 && dda->step_x > 0)
return (1);
if (dda->side == 1 && dda->step_y < 0)
return (2);
if (dda->side == 1 && dda->step_y > 0)
return (3);
return (0);
}
void draw_texture(t_game *game, t_dda *dda, double x)
{
t_texture_draw tex;
t_ply *ply;
int y;
ply = &game->ply;
tex.texture = game->textures[get_texture_side(dda)];
if (dda->side == 0)
tex.wall_x = ply->pos_y + dda->perp_wall_dist * game->ray.dir_y;
else
tex.wall_x = ply->pos_x + dda->perp_wall_dist * game->ray.dir_x;
tex.wall_x -= floor(tex.wall_x);
tex.x = (int)(tex.wall_x * (double)tex.texture->width);
if ((dda->side == 0 && game->ray.dir_x > 0)
|| (dda->side == 1 && game->ray.dir_y < 0))
tex.x = tex.texture->width - tex.x - 1;
tex.step = 1.0 * tex.texture->height / dda->line_height;
tex.pos = (dda->draw_start - game->window->height / 2 + dda->line_height / 2) * tex.step;
y = dda->draw_start - 1;
while (++y < dda->draw_end)
{
tex.y = (int)tex.pos & (tex.texture->height - 1);
tex.pos += tex.step;
mlx_put_pixel(game->window, x, y, get_pixel_color(tex.texture, tex.x, tex.y));
}
}
void draw(t_game *game, t_dda *dda, int x)
{
int y;
y = -1;
while (++y < dda->draw_start)
mlx_put_pixel(game->window, x, y, game->map.color_bot);
draw_texture(game, dda, x);
y = dda->draw_end - 1;
while (++y < HEIGHT)
mlx_put_pixel(game->window, x, y, game->map.color_top);
}
void dda(t_game *game, int x) void dda(t_game *game, int x)
{ {
t_dda dda; t_dda dda;
t_ray *ray;
t_ply *ply;
init_dda(game, &dda); ray = &game->ray;
ply = &game->ply;
init_dda(&dda, ply, ray);
loop_dda(game, &dda); loop_dda(game, &dda);
ray_dda(&dda); ray_dda(&dda);
draw(game, &dda, x); draw(game, &dda, x);

54
game/draw.c Normal file
View File

@ -0,0 +1,54 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* draw.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/05/11 14:41:48 by erey-bet #+# #+# */
/* Updated: 2023/05/11 16:05:42 by erey-bet ### ########.fr */
/* */
/* ************************************************************************** */
#include "game.h"
void draw_texture(t_game *game, t_dda *dda, int x)
{
t_texture_draw tex;
int y;
tex.texture = game->textures[get_texture_side(dda)];
if (dda->side == 0)
tex.wall_x = game->ply.pos_y + dda->perp_wall_dist * game->ray.dir_y;
else
tex.wall_x = game->ply.pos_x + dda->perp_wall_dist * game->ray.dir_x;
tex.wall_x -= floor(tex.wall_x);
tex.x = (int)(tex.wall_x * (double)tex.texture->width);
if ((dda->side == 0 && game->ray.dir_x > 0)
|| (dda->side == 1 && game->ray.dir_y < 0))
tex.x = tex.texture->width - tex.x - 1;
tex.step = 1.0 * tex.texture->height / dda->line_height;
tex.pos = (dda->draw_start - game->window->height
/ 2 + dda->line_height / 2) * tex.step;
y = dda->draw_start;
while (y < dda->draw_end && y < HEIGHT)
{
tex.y = (int)tex.pos & (tex.texture->height - 1);
tex.pos += tex.step;
mlx_put_pixel(game->window, x, y++,
get_pixel_color(tex.texture, tex.x, tex.y));
}
}
void draw(t_game *game, t_dda *dda, int x)
{
int y;
y = -1;
while (++y < dda->draw_start)
mlx_put_pixel(game->window, x, y, game->map.color_bot);
draw_texture(game, dda, x);
y = dda->draw_end - 1;
while (++y < HEIGHT && y > 0)
mlx_put_pixel(game->window, x, y, game->map.color_top);
}

15
game/game.c
View File

@ -6,12 +6,21 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/26 12:59:53 by erey-bet #+# #+# */ /* Created: 2023/04/26 12:59:53 by erey-bet #+# #+# */
/* Updated: 2023/05/09 12:44:57 by erey-bet ### ########.fr */ /* Updated: 2023/05/11 16:16:00 by erey-bet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "game.h" #include "game.h"
void destroy(t_game *game)
{
mlx_delete_texture(game->textures[0]);
mlx_delete_texture(game->textures[1]);
mlx_delete_texture(game->textures[2]);
mlx_delete_texture(game->textures[3]);
mlx_terminate(game->mlx);
}
int start_game(t_map map) int start_game(t_map map)
{ {
t_game game; t_game game;
@ -29,11 +38,9 @@ int start_game(t_map map)
mlx_terminate(game.mlx); mlx_terminate(game.mlx);
return (1); return (1);
} }
raycasting(&game); raycasting(&game);
mlx_key_hook(game.mlx, manage, &game); mlx_key_hook(game.mlx, manage, &game);
mlx_loop(game.mlx); mlx_loop(game.mlx);
mlx_terminate(game.mlx); destroy(&game);
return (0); return (0);
} }

11
game/game.h
View File

@ -6,7 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/26 15:29:34 by erey-bet #+# #+# */ /* Created: 2023/04/26 15:29:34 by erey-bet #+# #+# */
/* Updated: 2023/05/09 13:11:40 by erey-bet ### ########.fr */ /* Updated: 2023/05/11 15:28:26 by erey-bet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -90,4 +90,13 @@ int raycasting(t_game *game);
/* DDA ALGO */ /* DDA ALGO */
void dda(t_game *game, int x); void dda(t_game *game, int x);
/* UTILS */
double ft_abs(double nb);
unsigned int get_rgba(int r, int g, int b, int a);
uint32_t get_pixel_color(mlx_texture_t *texture, uint32_t x, uint32_t y);
int get_texture_side(t_dda *dda);
/* DRAW */
void draw(t_game *game, t_dda *dda, int x);
#endif #endif

18
game/init.c
View File

@ -6,7 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/27 14:50:22 by erey-bet #+# #+# */ /* Created: 2023/04/27 14:50:22 by erey-bet #+# #+# */
/* Updated: 2023/05/09 12:44:43 by erey-bet ### ########.fr */ /* Updated: 2023/05/11 15:40:16 by erey-bet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,18 +14,18 @@
void init_ply(t_map map, t_ply *ply) void init_ply(t_map map, t_ply *ply)
{ {
ply->pos_x = map.ply_x; ply->pos_x = map.ply_x - 0.5;
ply->pos_y = map.ply_y; ply->pos_y = map.ply_y - 0.5;
ply->dir_x = 0; ply->dir_x = 0.0;
ply->dir_y = 0; ply->dir_y = 0.0;
if (map.direction == 'N') if (map.direction == 'N')
ply->dir_y = -1; ply->dir_y = -1.0;
if (map.direction == 'S') if (map.direction == 'S')
ply->dir_y = 1; ply->dir_y = 1.0;
if (map.direction == 'E') if (map.direction == 'E')
ply->dir_x = 1; ply->dir_x = 1.0;
if (map.direction == 'W') if (map.direction == 'W')
ply->dir_x = -1; ply->dir_x = -1.0;
ply->pla_x = -(ply->dir_y) * 0.66; ply->pla_x = -(ply->dir_y) * 0.66;
ply->pla_y = (ply->dir_x) * 0.66; ply->pla_y = (ply->dir_x) * 0.66;
} }

15
game/manage_keys.c
View File

@ -33,30 +33,25 @@ void rotate(t_ply *ply, bool right)
ply->pla_y = old_plane_x * sin(speed) + old_plane_y * cos(speed); ply->pla_y = old_plane_x * sin(speed) + old_plane_y * cos(speed);
} }
void movement(t_game *game, t_ply *ply, double x, double y) void movement(t_ply *ply, double x, double y)
{ {
(void)game;
//if(game->map.map[(int)(ply->pos_x + x)][(int)ply->pos_y] == '0')
ply->pos_x += x; ply->pos_x += x;
//if(game->map.map[(int)ply->pos_x][(int)(ply->pos_y + y)] == '0')
ply->pos_y += y; ply->pos_y += y;
} }
int manage_movement(t_game *game, int key) int manage_movement(t_game *game, int key)
{ {
t_ply *ply; t_ply *ply;
ply = &game->ply; ply = &game->ply;
//printf("dir_x: %f, dir_y: %f\n", ply->dir_x, ply->dir_y);
if (key == MLX_KEY_W) if (key == MLX_KEY_W)
movement(game, ply, (ply->dir_x * MOVESPEED), (ply->dir_y * MOVESPEED)); movement(ply, (ply->dir_x * MOVESPEED), (ply->dir_y * MOVESPEED));
else if (key == MLX_KEY_S) else if (key == MLX_KEY_S)
movement(game, ply, -(ply->dir_x * MOVESPEED), -(ply->dir_y * MOVESPEED)); movement(ply, -(ply->dir_x * MOVESPEED), -(ply->dir_y * MOVESPEED));
else if (key == MLX_KEY_D) else if (key == MLX_KEY_D)
movement(game, ply, (ply->pla_x * MOVESPEED), (ply->pla_y * MOVESPEED)); movement(ply, (ply->pla_x * MOVESPEED), (ply->pla_y * MOVESPEED));
else if (key == MLX_KEY_A) else if (key == MLX_KEY_A)
movement(game, ply, -(ply->pla_x * MOVESPEED), -(ply->pla_y * MOVESPEED)); movement(ply, -(ply->pla_x * MOVESPEED), -(ply->pla_y * MOVESPEED));
else if (key == MLX_KEY_L) else if (key == MLX_KEY_L)
rotate(ply, true); rotate(ply, true);
else if (key == MLX_KEY_J) else if (key == MLX_KEY_J)

9
game/raycasting.c
View File

@ -12,7 +12,7 @@
#include "game.h" #include "game.h"
int ray(t_game *game) int raycasting(t_game *game)
{ {
t_ply *p; t_ply *p;
t_ray *ray; t_ray *ray;
@ -21,7 +21,6 @@ int ray(t_game *game)
x = 0; x = 0;
p = &game->ply; p = &game->ply;
ray = &game->ray; ray = &game->ray;
while (x < WIDTH) while (x < WIDTH)
{ {
@ -33,9 +32,3 @@ int ray(t_game *game)
} }
return (0); return (0);
} }
int raycasting(t_game *game)
{
ray(game);
return (0);
}

50
game/utils.c Normal file
View File

@ -0,0 +1,50 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* utils.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/05/11 14:19:16 by erey-bet #+# #+# */
/* Updated: 2023/05/11 14:19:19 by erey-bet ### ########.fr */
/* */
/* ************************************************************************** */
#include "game.h"
double ft_abs(double nb)
{
if (nb < 0)
return (-nb);
return (nb);
}
unsigned int get_rgba(int r, int g, int b, int a)
{
return (r << 24 | g << 16 | b << 8 | a);
}
static uint32_t switch_color_bytes(uint32_t color)
{
return (((color & 0xff) << 24) | (((color >> 8) & 0xff) << 16)
| (((color >> 16) & 0xff) << 8) | color >> 24);
}
uint32_t get_pixel_color(mlx_texture_t *texture, uint32_t x, uint32_t y)
{
return (switch_color_bytes(*(uint32_t *)(texture->pixels
+ (y * texture->width + x) * texture->bytes_per_pixel)));
}
int get_texture_side(t_dda *dda)
{
if (dda->side == 0 && dda->step_x < 0)
return (0);
if (dda->side == 0 && dda->step_x > 0)
return (1);
if (dda->side == 1 && dda->step_y < 0)
return (2);
if (dda->side == 1 && dda->step_y > 0)
return (3);
return (0);
}

4
map/map.h
View File

@ -10,8 +10,8 @@ typedef struct s_map
void *img_path[4]; void *img_path[4];
long long color_bot; long long color_bot;
long long color_top; long long color_top;
size_t size_x; int size_x;
size_t size_y; int size_y;
double ply_x; double ply_x;
double ply_y; double ply_y;
char direction; char direction;

22
map/parsing_body.c
View File

@ -3,8 +3,8 @@
char **get_body(const char **file_content, size_t header_size) char **get_body(const char **file_content, size_t header_size)
{ {
char **body; char **body;
size_t i; int i;
size_t len; int len;
len = 0; len = 0;
while (file_content[header_size + len] != NULL) while (file_content[header_size + len] != NULL)
@ -29,8 +29,8 @@ char **get_body(const char **file_content, size_t header_size)
int get_spawn_position(const char **body, double *spawn_x, double *spawn_y) int get_spawn_position(const char **body, double *spawn_x, double *spawn_y)
{ {
size_t x; int x;
size_t y; int y;
*spawn_x = -1; *spawn_x = -1;
*spawn_y = -1; *spawn_y = -1;
@ -58,7 +58,7 @@ int get_spawn_position(const char **body, double *spawn_x, double *spawn_y)
static int map_is_in_one_part(const char **body) static int map_is_in_one_part(const char **body)
{ {
size_t y; int y;
y = ft_tablen((const void **) body) - 1; y = ft_tablen((const void **) body) - 1;
while (body[y][0] == '\0' || ft_contain_only(body[y], ' ')) while (body[y][0] == '\0' || ft_contain_only(body[y], ' '))
@ -74,8 +74,8 @@ static int map_is_in_one_part(const char **body)
static int map_surround(const char **body) static int map_surround(const char **body)
{ {
size_t y; int y;
size_t x; int x;
y = 0; y = 0;
while (body[y] != NULL) while (body[y] != NULL)
@ -125,8 +125,8 @@ static int body_contain_normal_char(const char **body)
void get_size(const char **body, t_map *map) void get_size(const char **body, t_map *map)
{ {
size_t y; int y;
size_t x; int x;
map->size_x = 0; map->size_x = 0;
y = 0; y = 0;
@ -157,8 +157,8 @@ int body_is_valid(t_map *map)
ft_eprintf("map: spawn position: not define"); ft_eprintf("map: spawn position: not define");
return (0); return (0);
} }
map->direction = map->map[(size_t) map->ply_y][(size_t) map->ply_x]; map->direction = map->map[(int) map->ply_y][(int) map->ply_x];
map->map[(size_t) map->ply_y][(size_t) map->ply_x] = '0'; map->map[(int) map->ply_y][(int) map->ply_x] = '0';
error = map_is_in_one_part((const char **)map->map); error = map_is_in_one_part((const char **)map->map);
if (error) if (error)
{ {