Merge pull request #3 from lareii/rewrite

rewrite.

Author: lareii

.gitignore

@@ -52,4 +52,7 @@ Mkfile.old
 dkms.conf
 
 # Editor settings
-.vscode/
+.vscode/
+
+# Directories
+build/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/minilibx-linux"]
+	path = lib/minilibx-linux
+	url = https://github.com/42Paris/minilibx-linux.git

Makefile

@@ -1,53 +1,61 @@
-NAME			= fdf
-
-INC_DIR			= inc
-LIB_DIR			= lib
-LIBFT_DIR		= $(LIB_DIR)/libft
-MLX_DIR			= $(LIB_DIR)/minilibx
-LIBFT			= $(LIBFT_DIR)/libft.a
-MLX				= $(MLX_DIR)/libmlx.a
-BUILD_DIR		= build
-
-SRCS			= fdf.c window_management.c read_map.c libft_extra.c point_utils.c
-OBJS			= $(addprefix $(BUILD_DIR)/,$(SRCS:.c=.o))
-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
+NAME		= fdf
+NAME_BONUS	= fdf_bonus
+
+INC_DIR		= inc
+LIB_DIR		= lib
+SRC_DIR		= src
+BUILD_DIR	= build
+
+LIBFT_DIR	= $(LIB_DIR)/libft
+MLX_DIR		= $(LIB_DIR)/minilibx-linux
+LIBFT		= $(LIBFT_DIR)/libft.a
+MLX			= $(MLX_DIR)/libmlx.a
+
+VPATH		= src:src/map:src/render:src/window
+SRCS		= fdf.c utils.c \
+			init_map.c parse_map.c read_map.c \
+			init_renderer.c render_map.c render_utils.c transformations.c \
+			init_win.c win_hooks.c win_utils.c
+BONUS_SRCS	= $(SRCS:.c=_bonus.c)
+OBJS		= $(addprefix $(BUILD_DIR)/,$(SRCS:.c=.o))
+BONUS_OBJS	= $(addprefix $(BUILD_DIR)/,$(BONUS_SRCS:.c=.o))
+
+CFLAGS		= -Wall -Wextra -Werror -I$(INC_DIR) -I$(LIBFT_DIR) -I$(MLX_DIR)
+LDFLAGS		= -L$(LIBFT_DIR) -L$(MLX_DIR)
+LDLIBS		= -lm -lmlx -lft -lX11 -lXext
+RM			= rm -rf
 
 all: $(NAME)
 
-debug: $(OBJS) $(LIBFT) $(MLX)
-	$(CC) -g $(CFLAGS) $(OBJS) -o $(NAME) $(LDFLAGS) $(LDLIBS)
-
-$(NAME): $(OBJS) $(LIBFT) $(MLX)
-	$(CC) $(CFLAGS) $(OBJS) -o $(NAME) $(LDFLAGS) $(LDLIBS)
+$(LIBFT):
+	@make -C $(LIBFT_DIR)
 
-%o: %c
-	$(CC) -g $(CFLAGS) -c $< -o $@
+$(MLX):
+	@make -C $(MLX_DIR)
 
 $(BUILD_DIR):
 	mkdir -p $@
 
 $(BUILD_DIR)/%.o: %.c | $(BUILD_DIR)
 	$(CC) $(CFLAGS) -c $^ -o $@
 
-$(LIBFT):
-	@make -C $(LIBFT_DIR)
+$(NAME): $(OBJS) $(LIBFT) $(MLX)
+	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS) -o $(NAME)
 
-$(MLX):
-	@make -C $(MLX_DIR)
+$(NAME_BONUS): $(BONUS_OBJS) $(LIBFT) $(MLX)
+	$(CC) $(CFLAGS) $(BONUS_OBJS) $(LDFLAGS) $(LDLIBS) -o $(NAME_BONUS)
+
+bonus: $(NAME_BONUS)
 
 clean:
 	$(RM) $(BUILD_DIR)
 	@make -C $(LIBFT_DIR) clean
 	@make -C $(MLX_DIR) clean
 
 fclean: clean
