rparodi/Cub3D
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: moved parsing to new 'bgoulard' branch, parsing on texteures added

Browse source 
now parses textures using the ol'optional chain functions.
This commit is contained in:
B.Goulard 2024-11-13 07:24:32 +01:00
parent 97f2e348c9
commit 7321db26d9
3 changed files with 174 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

77
includes/cub3d_parsing.h Normal file
View file

@ -0,0 +1,77 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* cub3d_parsing.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/11 14:41:07 by bgoulard #+# #+# */
/* Updated: 2024/11/11 17:43:12 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef CUB3D_PARSING_H
# define CUB3D_PARSING_H
#include <stdbool.h>
# define C3D_PRS_PLS "SO"
# define C3D_PRS_PLW "WE"
# define C3D_PRS_PLN "NO"
# define C3D_PRS_PLE "EA"
# define C3D_PRS_WLL_TRAIL ' '
# define C3D_PRS_WLL '1'
# define C3D_PRS_EMP '0'
enum e_tile_m {
EMPTY,
DOOR_OPEN,
DOOR_ANIM,
DOOR_CLOSE,
WALL_TRAIL,
WALL,
PLAYER_N,
PLAYER_S,
PLAYER_E,
PLAYER_W
};
typedef struct s_map_truth {
enum e_tile_m tile;
char chr[2];
} t_map_truth;
typedef struct s_tile {
enum e_tile_m tile;
bool visited;
} t_tile;
extern const t_map_truth g_map_table[];
/*
= {
{EMPTY, C3D_PRS_EMP},
{WALL_TRAIL, C3D_PRS_WLL_TRAIL},
{WALL, C3D_PRS_WLL},
{PLAYER_N, C3D_PRS_PLN},
{PLAYER_S, C3D_PRS_PLS},
{PLAYER_E, C3D_PRS_PLE},
{PLAYER_W, C3D_PRS_PLW},
};
*/
enum e_identifiers {
UNKNOWN = 0,
TEXTURE_N,
TEXTURE_S,
TEXTURE_E,
TEXTURE_W,
FLOOR,
CEILING,
};
typedef struct s_identifiers {
enum e_identifiers id;
char *path;
} t_identifiers;
#endif /* CUB3D_PARSING_H */

12
includes/cub3d_struct.h
View file

@ -6,7 +6,7 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/08 23:55:29 by bgoulard #+# #+# */
/* Updated: 2024/11/12 11:05:49 by bgoulard ### ########.fr */
/* Updated: 2024/11/13 07:15:14 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
@ -36,6 +36,14 @@ typedef struct s_color
};
} t_color;
typedef struct s_texture
{
t_img *img;
int width;
int height;
char *path;
} t_texture;
typedef struct s_point
{
int x;
@ -64,7 +72,7 @@ typedef struct s_map
t_ipoint size;
t_tile *map;
char **fraw;
t_img texture[4];
t_texture texture[4];
t_color bg_colors[2];
} t_map;