Feature map validation 😈

.gitignore

@@ -1,6 +1,11 @@
-# debug
+.ignore
+
+# debugger
 .vscode
 
+# end-to-end tests
+tests/logs/
+
 # Prerequisites
 *.d
 

Makefile

@@ -3,8 +3,7 @@ NAME	= cub3D
 CC				=	gcc
 CFLAGS			=	-g -Wall -Werror -Wextra
 RM				=	rm -f
-VALGRIND		=	valgrind --leak-check=full --show-leak-kinds=all \
-						--track-origins=yes -q --tool=memcheck
+VALGRIND		=	valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -q --tool=memcheck
 INCLUDES_DIR	=	./includes ./libs/libft ./libs/minilibx-linux
 SRC_DIR			=	./src
 OBJ_DIR			=	./obj
@@ -21,16 +20,24 @@ WINDOW_PATH		= window/
 DESTROY_PATH	= destroy/
 KEYSTROKES_PATH = keystrokes/
 
-SRCS			=	cub3D.c							\
-					error_handling.c				\
-					init_data.c						\
-					input_validation_utils.c		\
-					input_validation.c				\
-					map_params_checks.c				\
-					params_utils.c					\
-					$(WINDOW_PATH)window.c			\
-					$(DESTROY_PATH)destroy.c		\
-					$(KEYSTROKES_PATH)keystrokes.c	\
+SRCS			=	cub3D.c								\
+					error_handling.c					\
+					free_memory.c						\
+					init_data.c							\
+					input_validation_utils.c			\
+					input_validation.c					\
+					map_padding.c						\
+					map_params_checks.c					\
+					map_utils.c							\
+					map_validation.c					\
+					map_validation_player_position.c	\
+					map_validation_utils.c				\
+					params_utils.c						\
+					t_position_utils.c					\
+					tests_debug.c						\
+					$(WINDOW_PATH)window.c				\
+					$(DESTROY_PATH)destroy.c			\
+					$(KEYSTROKES_PATH)keystrokes.c		\
 
 OBJS			:=	$(addprefix $(OBJ_DIR)/,$(SRCS:.c=.o))
 SRCS			:=	$(addprefix $(SRC_DIR)/,$(SRCS))

assets/maps/exo.cub

@@ -0,0 +1,16 @@
+NO ./assets/textures/north_texture.xpm
+SO ./assets/textures/south_texture.xpm
+EA ./assets/textures/east_texture.xpm
+WE ./assets/textures/west_texture.xpm
+F 42, 55, 57
+C 255, 255, 255
+
+   1111111            11111    11111111111111    11111
+   1000001            10001    10000000000001    10001    111111111
+  1100000111        1110001    10000000000001    10001    100000001
+11100000000111    11100000111111000011110000111111000111  100000E01
+1000000000000111111000000000000000001  100000000000000011 100000001
+1111111111100000000000000000000000001  1000000000000000011100000001
+          111110000011111111111111111  1111111111111110000000011111
+              1000001                                1001111111
+              1111111                                1111

includes/cub3D.h

@@ -6,7 +6,7 @@
 /*   By: gusalves <gusalves@student.42sp.org.br>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/20 11:52:42 by gusalves          #+#    #+#             */
