filler

o4eredko · Dec 27, 2018 · ddabfc6 · ddabfc6
1 parent d9c55d5
commit ddabfc6
Show file tree

Hide file tree

Showing 90 changed files with 233,301 additions and 10,758 deletions.
diff --git a/Makefile b/Makefile
@@ -11,43 +11,38 @@
 # **************************************************************************** #
 
 NAME = yochered.filler
+LIBFT = libft.a
+VISUAL = visu_filler
 
-SRC = $(addprefix $(SRCDIR), main.c additional_funcs.c algorithm.c fill_map_layout.c get_description.c)
+SRC = main.c additional_funcs.c algorithm.c fill_map_layout.c get_description.c
+VISUAL_SRC = visu.c windows_funcs.c parse.c print.c
 
-VISUAL_SRC = $(addprefix $(VISUAL_DIR), visu.c windows_funcs.c parse.c print.c)
+VISUAL_OBJ = $(VISUAL_SRC:.c=.o)
+OBJ = $(SRC:.c=.o)
 
 VISUAL_DIR = ./visu/
-
-VISUAL_OBJ = $(VISUAL_SRC:.c =.o)
-
+OBJ_DIR = ./obj/
 SRCDIR = ./src/
 
-OBJ = $(SRC:.c=.o)
-
-LIBFT = libft.a
-
-VISUAL = show_filler
-
 all: $(NAME)
 
-$(NAME): $(OBJ) $(LIBFT)
-	gcc -o $(NAME) $(SRC) -L ./libft/ -lft -I ./includes/
+$(NAME): $(LIBFT) $(addprefix $(OBJ_DIR), $(OBJ))
+	gcc -o $(NAME) $(addprefix $(OBJ_DIR), $(OBJ)) -L ./libft/ -lft -I ./includes/
 
-filler: $(VISUAL_OBJ) $(LIBFT)
-	gcc -o visu_filler $(VISUAL_OBJ) -L ./libft/ -lft -I /usr/local/include -lmlx -framework OpenGL -framework AppKit
+filler: $(LIBFT) $(addprefix $(OBJ_DIR), $(VISUAL_OBJ))
+	gcc -o $(VISUAL) $(addprefix $(OBJ_DIR), $(VISUAL_OBJ)) -L ./libft/ -lft -I /usr/local/include -lmlx -framework OpenGL -framework AppKit
 
-$(addprefix $(SRCDIR), %.o): $(addprefix $(SRCDIR), %.c)
+$(addprefix $(OBJ_DIR), %.o): $(addprefix $(SRCDIR), %.c)
 	gcc -Wall -W -Werror -c -o $@ $< -I ./includes/
 
-$(addprefix $(VISUAL_DIR), %.o): $(addprefix $(VISUAL_DIR), %.c)
-	gcc -Wall -W -Werror -c -o $@ $<
+$(addprefix $(OBJ_DIR), %.o): $(addprefix $(VISUAL_DIR), %.c)
+	gcc -Wall -W -Werror -c -o $@ $< -I ./includes/
 
 $(LIBFT):
-	@make -C ./libft/ --silent
+	make -C ./libft/ --silent
 
 clean:
-	/bin/rm -f $(OBJ)
-	/bin/rm -f visu/*.o
+	/bin/rm -f $(addprefix $(OBJ_DIR), $(OBJ) $(VISUAL_OBJ))
 	make -C ./libft/ clean --silent
 
 fclean: clean

diff --git a/filler.trace b/filler.trace
@@ -1,4 +1,4 @@
-seed = 9889
+seed = 8293
 ./yochered.filler won
 Score:
-157AGAINST197
+2AGAINST2039
diff --git a/includes/filler.h b/includes/filler.h
@@ -21,8 +21,6 @@
 # define MANHATTAN(x1, x2, y1, y2) ((ABS(x2 - x1)) + ABS((y2 - y1)))
 # define X 0
 # define Y 1
-//Delete
-# include <fcntl.h>
 
 typedef struct		s_shape
 {

diff --git a/libft/ft_atoi.o b/libft/ft_atoi.o
diff --git a/libft/ft_bzero.o b/libft/ft_bzero.o
diff --git a/libft/ft_count_digits.o b/libft/ft_count_digits.o
diff --git a/libft/ft_cycle_detector.o b/libft/ft_cycle_detector.o
diff --git a/libft/ft_isalnum.o b/libft/ft_isalnum.o
diff --git a/libft/ft_isalpha.o b/libft/ft_isalpha.o
diff --git a/libft/ft_isascii.o b/libft/ft_isascii.o
diff --git a/libft/ft_isdigit.o b/libft/ft_isdigit.o
diff --git a/libft/ft_isprint.o b/libft/ft_isprint.o
diff --git a/libft/ft_itoa.o b/libft/ft_itoa.o
diff --git a/libft/ft_itoa_base.o b/libft/ft_itoa_base.o
diff --git a/libft/ft_lstadd.o b/libft/ft_lstadd.o
diff --git a/libft/ft_lstdel.o b/libft/ft_lstdel.o
diff --git a/libft/ft_lstdelone.o b/libft/ft_lstdelone.o
diff --git a/libft/ft_lstiter.o b/libft/ft_lstiter.o
diff --git a/libft/ft_lstmap.o b/libft/ft_lstmap.o
diff --git a/libft/ft_lstnew.o b/libft/ft_lstnew.o
diff --git a/libft/ft_lstrev.o b/libft/ft_lstrev.o
diff --git a/libft/ft_memalloc.o b/libft/ft_memalloc.o
diff --git a/libft/ft_memccpy.o b/libft/ft_memccpy.o
diff --git a/libft/ft_memchr.o b/libft/ft_memchr.o
diff --git a/libft/ft_memcmp.o b/libft/ft_memcmp.o
diff --git a/libft/ft_memcpy.o b/libft/ft_memcpy.o
diff --git a/libft/ft_memdel.o b/libft/ft_memdel.o
diff --git a/libft/ft_memmove.o b/libft/ft_memmove.o
diff --git a/libft/ft_memset.o b/libft/ft_memset.o
diff --git a/libft/ft_print_memory.o b/libft/ft_print_memory.o
diff --git a/libft/ft_printf.o b/libft/ft_printf.o
diff --git a/libft/ft_putchar.o b/libft/ft_putchar.o
diff --git a/libft/ft_putchar_fd.o b/libft/ft_putchar_fd.o
diff --git a/libft/ft_putendl.o b/libft/ft_putendl.o
diff --git a/libft/ft_putendl_fd.o b/libft/ft_putendl_fd.o
diff --git a/libft/ft_putnbr.o b/libft/ft_putnbr.o
diff --git a/libft/ft_putnbr_fd.o b/libft/ft_putnbr_fd.o
diff --git a/libft/ft_putstr.o b/libft/ft_putstr.o
diff --git a/libft/ft_putstr_fd.o b/libft/ft_putstr_fd.o
diff --git a/libft/ft_strcat.o b/libft/ft_strcat.o
diff --git a/libft/ft_strchr.o b/libft/ft_strchr.o
diff --git a/libft/ft_strclr.o b/libft/ft_strclr.o
diff --git a/libft/ft_strcmp.o b/libft/ft_strcmp.o
diff --git a/libft/ft_strcpy.o b/libft/ft_strcpy.o
diff --git a/libft/ft_strdel.o b/libft/ft_strdel.o
diff --git a/libft/ft_strdup.o b/libft/ft_strdup.o
diff --git a/libft/ft_strequ.o b/libft/ft_strequ.o
diff --git a/libft/ft_striter.o b/libft/ft_striter.o
diff --git a/libft/ft_striteri.o b/libft/ft_striteri.o
diff --git a/libft/ft_strjoin.o b/libft/ft_strjoin.o
diff --git a/libft/ft_strlcat.o b/libft/ft_strlcat.o
diff --git a/libft/ft_strlen.o b/libft/ft_strlen.o
diff --git a/libft/ft_strmap.o b/libft/ft_strmap.o
diff --git a/libft/ft_strmapi.o b/libft/ft_strmapi.o
diff --git a/libft/ft_strncat.o b/libft/ft_strncat.o
diff --git a/libft/ft_strncmp.o b/libft/ft_strncmp.o
diff --git a/libft/ft_strncpy.o b/libft/ft_strncpy.o
diff --git a/libft/ft_strnequ.o b/libft/ft_strnequ.o
diff --git a/libft/ft_strnew.o b/libft/ft_strnew.o
diff --git a/libft/ft_strnstr.o b/libft/ft_strnstr.o
diff --git a/libft/ft_strrchr.o b/libft/ft_strrchr.o
diff --git a/libft/ft_strsplit.o b/libft/ft_strsplit.o
diff --git a/libft/ft_strstr.o b/libft/ft_strstr.o
diff --git a/libft/ft_strsub.o b/libft/ft_strsub.o
diff --git a/libft/ft_strtrim.o b/libft/ft_strtrim.o
diff --git a/libft/ft_tolower.o b/libft/ft_tolower.o
diff --git a/libft/ft_toupper.o b/libft/ft_toupper.o
diff --git a/libft/get_next_line.o b/libft/get_next_line.o
diff --git a/libft/libft.a b/libft/libft.a
diff --git a/libft/printf_src/allowed_symbols.o b/libft/printf_src/allowed_symbols.o
diff --git a/libft/printf_src/bonus_types.o b/libft/printf_src/bonus_types.o
diff --git a/libft/printf_src/convert_to_str.o b/libft/printf_src/convert_to_str.o
diff --git a/libft/printf_src/function_array.o b/libft/printf_src/function_array.o
diff --git a/libft/printf_src/handlers.o b/libft/printf_src/handlers.o
diff --git a/libft/printf_src/mem_funcs.o b/libft/printf_src/mem_funcs.o
diff --git a/libft/printf_src/print_float.o b/libft/printf_src/print_float.o
diff --git a/libft/printf_src/print_funcs.o b/libft/printf_src/print_funcs.o
diff --git a/libft/printf_src/print_int.o b/libft/printf_src/print_int.o
diff --git a/libft/printf_src/print_pointer.o b/libft/printf_src/print_pointer.o
diff --git a/libft/printf_src/print_str.o b/libft/printf_src/print_str.o
diff --git a/libft/printf_src/print_uint.o b/libft/printf_src/print_uint.o
diff --git a/libft/printf_src/str_functions.o b/libft/printf_src/str_functions.o
diff --git a/res.txt b/res.txt
diff --git a/visu/parse.c b/visu/parse.c
@@ -62,13 +62,21 @@ t_frames	*parse_file(t_desc *d, int fd)
 	head = NULL;
 	while (get_next_line(fd, &line) > 0)
 	{
-		if (ft_strstr(line, "yochered.filler"))
+		if (ft_strstr(line, "[./yochered.filler]"))
 		{
 			d->m_c = *(line + 10) == 1 ? 'O' : 'X';
-			d->e_c = d->m_c = 'O' ? 'X' : 'O';
+			d->e_c = (d->m_c == 'O') ? 'X' : 'O';
 		}
 		if (ft_strnequ(line, "Plateau", 7))
 			insert_to_list(&head, fd, line, d);
+		if (ft_strnequ(line, "launched", 8) && !ft_strstr(line, "yochered.filler"))
+			d->enemy = ft_strdup(line + 17);
+		if (CHAR(*(line + 3), d->e_c) && ft_strstr(line, "fin:"))
+			d->e_score = ft_atoi(line + 10);
+		else if (CHAR(*(line + 3), d->m_c) && ft_strstr(line, "fin:"))
+			d->my_score = ft_atoi(line + 10);
 	}
+	if (d->m_c == 'O')
+		d->i = 0;
 	return (head);
 }
diff --git a/visu/print.c b/visu/print.c
@@ -18,31 +18,42 @@ t_img	*new_image(t_desc *d)
 
 	if (!(img = (t_img*)malloc(sizeof(t_img))))
 		return (NULL);
-	img->img = mlx_new_image(d->mlx, MAP_W, MAP_H);
+	img->sq_size = MIN((WIDTH - 400) / d->map_w, (HEIGHT - 200) / d->map_h);
+	img->height = d->map_h * img->sq_size;
+	img->width = d->map_w * img->sq_size;
+	img->bor = img->sq_size < 20 ? 1 : 2;
+	img->img = mlx_new_image(d->mlx, img->width, img->height);
 	img->ptr = mlx_get_data_addr(img->img, &img->bpp, &img->s_l, &img->endian);
 	img->bpp /= 8;
 	return (img);
 }
 
 void	img_putpixel(t_img *img, int x, int y, int color)
 {
-	if (x < 0 || y < 0 || x > MAP_W || y > MAP_H)
+	if (x < 0 || y < 0 || x >= img->width || y >= img->height)
 		return ;
-	*(int*)(img->ptr + ((x + y * MAP_W) * img->bpp)) = color;
+	*(int*)(img->ptr + ((x + y * img->width) * img->bpp)) = color;
 }
 
 void	putsquare(t_img *img, int x, int y, int color)
 {
 	int w;
 	int h;
 
-	w = x * SIZE;
-	h = y * SIZE;
-	while (y <= h)
+	w = x + img->sq_size;
+	h = y + img->sq_size;
+	while (y < h)
 	{
-		x = w / SIZE - 1;
-		while (++x <= w)
-			img_putpixel(img, x, y, color);
+		x = w - img->sq_size;
+		while (x < w)
+		{
+			if (x < w - img->sq_size + img->bor || x >= w - img->bor
+				|| y < h - img->sq_size + img->bor || y >= h - img->bor)
+				img_putpixel(img, x, y, B_COL);
+			else
+				img_putpixel(img, x, y, color);
+			x++;
+		}
 		y++;
 	}
 }
@@ -52,27 +63,46 @@ void	print_map(t_img *img, t_desc *d, t_frames *frame)
 	int i;
 	int j;
 
-	i = -1;
+	i = 0;
 	while (++i < d->map_h)
 	{
 		j = -1;
 		while (++j < d->map_w)
 		{
 			if (frame->map[i][j] == '.')
-				putsquare(img, j, i, 0xFFFFFF);
+				putsquare(img, j * img->sq_size, i * img->sq_size, 0xecebec);
+			else if (CHAR(frame->map[i][j], d->m_c))
+				putsquare(img, j * img->sq_size, i * img->sq_size, d->my_col);
+			else if (CHAR(frame->map[i][j], d->e_c))
+				putsquare(img, j * img->sq_size, i * img->sq_size, d->enem_col);
 		}
 	}
-	mlx_put_image_to_window(d->mlx, d->win, img->img,(WIDTH - MAP_W) / 2, (HEIGHT - MAP_H) / 2);
+	mlx_put_image_to_window(d->mlx, d->win, img->img, (WIDTH - img->width) / 2, (HEIGHT - img->height) / 2);
 }
 
-void	fill_window(t_desc *d, t_frames *head)
+int		fill_window(t_desc *d, t_frames *head, int flag)
 {
-	t_img	*img;
+	static t_frames *cur;
+	t_img			*img;
 
 	img = new_image(d);
-	// while (head)
-	// {
-		print_map(img, d, head);	
-		// head = head->next;
-	// }	
+	cur = cur ? cur : head;
+	if (!cur)
+		return (0);
+	if (d->i && g_my_score < d->my_score)
+		g_my_score += (flag == 1 ? 1 : -1);
+	else if (!d->i && g_e_score < d->e_score)
+		g_e_score += (flag == 1 ? 1 : -1);
+	d->i += (flag == 1 ? 1 : -1);
+	if (cur->prev && flag == -1)
+		cur = cur->prev;
+	else if (cur->next && flag == 1)
+		cur = cur->next;
+	print_map(img, d, cur);
+	if (!cur->next)
+	{
+		print_score(d);
+		return (0);
+	}
+	return (1);
 }
diff --git a/visu/visu.c b/visu/visu.c
@@ -11,6 +11,7 @@
 /* ************************************************************************** */
 
 #include "visu.h"
