feat: add window management and read file function

Author: lareii

Makefile

@@ -3,24 +3,22 @@ NAME			= fdf
 INC_DIR			= inc
 LIB_DIR			= lib
 LIBFT_DIR		= $(LIB_DIR)/libft
-GNL_DIR			= $(LIB_DIR)/get_next_line
 MLX_DIR			= $(LIB_DIR)/minilibx
 LIBFT			= $(LIBFT_DIR)/libft.a
-GNL				= $(GNL_DIR)/libgnl.a
 MLX				= $(MLX_DIR)/libmlx.a
 BUILD_DIR		= build
 
-SRCS			= fdf.c
+SRCS			= fdf.c window_management.c read_map.c
 OBJS			= $(addprefix $(BUILD_DIR)/,$(SRCS:.c=.o))
-CFLAGS			= -Wall -Wextra -Werror -I$(INC_DIR) -I$(LIBFT_DIR) -I$(GNL_DIR) -I$(MLX_DIR)
-LDFLAGS			= -L$(LIBFT_DIR) -L$(GNL_DIR) -L$(MLX_DIR)
-LDLIBS			= -lmlx -lft -lgnl -lXext -lX11 -lm
+CFLAGS			= -Wall -Wextra -Werror -I$(INC_DIR) -I$(LIBFT_DIR) -I$(MLX_DIR)
+LDFLAGS			= -L$(LIBFT_DIR) -L$(MLX_DIR)
+LDLIBS			= -lmlx -lft -lXext -lX11 -lm
 
 RM				= rm -rf
 
 all: $(NAME)
 
-$(NAME): $(OBJS) $(LIBFT) $(MLX) $(GNL)
+$(NAME): $(OBJS) $(LIBFT) $(MLX)
 	$(CC) $(CFLAGS) $(OBJS) -o $(NAME) $(LDFLAGS) $(LDLIBS)
 
 $(BUILD_DIR):
@@ -32,22 +30,17 @@ $(BUILD_DIR)/%.o: %.c | $(BUILD_DIR)
 $(LIBFT):
 	@make -C $(LIBFT_DIR)
 
-$(GNL):
-	@make -C $(GNL_DIR)
-
 $(MLX):
 	@make -C $(MLX_DIR)
 
 clean:
 	$(RM) $(BUILD_DIR)
 	@make -C $(LIBFT_DIR) clean
-	@make -C $(GNL_DIR) clean
 	@make -C $(MLX_DIR) clean
 
 fclean: clean
 	$(RM) $(NAME)
 	@make -C $(LIBFT_DIR) fclean
-	@make -C $(GNL_DIR) fclean
 
 re:	fclean all
 

fdf.c

@@ -6,18 +6,25 @@
 /*   By: ebabaogl <[email protected]    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/02 11:39:32 by ebabaogl          #+#    #+#             */
-/*   Updated: 2025/01/02 11:58:41 by ebabaogl         ###   ########.fr       */
+/*   Updated: 2025/01/02 16:47:26 by ebabaogl         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "mlx.h"
 #include "fdf.h"
+#include "window.h"
+#include "libft.h"
 
+#include <stdio.h>
+#include <stdlib.h>
 int	main()
 {
-	t_data	data;
+	//t_vars	vars;
+	//t_mlx	mlx;
 
-	data.mlx_ptr = mlx_init();
-	data.win_ptr = mlx_new_window(data.mlx_ptr, WIDTH, HEIGHT, "FdF!!1!!!1");
-	mlx_loop(data.mlx_ptr);
+	char	*map = read_file("test_maps/42.fdf");
+	printf("%s", map);
+	free(map);
+	//vars.mlx = &mlx;
+	//if (init_win(vars.mlx) == -1)
+	return (1);
 }

inc/fdf.h

@@ -6,20 +6,31 @@
 /*   By: ebabaogl <[email protected]    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/02 11:39:37 by ebabaogl          #+#    #+#             */
-/*   Updated: 2025/01/02 12:15:22 by ebabaogl         ###   ########.fr       */
+/*   Updated: 2025/01/02 16:21:30 by ebabaogl         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef FDF_H
 # define FDF_H
 
-# define WIDTH 1920
-# define HEIGHT 1080
+#define BUFFER_SIZE 30
 
-typedef struct	s_data
+# include "window.h"
+
+typedef struct	s_vars
+{
+	t_mlx		*mlx;
+}				t_vars;
+
+typedef struct	s_point
 {
-	void	*mlx_ptr;
-	void	*win_ptr;
-}				t_data;
+	int		x;
+	int		y;
+	int		z;
+	int		color;
+}				t_point;
+
+char	*read_file(char *file_name);
+int		init_win(t_mlx *mlx);
 
 #endif

lib/get_next_line/get_next_line.h inc/window.h

@@ -1,30 +1,39 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   get_next_line.h                                    :+:      :+:    :+:   */
+/*   window.h                                           :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: ebabaogl <[email protected]    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2024/11/03 11:09:46 by ebabaogl          #+#    #+#             */
-/*   Updated: 2024/11/03 14:40:10 by ebabaogl         ###   ########.fr       */
+/*   Created: 2025/01/02 13:34:08 by ebabaogl          #+#    #+#             */
+/*   Updated: 2025/01/02 15:12:21 by ebabaogl         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#ifndef GET_NEXT_LINE_H
-# define GET_NEXT_LINE_H
+#ifndef WINDOW_H
+# define WINDOW_H
 
-# ifndef BUFFER_SIZE
-#  define BUFFER_SIZE 5
-# endif
+# define WIN_WIDTH 1920
+# define WIN_HEIGHT 1080
 
-# include <stddef.h>
+# define ON_DESTROY 17
 
-char	*get_next_line(int fd);
+# define ESC_KEY 65307
 
-size_t	ft_strlen(char *s);
-void	*ft_memset(void *b, int c, size_t len);
-void	*ft_calloc(size_t count, size_t size);
-char	*ft_strchr(char *s, int c);
-char	*ft_strjoin(char *s1, char *s2);
+// enum {
+// 	ON_KEYDOWN = 2,
+// 	ON_KEYUP = 3,
+// 	ON_MOUSEDOWN = 4,
+// 	ON_MOUSEUP = 5,
+// 	ON_MOUSEMOVE = 6,
+// 	ON_EXPOSE = 12,
+// 	ON_DESTROY = 17
+// };
 
-#endif
+typedef struct	s_mlx
+{
+	void	*mlx_ptr;
+	void	*win_ptr;
+}				t_mlx;
+
+#endif