-/*   Updated: 2022/09/27 12:25:49 by roaraujo         ###   ########.fr       */
+/*   Updated: 2022/11/07 18:32:04 by roaraujo         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,13 +28,19 @@
 # include <stdbool.h>			// bool type
 
 // ------------------------------------------------		MACROS		-----------
-
-# define KEY_ESC	65307		// ESC keycode
-# define IMG_TEST			"./img/blueMacaw.xpm"
+# define KEY_ESC		65307		// ESC keycode
+# define VALID_CHARS	"10 NSEW"	// valid map chars
+# define STARTING_CHARS	"NSEW"		// valid starting position chars
 
 // ------------------------------------------------		STRUCTS		-----------
 
-typedef struct s_mlx_img
+typedef struct s_position
+{
+	int		line;
+	int		column;
+}		t_position;
+
+typedef struct s_mlx_struct
 {
 	void	*pointer;
 	char	*addr;
@@ -50,71 +56,122 @@ typedef struct s_mlx_struct
 	t_mlx_img	*img;
 }				t_mlx_struct;
 
-typedef struct s_map_parameters
+typedef struct s_data
 {
-	int		fds[4];
-	int		colours[2][3];
-	int		params_count;
-	char	*line;
-}		t_map_parameters;
+	int			input_fd;
+	int			texture_fds[4];
+	int			colours[2][3];
+	int			params_count;
+	char		*line;
+	char		**map;
+	char		**map_copy_for_debug;
+	t_position	starting_position;
+}		t_data;
 
 // ------------------------------------------------		ENUMS		-----------
 
-enum e_colours {ceiling, floor};
+enum e_colours {
+	CEILING,
+	FLOOR
+};
+
 enum e_directions {
 	NO,
 	SO,
 	EA,
 	WE
 };
+
+enum e_ups_and_downs {
+	UP,
+	DOWN
+};
+
 enum e_err_codes {
 	SYSCALL_ERROR,
 	WRONG_ARGS_NO,
 	FILE_EXTENSION_ERROR,
 	INVALID_TEXTURE_PARAMS,
 	MISSING_PARAMETER,
 	REDUNDANT_PARAMETER_FOUND,
-	INVALID_COLOUR_PARAM
+	INVALID_COLOUR_PARAM,
+	INVALID_MAP,
+	MEMORY_ALLOCATION,
+	INVALID_CHAR_FOUND,
+	INVALID_MAP_SIZE,
+	STARTING_POS_ERROR,
+	MULTIPLE_POS_CHARS_FOUND,
+	PLAYER_OFF_MAP
 };
 
 // ------------------------------------------------		PROTOTYPES	-----------
+// tests_debug ********** APAGAR DPS ***************
+void		debug_print_map_read(char **map);
+void		debug_copy_map(t_data *data);
+
 // error_handling.c
-void	print_err_exit(int errcode, t_map_parameters *map_params);
+void		print_err_exit(int errcode, t_data *data);
 
 // init_data.c
-void	init_map_parameters(t_map_parameters *map_parameters);
+void		init_data(t_data *data);
 
 // input_validation_utils.c
-char	*get_next_line_trimmed(int input_fd);
-int		jump_spaces(const char *str);
-int		convert_colour_to_int(char *colour, t_map_parameters *map_params);
+char		*get_next_line_trimmed(int input_fd);
+int			jump_spaces(const char *str);
+int			convert_colour_to_int(char *colour, t_data *data);
 
 // input_validation.c
-void	validate_args(int argc, char *argv[], int *input_fd,
-			t_map_parameters *map_params);
-void	validate_input_file(int fd, t_map_parameters *map_params);
+void		validate_args(int argc, char *argv[], t_data *data);
+void		validate_input_file(t_data *data);
 
 // window.c
-void	window(t_mlx_struct *mlx);
+void		window(t_mlx_struct *mlx);
 
 // destroy.c
-int		destroy(t_mlx_struct *mlx);
+int			destroy(t_mlx_struct *mlx);
+
+// free_memory.c
+void		free_data(t_data *data);
 
 // key_press.c
-int		keystrokes_management(int keycode, t_mlx_struct *mlx);
+int			keystrokes_management(int keycode, t_mlx_struct *mlx);
+
+// map_padding.c
+void		pad_map(t_data *data);
 
 // map_params_checks.c
-void	check_for_valid_path(t_map_parameters *map_params);
-void	check_duplicate_parameter(t_map_parameters *map_params);
-void	check_colour_params_count(char **colours_array,
-			t_map_parameters *map_params);
-void	check_for_valid_colour(t_map_parameters *map_params);
+void		check_for_valid_path(t_data *data);
+void		check_duplicate_parameter(t_data *data);
+void		check_colour_params_count(char **colours_array, t_data *data);
+void		check_for_valid_colour(t_data *data);
+
+// map_utils.c
+int			find_longest_line_length(char **map);
+
+// map_validation.c
+void		validate_map(t_data *data);
+
+// map_validation_utils.c
+bool		try_to_move_in_direction(t_position next_move, t_position *prev_pos,
+				t_position *next_pos, t_data *data);
+void		decide_where_to_go_next(t_data *data, t_position *prev_pos,
+				t_position curr_pos, t_position *next_pos);
+void		find_starting_point(t_position *starting_point, t_data *data);
+
+// map_validation_player_position.c
+void		check_player_position(t_data *data);
 
 // params_utils.c
-bool	is_direction_identifier(char identifier[2]);
-int		get_direction_index(char d);
-int		get_colour_index(char c);
-bool	is_valid_parameter_char(char c);
-bool	has_valid_param_identifier(char *str);
+bool		is_direction_identifier(char identifier[2]);
+int			get_direction_index(char d);
+int			get_colour_index(char c);
+bool		is_valid_parameter_char(char c);
+bool		has_valid_param_identifier(char *str);
+
+// t_position_utils.c
+t_position	t_position_create_tuple(int line, int column);
+bool		t_position_compare(t_position a, t_position b);
+bool		t_position_compare_ptr(t_position *a, t_position *b);
+void		t_position_copy(t_position *destination, const t_position source);
 
 #endif

libs/libft/Makefile

@@ -20,6 +20,7 @@ SOURCES			+=	ft_strdup.c ft_striteri.c ft_strjoin.c ft_strlcat.c
 SOURCES			+=	ft_strlcpy.c ft_strlen.c ft_strmapi.c ft_strncmp.c
 SOURCES			+=	ft_strnstr.c ft_strrchr.c ft_strtrim.c ft_substr.c
 SOURCES			+=	ft_tolower.c ft_toupper.c get_next_line.c ft_free_ptr.c
+SOURCES			+=	ft_free_arr.c ft_charjoin.c ft_matrixlen.c ft_alloc_string.c
 
 SOURCES_BONUS	=	ft_lstnew.c ft_lstadd_front.c ft_lstsize.c ft_lstlast.c
 SOURCES_BONUS	+=	ft_lstadd_back.c ft_lstdelone.c ft_lstclear.c

libs/libft/ft_alloc_string.c

@@ -0,0 +1,32 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_alloc_string.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: roaraujo <roaraujo@student.42sp.org.br>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/10/31 06:00:39 by roaraujo          #+#    #+#             */
+/*   Updated: 2022/10/31 06:00:46 by roaraujo         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+char	*ft_alloc_string(int str_size, int init_value)
+/**
+ * @brief allocates `str_size` bytes for a string, appends a terminating '\0',
+ * and initialises every byte in the string to `init_value`.
+ */
+{
+	char	*str;
+	int		i;
+
+	str = malloc((str_size + 1) * sizeof(char));
+	if (!str)
+		return (NULL);
+	i = -1;
+	while (++i < str_size)
+		str[i] = init_value;
+	str[i] = '\0';
+	return (str);
+}

