From c7f7ac205c2cf38a93123fb52fe6e52ecf6ec6a8 Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Tue, 30 Apr 2019 13:26:10 +0200 Subject: [PATCH] ajout du fichier print qui contient les fonctinos de print de bits --- fillit.h | 3 ++- parse_input.c | 2 +- print.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ search_map.c | 44 +------------------------------------- 4 files changed, 63 insertions(+), 45 deletions(-) create mode 100644 print.c diff --git a/fillit.h b/fillit.h index 7741e3a..0cad1c2 100644 --- a/fillit.h +++ b/fillit.h @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ -/* Updated: 2019/04/27 21:00:53 by hulamy ### ########.fr */ +/* Updated: 2019/04/30 13:25:06 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -46,5 +46,6 @@ int check_tetri_errors(char *tetri); int check_tetri_errors_proxy(char *tetri); void search_map(t_fillist *list); void print_map(unsigned int *tab, int width, int height); +void print_bits(unsigned int bits, int size); #endif diff --git a/parse_input.c b/parse_input.c index 051e4ba..7a47d6b 100644 --- a/parse_input.c +++ b/parse_input.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */ -/* Updated: 2019/04/28 16:12:31 by hulamy ### ########.fr */ +/* Updated: 2019/04/30 13:24:40 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/print.c b/print.c new file mode 100644 index 0000000..5e3256e --- /dev/null +++ b/print.c @@ -0,0 +1,59 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* print.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: hulamy +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/04/30 13:24:28 by hulamy #+# #+# */ +/* Updated: 2019/04/30 13:25:18 by hulamy ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "fillit.h" + +/* +** DELETE BEFORE EVAL - TEST FUNCTION +** Prints a ligne of size bits +*/ + +void print_bits(unsigned int bits, int size) +{ + unsigned int mask; + + mask = 1 << (size - 1); + while (mask) + { + (bits & mask) ? write(1, "#", 1) : write(1, ".", 1); + write(1, " ", 1); + mask >>= 1; + } + write(1, "\n", 1); +} + +/* +** DELETE BEFORE EVAL - TEST FUNCTION +** Print a map of height and width +*/ + +void print_map(unsigned int *tab, int width, int height) +{ + int i; + unsigned int mask; + + i = 0; + mask = 0; + while (i++ < width) + mask = (mask >> 1) | ((mask | 1) << 31); + i = 0; + while (i < width * height) + { + if (i && !(i % width)) + ft_putchar('\n'); + tab[i / 32] & (1 << (31 - i % 32)) ? ft_putchar('#') : ft_putchar('.'); + ft_putchar(' '); + i++; + } + write(1, "\n", 1); +} + diff --git a/search_map.c b/search_map.c index 7b5beda..afe5908 100644 --- a/search_map.c +++ b/search_map.c @@ -6,54 +6,12 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */ -/* Updated: 2019/04/30 12:50:06 by hulamy ### ########.fr */ +/* Updated: 2019/04/30 13:25:42 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ #include "fillit.h" -/* -** DELETE BEFORE EVAL - TEST FUNCTION -** print a int in binary -*/ - -void print_bits(unsigned int bits, int size) -{ - unsigned int mask; - - mask = 1 << (size - 1); - while (mask) - { - (bits & mask) ? write(1, "#", 1) : write(1, ".", 1); - write(1, " ", 1); - mask >>= 1; - } - write(1, "\n", 1); -} - -/* -** DELETE BEFORE EVAL - TEST FUNCTION -** print a map of height and width -*/ - -void print_map(unsigned int *tab, int width, int height) -{ - int i; - unsigned int mask; - - i = 0; - mask = ~0u << (32 - width); - while (i < width * height) - { - if (i && !(i % width)) - ft_putnbrendl(i); // pour imprimer les tailles du tableaux pour faciliter sa verification - tab[i / 32] & (1 << (31 - i % 32)) ? ft_putchar('#') : ft_putchar('.'); - ft_putchar(' '); - i++; - } - write(1, "\n", 1); -} - /* ** function that look for the first place in the map for a tetri */