add bonus and mandatory rules

Author: MVPee

Makefile

@@ -1,23 +1,35 @@
 NAME = cub3D
 
-LIBFT = srcs/libft
+LIBFT = libft
 LIBMLX = ./MLX42/build/libmlx42.a 
 
 OBJS_DIR = .objs
-SRCS = 	main.c \
-		srcs/cub3d/init_and_unit/init_and_unit.c \
-		srcs/cub3d/parsing/check_file.c \
-		srcs/cub3d/parsing/check_map.c \
-		srcs/cub3d/window_and_event/window.c \
-		srcs/cub3d/window_and_event/event_hooks.c \
-		srcs/cub3d/utils/utils.c \
-		srcs/cub3d/rendering/raycasting/raycasting.c \
-		srcs/cub3d/rendering/raycasting/raycasting_utils.c \
-		srcs/cub3d/rendering/minimap/minimap.c \
-		srcs/cub3d/rendering/minimap/minimap_utils.c
+SRCS = 	mandatory/main.c \
+		mandatory/srcs/cub3d/init_and_unit/init_and_unit.c \
+		mandatory/srcs/cub3d/parsing/check_file.c \
+		mandatory/srcs/cub3d/parsing/check_map.c \
+		mandatory/srcs/cub3d/window_and_event/window.c \
+		mandatory/srcs/cub3d/window_and_event/event_hooks.c \
+		mandatory/srcs/cub3d/utils/utils.c \
+		mandatory/srcs/cub3d/rendering/raycasting/raycasting.c \
+		mandatory/srcs/cub3d/rendering/raycasting/raycasting_utils.c \
+		mandatory/srcs/cub3d/rendering/minimap/minimap.c \
+		mandatory/srcs/cub3d/rendering/minimap/minimap_utils.c
+
+# SRCS_BONUS = 	bonus/main.c \
+# 				bonus/srcs/cub3d/init_and_unit/init_and_unit.c \
+# 				bonus/srcs/cub3d/parsing/check_file.c \
+# 				bonus/srcs/cub3d/parsing/check_map.c \
+# 				bonus/srcs/cub3d/window_and_event/window.c \
+# 				bonus/srcs/cub3d/window_and_event/event_hooks.c \
+# 				bonus/srcs/cub3d/utils/utils.c \
+# 				bonus/srcs/cub3d/rendering/raycasting/raycasting.c \
+# 				bonus/srcs/cub3d/rendering/raycasting/raycasting_utils.c \
+# 				bonus/srcs/cub3d/rendering/minimap/minimap.c \
+# 				bonus/srcs/cub3d/rendering/minimap/minimap_utils.c
 
 OBJS = $(addprefix $(OBJS_DIR)/, $(SRCS:%.c=%.o))
-
+OBJS_BONUS = $(addprefix $(OBJS_DIR)/, $(SRCS_BONUS:%.c=%.o))
 
 OS = $(shell uname)
 FLAG_OPTI = -Ofast -ffast-math -O3
@@ -32,10 +44,6 @@ endif
 
 CFLAGS = -I $(LIBFT) -Wall -Werror -Wextra -g -ggdb3 -fsanitize=address 
 LDFLAGS = -lft -L $(LIBFT) -Wall -Werror -Wextra -g -ggdb3 -fsanitize=address