-	$(RM) $(NAME)
+	$(RM) $(NAME) $(NAME_BONUS)
 	@make -C $(LIBFT_DIR) fclean
 
-re:	fclean all
+re: fclean all
 
-.PHONY: all clean fclean re
+.PHONY: all bonus clean fclean re

draw_line.c

@@ -3,55 +3,79 @@
 /*                                                        :::      ::::::::   */
 /*   fdf.h                                              :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: obastug <obastug@student.42.fr>            +#+  +:+       +#+        */
+/*   By: ebabaogl <ebabaogl@student.42kocaeli.co    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/01/02 11:39:37 by ebabaogl          #+#    #+#             */
-/*   Updated: 2025/01/07 12:47:31 by obastug          ###   ########.fr       */
+/*   Created: 2025/01/12 22:28:32 by ebabaogl          #+#    #+#             */
+/*   Updated: 2025/01/14 00:28:20 by ebabaogl         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef FDF_H
 # define FDF_H
 
-#define BUFFER_SIZE 30
-#define COLOR_MASK 4294967295U
-#define DEFAULT_COLOR 0x00FFFFFF
+# include "window.h"
+# include <stddef.h>
 
-#include "window.h"
-#include <stddef.h>
+# define BUFFER_SIZE 99999
 
+# define COLOR_MASK 4294967295U
+# define LINE_COLOR 0x00D4D4D8
+# define BG_COLOR 0x0009090B
 
-typedef struct	s_vars
+typedef struct s_vars
 {
 	t_mlx			*mlx;
+
 	unsigned long	**map;
-	int				height;
+	int				col_size;
+	int				row_size;
+
+	int				anchor_x;
+	int				anchor_y;
 	int				map_x;
 	int				map_y;
-	int				w_coef;
-	int				s_coef;
-	int				a_coef;
-	int				d_coef;
+
 	double			distance;
-	int				line_count;
-	int				line_len;
-	int				anchor_x;
-	int				anchor_y;
+	double			height;
+	double			zoom;
+	double			x_y_coef;
+	double			y_z_coef;
+	double			z_x_coef;
 }	t_vars;
 
-char			*read_file(char *file_name);
-int				init_win(t_mlx *mlx);
-unsigned int	ft_atoi_hex(char *str);
-unsigned long	point_to_ulong(char *point);
-unsigned long	**map_string_to_arr_2d(char *whole_file);
-size_t			ft_ptrarrlen(unsigned long	*arr);
+typedef struct s_point
+{
+	int	x;
+	int	y;
+	int	z;
+}	t_point;
 
-unsigned long	get_color(unsigned long);
-unsigned long	get_z(unsigned long point);
+int				init_map(t_vars *vars, char *filename);
+char			*get_raw_map(char *filename);
+unsigned long	**split_raw_map(char *raw_map);
 
+void			init_renderer(t_vars *vars);
 void			render_map(t_vars *vars);
+void			set_camera_props(t_vars *vars);
+void			set_point(t_point *point, int x, int y, int z);
+void			render_point(t_vars *vars, t_point *point);
+void			zoom(t_vars *vars, t_point *point);
+void			translate(t_vars *vars, t_point *point);
+void			rotate_z_x(t_vars *vars, t_point *point);
+void			rotate_y_z(t_vars *vars, t_point *point);
+void			rotate_x_y(t_vars *vars, t_point *point);
+
+void			draw_background(t_vars *vars);
+int				init_win(t_vars *vars);
+void			destroy_win(t_mlx *mlx);
+int				destroy_handler(t_mlx *mlx);
+int				key_handler(int keycode, t_mlx *mlx);
+
+void			free_str_arr(char **arr);
+void			free_ulong_arr(unsigned long **arr);
+unsigned long	get_z(unsigned long point);
+unsigned long	get_color(unsigned long point);
+unsigned int	atoi_hex(char *str);
+int				abs(int n);
 
-int				key_handler(int keycode, void *param);
-int				close_win(void *param);
-void			reset_camera(t_vars *vars);
 #endif