libs/libft/ft_charjoin.c

@@ -0,0 +1,32 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_charjoin.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: roaraujo <roaraujo@student.42sp.org.br>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/09/29 22:11:10 by roaraujo          #+#    #+#             */
+/*   Updated: 2022/09/29 22:13:26 by roaraujo         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+char	*ft_charjoin(const char* str, const char c)
+{
+	int	i;
+	char *joined_str;
+
+	if (!str)
+		return (NULL);
+	joined_str = malloc((ft_strlen(str) + 1 + 1) * sizeof(char));
+	if (!joined_str)
+		return (NULL);
+	i = -1;
+	while (str[++i])
+		joined_str[i] = str[i];
+	joined_str[i] = c;
+	joined_str[++i] = '\0';
+	ft_free_ptr((void *)&str);
+	return (joined_str);
+}

libs/libft/ft_free_arr.c

@@ -0,0 +1,29 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_free_arr.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: roaraujo <roaraujo@student.42sp.org.br>    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/09/29 21:45:12 by roaraujo          #+#    #+#             */
+/*   Updated: 2022/09/29 21:45:14 by roaraujo         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void	ft_free_arr(void ***arr)
+{
+	int	i;
+
+	i = -1;
+	if (*arr != NULL)
+	{
+		while ((*arr)[++i])
+		{
+			ft_free_ptr((void *)&(*arr)[i]);
+			(*arr)[i] = NULL;
+		}
+		free(*arr);
+	}
+}