norming cub3d.hHEADmaster

1 files changed, 149 insertions, 136 deletions

diff --git a/include/cub3d.h b/include/cub3d.h
index bd696fb..0b7da30 100644
--- a/include/cub3d.h
+++ b/include/cub3d.h
@@ -6,10 +6,9 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/11/15 06:40:37 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/05 01:19:02 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/02/05 01:42:33 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
-#include <stdio.h>
 
 #ifndef CUB3D_H
 # define CUB3D_H
@@ -42,25 +41,25 @@
 # define TRUE 1
 # define FALSE 0
 
-typedef int	t_bool;
+typedef int					t_bool;
 
 typedef struct
 {
-	double	x;
-	double	y;
-}			t_vector;
+	double					x;
+	double					y;
+}							t_vector;
 
 typedef union
 {
-	unsigned int	hexcode;
+	unsigned int			hexcode;
 	struct
 	{
-		t_byte		b;
-		t_byte		g;
-		t_byte		r;
-		t_byte		alpha;
-	}				rgb;
-}					t_color;
+		t_byte				b;
+		t_byte				g;
+		t_byte				r;
+		t_byte				alpha;
+	}						rgb;
+}							t_color;
 
 typedef enum
 {
@@ -73,7 +72,7 @@ typedef enum
 	CELL_LOOK_EAST
 }	t_cell;
 
-typedef t_cell** t_map;
+typedef t_cell**			t_map;
 
 enum
 {
@@ -88,22 +87,22 @@ enum
 
 typedef struct
 {
-	int		width;
-	int		height;
-	void	*id;
-	char	*data;
-	int		depth;
-	int		size_line;
-	int		endian;
-}			t_image;
-
-typedef struct
+	int						width;
+	int						height;
+	void					*id;
+	char					*data;
+	int						depth;
+	int						size_line;
+	int						endian;
+}							t_image;
+
+typedef struct				s_sprite
 {
-	t_vector	pos;
-	double		dist;
-}				t_sprite;
+	t_vector				pos;
+	double					dist;
+}							t_sprite;
 
-typedef unsigned short	t_pflags;
+typedef unsigned short		t_pflags;
 # define PFLAGS_R (1 << 0)
 # define PFLAGS_NO (1 << 1)
 # define PFLAGS_SO (1 << 2)
@@ -113,27 +112,27 @@ typedef unsigned short	t_pflags;
 # define PFLAGS_F (1 << 6)
 # define PFLAGS_C (1 << 7)
 
-typedef struct	s_state
+typedef struct				s_state
 {
-	t_pflags	pflags;
-	t_bool		running;
-	void		*mlx_ptr;
-	void		*window_ptr;
-	t_vector	pos;
-	t_vector	dir;
-	t_vector	plane;
-	t_map		map;
-	int			map_width;
-	int			map_height;
-	t_color		ceilling_color;
-	t_color		floor_color;
-	t_image		window;
-	char		*textures_path[TEXTURES_NUM];
-	t_image		textures[TEXTURES_NUM];
-	double		*z_buffer;
-	int			sprites_num;
-	t_sprite	*sprites;
-}				t_state;
+	t_pflags				pflags;
+	t_bool					running;
+	void					*mlx_ptr;
+	void					*window_ptr;
+	t_vector				pos;
+	t_vector				dir;
+	t_vector				plane;
+	t_map					map;
+	int						map_width;
+	int						map_height;
+	t_color					ceilling_color;
+	t_color					floor_color;
+	t_image					window;
+	char					*textures_path[TEXTURES_NUM];
+	t_image					textures[TEXTURES_NUM];
+	double					*z_buffer;
+	int						sprites_num;
+	t_sprite				*sprites;
+}							t_state;
 
 typedef enum
 {
@@ -141,37 +140,37 @@ typedef enum
 	SIDE_WE
 }	t_side;
 