+#include <pthread.h>
 
 void	put_error(char *str)
 {
@@ -25,6 +26,10 @@ void	init_description(t_desc *d)
 {
 	d->map_h = 0;
 	d->map_w = 0;
+	d->my_col = 0x0ad7e7;
+	d->enem_col = 0xea0f0f;
+	g_my_score = 1;
+	g_e_score = 1;
 }
 
 int		main(int ac, char **av)
@@ -40,17 +45,10 @@ int		main(int ac, char **av)
 	{
 		if ((fd = open(av[1], 0)) == -1)
 			put_error(NULL);
-		create_window(&d);
 		head = parse_file(&d, fd);
-		fill_window(&d, head);
-		// while (head)
-		// {
-		// 	for(int i = 0; i < d.map_h; i++)
-		// 		ft_printf(CYAN("%s\n"), head->map[i]);
-		// 	ft_printf("\n\n");
-		// 	head = head->next;
-		// }
-		mlx_hook(d.win, 2, 5, key_hook, &d);
+		create_window(&d);
+		d.head = head;
+		mlx_hook(d.win, 2, 3, key_hook, &d);
 		mlx_loop(d.mlx);
 		if ((close(fd) == -1))
 			put_error(NULL);

diff --git a/visu/visu.h b/visu/visu.h
@@ -18,20 +18,32 @@
 # include <unistd.h>
 # include <stdio.h>
 # include <fcntl.h>
+# define MIN(x, y) (x) < (y) ? (x) : (y)
 # define WIDTH 1920
 # define HEIGHT 1280
-# define MAP_H 1000
-# define MAP_W 1000
-# define SIZE 30
+# define CHAR(x, c) ((x) == (c) || (x) == (c + 32) ? 1 : 0)
+# define B_COL 0x2a472a
+# define TIME 1000
+
+int					g_my_score;
+int					g_e_score;
 
 typedef struct		s_desc
 {
 	void			*mlx;
 	void			*win;
 	char			m_c;
 	char			e_c;
+	int				my_col;
+	int				enem_col;
 	int				map_h;
 	int				map_w;
+	char			*enemy;
+	int				my_score;
+	int				e_score;
+	struct s_img	*scale;
+	struct s_frames	*head;
+	int				i;
 }					t_desc;
 
 typedef struct		s_frames
@@ -45,15 +57,21 @@ typedef struct 		s_img
 {
 	void			*img;
 	void			*ptr;
+	int				sq_size;
 	int				bpp;
 	int				s_l;
 	int				endian;
+	int				height;
+	int				width;
+	int				bor;
 }					t_img;
 
 t_frames			*parse_file(t_desc *d, int fd);
 void				create_window(t_desc *d);
 int					key_hook(int key, void *param);
-void				fill_window(t_desc *d, t_frames *head);
+int					fill_window(t_desc *d, t_frames *head, int flag);
 void				img_putpixel(t_img *img, int x, int y, int color);
+void				print_score(t_desc *d);
+t_img				*create_scale(t_desc *d);
 
 #endif