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

tmp push merge resolution not finished

Browse source
This commit is contained in:
Baptiste GOULARD 2024-11-28 16:02:06 +01:00
parent 2568aa69a6
commit 00dc0e9e67
16 changed files with 454 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

21
includes/cub3d.h
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/30 16:30:26 by rparodi #+# #+# */
/* Updated: 2024/11/28 13:54:39 by bgoulard ### ########.fr */
/* Updated: 2024/11/28 15:15:31 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
@ -22,6 +22,23 @@
# include <stdbool.h>
// utils
int render_frame(t_info *data);
void my_mlx_pixel_put(t_info *data, int x, int y, int color);
double deg2rad(int deg);
void rotate_plane(t_dpoint *plane, double angle);
// key pressed func
void look_left(t_info *data);
void look_right(t_info *data);
void move_straight(t_info *data);
void move_backward(t_info *data);
void move_left(t_info *data);
void move_right(t_info *data);
int get_cl(int side, t_ipoint step);
t_tile *c3_get_cell(t_tile *map, t_ipoint dimensions, t_ipoint pos);
/// @brief Createsa a blank map for rapahael to test the raycasting
/// @note Dev only function.
void blank(t_info *info);
@ -38,6 +55,6 @@ void parse_map(t_info *info);
void parse_args(char *arg, t_info *inf);
int main(int argc, char *argv[]);
void shelves_launch(t_info *info);
int shelves_launch(t_info *info);
#endif /* CUB3D_H */

31
includes/cub3d_struct.h
View file

@ -6,7 +6,7 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/28 13:53:54 by bgoulard #+# #+# */
/* Updated: 2024/11/28 13:54:53 by bgoulard ### ########.fr */
/* Updated: 2024/11/28 15:36:36 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,9 +20,13 @@
# define FILE_EXTENSION_LEN 4
# define BG_CLG 0
# define BG_FLR 1
#define FOV 65
#define TILE_SIZE 64
// defines that should be mooved to a config option / file
#define FOV 70
#define ROT_SPEED 0.1
#define MOVE_SPEED 0.5
// -- graphic utils
typedef struct s_color
@ -96,7 +100,9 @@ typedef struct s_map
typedef struct s_player
{
t_dpoint pos;
double view;
t_ipoint pos_i;
t_dpoint dir;
t_dpoint plane;
} t_player;
// -- cli utils
@ -129,6 +135,15 @@ typedef enum e_error
ERROR_IMPLEM,
} t_error;
typedef struct s_pixel_buffer
{
char *img_addr;
t_img *screen_buff;
int bpp;
int line_len;
int endian;
} t_pixel_buffer;
// -- main struct
typedef struct s_info
@ -136,11 +151,15 @@ typedef struct s_info
t_error last_error;
int errno_state;
t_xvar *mlx_ptr;
t_win_list *win_ptr;
t_xvar *mlx_ptr;
t_win_list *win_ptr;
t_ipoint screen_size;
t_pixel_buffer camera;
t_map map;
t_player player;
t_cli cli_ctx;
} t_info;
#endif /* CUB3D_STRUCT_H */