-FLAG = $(LIBMLX) -Iinclude
-LINUXFLAG2 = -lglfw -lm -lGL $(FLAG_OPTI)
-MACOSFLAG = -L "/Users/$(USER)/.brew/opt/glfw/lib/" -lglfw -lm -O3 -Ofast -ffast-math -framework Cocoa -framework OpenGL -framework IOKit $(FLAG_OPTI)
-FLAG_OPTI = -Ofast -ffast-math -O3
 
 RED=\033[0;31m
 GREEN=\033[0;32m
@@ -56,6 +64,21 @@ $(OBJS_DIR)/%.o: %.c | $(OBJS_DIR)
 $(OBJS_DIR):
 	mkdir -p $(dir $(OBJS))
 
+# bonus: $(NAME)
+
+# $(LIBFT)/libft.a:
+# 	$(MAKE) -C $(LIBFT)
+
+# $(NAME): $(OBJS_BONUS) $(LIBFT)/libft.a
+# 	@gcc $(OBJS_BONUS) $(LDFLAGS) $(FLAG) $(PROJECT_FLAGS) -o $(NAME)
+# 	@echo   "${GREEN}./${NAME} ${RED}map${NC}"
+
+# $(OBJS_DIR)/%.o: %.c | $(OBJS_DIR)
+# 	@gcc $(CFLAGS) $(FLAG_OPTI) $ -c $< -o $@
+
+# $(OBJS_DIR):
+# 	mkdir -p $(dir $(OBJS_BONUS))
+
 clean:
 	$(MAKE) -C $(LIBFT) clean
 	@rm -rf $(OBJS_DIR)
@@ -67,6 +90,6 @@ fclean: clean
 re: fclean all
 
 run: all
-	./$(NAME) maps/cub.cub
+	./$(NAME) rsrcs/maps/cub.cub
 
 .PHONY: all clean fclean re run

includes/cub3d.h bonus/includes/cub3d.h

@@ -14,7 +14,7 @@
 # define CUB3D_H
 
 # include "../MLX42/include/MLX42/MLX42.h"
-# include "../srcs/libft/includes/libft.h"
+# include "../libft/includes/libft.h"
 # include "macros.h"
 # include <errno.h>
 # include <limits.h>

includes/macros.h bonus/includes/macros.h

@@ -0,0 +1,145 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   cub3d.h                                            :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: mvpee <[email protected]>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/24 10:38:12 by mvpee             #+#    #+#             */
+/*   Updated: 2024/06/24 10:38:12 by mvpee            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef CUB3D_H
+# define CUB3D_H
+
+# include "../MLX42/include/MLX42/MLX42.h"
+# include "../libft/includes/libft.h"
+# include "macros.h"
+# include <errno.h>
+# include <limits.h>
+# include <math.h>
+# include <stdbool.h>
+# include <stdio.h>
+
+typedef mlx_image_t		t_img;
+typedef mlx_key_data_t	t_mlx_key;
+
+typedef enum e_move
+{
+	GO_RIGHT,
+	GO_LEFT,
+	GO_UP,
+	GO_DOWN,
+	ROTATE_LEFT,
+	ROTATE_RIGHT
+}	t_move;
+
+typedef struct s_player_pos
+{
+	double	x;
+	double	y;
+	int		angle;
+}	t_player_pos;
+
+// RAYCAST STRUCTURES
+typedef struct s_distance
+{
+	float	x;
+	float	y;
+	float	angle_rad;
+	float	step_x;
+	float	step_y;
+	int		prev_x;
+	int		prev_y;
+	float	distance;
+}	t_distance;
+
+typedef struct s_raycast
+{
+	float		distance;
+	float		rotation;
+	float		wall_height;
+	int			texture_x;
+	int			texture_y;
+	float		hit_x;
+	float		hit_y;
+	float		hit_pos;
+	int			color;
+	int			x;
+	int			y;
+	mlx_image_t	*wall_img;
+}	t_raycast;
+
+typedef struct s_minimap
+{
+	t_img	*image;
+	int		**map_input;
+	int		**map_output;
+	int		black;
+	int		white;
+	int		transparent;
+	int		transparent_black;
+	int		transparent_white;
+	int		x_adjust;
+	int		y_adjust;
+	int		map_x;
+	int		map_y;
+}	t_minimap;
+
+typedef struct s_data
+{
+	t_img			*north_image;
+	t_img			*south_image;
+	t_img			*west_image;
+	t_img			*east_image;
+	int				floor_color;
+	int				ceiling_color;
+	char			**file;
+	char			**map;
+	size_t			map_width;
+	size_t			map_height;
+	char			wall_dir;
+	mlx_t			*mlx;
+	t_img			*floor_image;
+	t_img			*ceiling_image;
+	t_img			*image;
+	t_player_pos	*player;
+	t_minimap		*minimap;
+	bool			*keys;
+}	t_data;
+
+// PARSING
+bool	check_extension(char *str);
+bool	check_file(t_data *data);
+bool	check_map(char ***map);
+
+// GRAPHICS
+int		game_loop(t_data *data);
+
+// KEY_HOOKS
+void	move_keyhook(void *param);
+
+// UTILS
+int		get_rgba(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
+void	get_player_pos(t_data *data);
+void	get_map_size(t_data *data);
+int		get_correct_color(u_int8_t *pixel);
+
+// RAYCASTING
+void	raycasting(t_data *data);
+
+// MINIMAP
+void	minimap(t_data *data);
+bool	is_in_circle(int x, int y);
+void	draw_square(t_minimap *minimap, int x, int y, char c);
+void	get_adjust_coord(t_data *data);
+void	map_init(t_data *data);
+
+// RAYCASTING UTILS
+float	get_distance(t_data *data, float rotation, float *hit_x, float *hit_y);
+
+// INIT AND UNIT
+bool	init_data(t_data *data);
+void	free_data(t_data *data);
+#endif

main.c bonus/main.c

@@ -0,0 +1,69 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   macros.h                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: mvpee <[email protected]>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/06 13:08:32 by nechaara          #+#    #+#             */
+/*   Updated: 2024/06/26 15:59:30 by mvpee            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef MACROS_H
+# define MACROS_H
+
+// MACROS
+# define PROGRAM_NAME "CUB3D"
+
+// ERROR
+# define WIN_INIT_FAILED "Windows initialization failed, check MLX\n"
+# define INVALID_MAP "Error\nInvalid map in y: %d x:%d c:'%c'\n"
+# define INVALID_BORDER "Error\nBad Border\n"
+# define WRONG_PLAYER_COUNT "Error\nWrong player count\n"
+# define NUMBERS_OF_ARGUMENTS "Error\nNumber of argument(s)\n"
+// COLOR
+# define RED     "\x1b[31m"
+# define GREEN   "\x1b[32m"
+# define BLUE    "\x1b[34m"
+# define BLACK   "\x1b[30m"
+# define WHITE   "\x1b[37m"
+# define PINK    "\x1b[35m"
+# define YELLOW  "\x1b[33m"
+# define BROWN   "\x1b[33m"
+# define ORANGE  "\x1b[33m"
+# define PURPLE  "\x1b[35m"
+# define GRAY    "\x1b[90m"
+# define LIGHTGRAY "\x1b[37m"
+# define DARKGRAY  "\x1b[90m"
+# define RESET   "\x1b[0m"
+
+// MOVEMENT MACROS
+# define RADIANT 0.0174533
+# define PIXEL 128
+# define SPEED 8
+# define SPEED_ROTATION 5
+# define DEGREE 0.0833333333333333
+# define FOV 60
+# define F_PI 57.2957795131
+
+// RESOLUTION
+# define WIDTH 1080
+# define HEIGHT 720
+
+// MINIMAP
+# define MINIMAP_SIZE 200
+# define WALL_SIZE 20
+# define PLAYER_SIZE 10
+
+// KEY
+# define MLX_KEY_Z 87
+# define MLX_KEY_S 83
+# define MLX_KEY_Q 65
+# define MLX_KEY_D 68
+# define MLX_KEY_RIGHT 262
+# define MLX_KEY_LEFT 263
+# define MLX_KEY_ESCAPE 256
+# define MLX_KEY_SHIFT 340
+
+#endif

srcs/cub3d/init_and_unit/init_and_unit.c bonus/srcs/cub3d/init_and_unit/init_and_unit.c

@@ -0,0 +1,41 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   main.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: mvpee <[email protected]>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/11 09:16:29 by mvpee             #+#    #+#             */
+/*   Updated: 2024/06/11 09:16:29 by mvpee            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "includes/cub3d.h"
+
+int	main(int ac, char **av)
+{
+	t_data	data;
+	char	*temp;
+
+	temp = NULL;
+	if (ac != 2)
+		return (ft_printf_fd(2, RED NUMBERS_OF_ARGUMENTS RESET), 1);
+	if (init_data(&data))
+		return (ft_printf_fd(2, RED WIN_INIT_FAILED RESET), 1);
+	if (check_extension(av[1]))
+		return (free_data(&data), 1);
+	temp = ft_read(open(av[1], O_RDONLY));
+	data.file = ft_split(temp, "\n");
+	if (!data.file)
+		return (ft_free(1, &temp), free_data(&data), 1);
+	ft_free(1, &temp);
+	if (check_file(&data))
+		return (free_data(&data), 1);
+	if (check_map(&data.map))
+		return (free_data(&data), 1);
+	get_map_size(&data);
+	get_player_pos(&data);
+	if (game_loop(&data))
+		return (free_data(&data), 1);
+	return (free_data(&data), 0);
+}