-typedef struct	s_render_state
+typedef struct				s_render_state
 {
-	int			x;
-	t_vector	ray;
-	t_vector	map_pos;
-	t_vector	delta;
-	t_side		side;
-	double		perp_dist;
-	int			line_height;
-	t_vector	probe;
-	t_vector	map_step;
-	int			draw_start;
-	int			draw_end;
-	t_cell		target;
-}				t_render_state;
-
-typedef struct
+	int						x;
+	t_vector				ray;
+	t_vector				map_pos;
+	t_vector				delta;
+	t_side					side;
+	double					perp_dist;
+	int						line_height;
+	t_vector				probe;
+	t_vector				map_step;
+	int						draw_start;
+	int						draw_end;
+	t_cell					target;
+}							t_render_state;
+
+typedef struct				s_sprite_state
 {
-	t_vector	sprite;
-	double		inverse_det;
-	t_vector	transform;
-	int			sprite_window_x;
-	int			draw_start_x;
-	int			draw_end_x;
-	int			sprite_height;
-	int			sprite_width;
-	int			draw_end_y;
-	int			draw_start;
-}				t_sprite_state;
-
-typedef t_bool	(*t_option_parser_func)(t_state *state, char *line);
+	t_vector				sprite;
+	double					inverse_det;
+	t_vector				transform;
+	int						sprite_window_x;
+	int						draw_start_x;
+	int						draw_end_x;
+	int						sprite_height;
+	int						sprite_width;
+	int						draw_end_y;
+	int						draw_start;
+}							t_sprite_state;
+
+typedef t_bool				(*t_option_parser_func)(t_state *state, char *line);
 
 typedef struct				s_option_parser
 {
@@ -183,144 +182,158 @@ typedef struct				s_option_parser
 ** parse/parse.c
 */
 
-t_state		*parse(char *filename);
-t_bool		parse_line(t_state *state, char *line);
-t_state		*parse_map(t_state *state, char **lines);
-t_cell		*create_map_row(t_state *state, char *line);
+t_state						*parse(char *filename);
+t_bool						parse_line(t_state *state, char *line);
+t_state						*parse_map(t_state *state, char **lines);
+t_cell						*create_map_row(t_state *state, char *line);
 
 /*
 ** parse/parse_file.c
 */
 
-char		**get_file_lines(char *filename);
-int			parse_premap(t_state *state, char **lines);
-t_bool		create_map_row_char(char c, t_cell *row, int i);
+char						**get_file_lines(char *filename);
+int							parse_premap(t_state *state, char **lines);
+t_bool						create_map_row_char(char c, t_cell *row, int i);
 
 /*
 ** parse/parse_check.c
 */
 
-t_state		*parse_check(t_state *state);
+t_state						*parse_check(t_state *state);
 
 /*
 ** parse/parse_resolution.c
 */
 
-t_bool		parse_resolution(t_state *state, char *line);
+t_bool						parse_resolution(t_state *state, char *line);
 
 /*
 ** parse/parse_textures.c
 */
 
-t_bool		parse_north_texture(t_state *state, char *line);
-t_bool		parse_south_texture(t_state *state, char *line);
-t_bool		parse_west_texture(t_state *state, char *line);
-t_bool		parse_east_texture(t_state *state, char *line);
-t_bool		parse_sprite_texture(t_state *state, char *line);
+t_bool						parse_north_texture(t_state *state, char *line);
+t_bool						parse_south_texture(t_state *state, char *line);
+t_bool						parse_west_texture(t_state *state, char *line);
+t_bool						parse_east_texture(t_state *state, char *line);
+t_bool						parse_sprite_texture(t_state *state, char *line);
 
 /*
 ** parse/parse_color.c
 */
 
-t_bool		parse_floor_color(t_state *state, char *line);
-t_bool		parse_ceilling_color(t_state *state, char *line);
+t_bool						parse_floor_color(t_state *state, char *line);
+t_bool						parse_ceilling_color(t_state *state, char *line);
 
 /*
 ** event.c
 */
 
-int			event_keydown(int key, t_state *state);
-int			event_quit(t_state *state);
+int							event_keydown(int key, t_state *state);
+int							event_quit(t_state *state);
 
 /*
 ** state.c
 */
 
-t_state		*state_new(t_state *state);
-void		state_init_player(t_state *state);
-t_state		*state_new_empty(void);
-void		*state_destroy(t_state *state);
-t_bool		state_init_textures(t_state *state);
+t_state						*state_new(t_state *state);
+void						state_init_player(t_state *state);
+t_state						*state_new_empty(void);
+void						*state_destroy(t_state *state);
+t_bool						state_init_textures(t_state *state);
 
 /*
 ** render.c
 */
 
-int			render_update(void *param);
-void		render_update_window(t_state *state);
-void		render_column(t_state *state, int x);
-void		render_window_column(t_state *state, t_render_state *rstate);
+int							render_update(void *param);
+void						render_update_window(t_state *state);
+void						render_column(t_state *state, int x);
+void						render_window_column(t_state *state,
+								t_render_state *rstate);
 
 /*
 ** vector.c
 */
 
-t_vector	vector_add(t_vector a, t_vector b);
-t_vector	vector_scale(t_vector v, double scalar);
-t_vector	vector_rotate(t_vector v, double angle);
-double		vector_norm(t_vector v);
-t_vector	vector_new(double x, double y);
+t_vector					vector_add(t_vector a, t_vector b);
+t_vector					vector_scale(t_vector v, double scalar);
+t_vector					vector_rotate(t_vector v, double angle);
+double						vector_norm(t_vector v);
+t_vector					vector_new(double x, double y);
 
 /*
 ** error.c
 */
 
-void		error_put_usage_exit(char *name);
-void		error_put(char *message);
-void		*error_put_return(char *message);
-void		*error_put_return_state_destroy(char *message, t_state *state);
-void		*error_put_return_lines_state_destroy(
-				char *message, t_state *state, char **lines);
+void						error_put_usage_exit(char *name);
+void						error_put(char *message);
+void						*error_put_return(char *message);
+void						*error_put_return_state_destroy(
+								char *message, t_state *state);
+void						*error_put_return_lines_state_destroy(
+								char *message, t_state *state, char **lines);
 
 /*
 ** helper.c
 */
 
-t_bool		helper_is_player_cell(t_cell cell);
-void		helper_free_splited(char **splited);
-void		helper_rotate_player(t_state *state, double rotation);
-void		helper_init_dir_plane(t_state *state, int y, int x);
-t_bool		state_init_sprites(t_state *state);
+t_bool						helper_is_player_cell(t_cell cell);
+void						helper_free_splited(char **splited);
+void						helper_rotate_player(t_state *state,
+												double rotation);
+void						helper_init_dir_plane(t_state *state,
+												int y, int x);
+t_bool						state_init_sprites(t_state *state);
 
 /*
 ** render_state.c
 */
 
-void		rstate_init(t_state *state, t_render_state *rstate, int x);
-void		rstate_post(t_state *state, t_render_state *rstate);
-void		rstate_perp_dist(t_state *state, t_render_state *rstate);
-void		rstate_line_height(t_state *state, t_render_state *rstate);
-void		rstate_next_probe(t_render_state *rstate);
+void						rstate_init(t_state *state,
+									t_render_state *rstate, int x);
+void						rstate_post(t_state *state,
+									t_render_state *rstate);
+void						rstate_perp_dist(t_state *state,
+									t_render_state *rstate);
+void						rstate_line_height(t_state *state,
+									t_render_state *rstate);
+void						rstate_next_probe(t_render_state *rstate);
 
 /*
 ** texture.c
 */
 
-void		texture_render(t_state *state, t_render_state *rstate, int *i);
-t_image		*texture_select(t_state *state, t_render_state *rstate);
-int			texture_x(t_state *state, t_render_state *rstate, t_image *texture);
+void						texture_render(t_state *state,
+								t_render_state *rstate, int *i);
+t_image						*texture_select(t_state *state,
+								t_render_state *rstate);
+int							texture_x(t_state *state,
+								t_render_state *rstate, t_image *texture);
 
 /*
 ** capture.c
 */
 
-int			capture(t_state *state);
-t_bool		bmp_write(t_image *image, t_byte file_header[FILE_HEADER_SIZE],
-						t_byte info_header[INFO_HEADER_SIZE]);
-void		bmp_write_pixels(int fd, t_image *image, t_byte *bmp_data);
-void		bmp_fill_header(t_image *image, t_byte file_header[FILE_HEADER_SIZE],
-						t_byte info_header[INFO_HEADER_SIZE]);
+int							capture(t_state *state);
+t_bool						bmp_write(t_image *image,
+								t_byte file_header[FILE_HEADER_SIZE],
+								t_byte info_header[INFO_HEADER_SIZE]);
+void						bmp_write_pixels(int fd, t_image *image,
+								t_byte *bmp_data);
+void						bmp_fill_header(t_image *image,
+								t_byte file_header[FILE_HEADER_SIZE],
+								t_byte info_header[INFO_HEADER_SIZE]);
 
 /*
 ** render_sprite.c
 */
 
-void	render_update_sprite(t_state *state);
+void						render_update_sprite(t_state *state);
 
 /*
 ** sprite_sort.c
 */
 
-void			sprite_sort(t_state *state);
+void						sprite_sort(t_state *state);
 
 #endif