42/42_old_fillit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

print_map fonctionne avec deux versions

Browse Source
This commit is contained in:
Hugo LAMY
2019-04-25 05:32:29 +02:00
parent 8da1c5bec6
commit dabdd7dbef
3 changed files with 99 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fillit.h
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */
/* Updated: 2019/04/24 13:46:32 by hulamy ### ########.fr */
/* Updated: 2019/04/24 15:49:08 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
@@ -43,6 +43,5 @@ void parse_input(char *input);
int check_file_errors(char *file);
int check_tetri_errors(char *tetri);
int check_tetri_errors_proxy(char *tetri);
int add_to_list(char *square, t_fillist **list);
#endif

10
parse_input.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */
/* Updated: 2019/04/24 15:12:32 by hulamy ### ########.fr */
/* Updated: 2019/04/24 16:18:16 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
@@ -63,6 +63,13 @@ int add_to_list(char *line, t_fillist **list)
return (1);
}
void find_map(t_fillist *list)
{
unsigned int map[10];
fill_map(list, map);
print_maop(map);
}
/*
** Function that parse a file and put each tetrimino in a linked list
@@ -88,5 +95,6 @@ void parse_input(char *input)
while (input[i] && input[i] != '.' && input[i] != '#')
i++;
}
find_map(list);
}

89
test_right.c Normal file
View File

@@ -0,0 +1,89 @@
#include "./libft/includes/libft.h"
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);
}
void print_map(unsigned int *tab, int s)
{
int i;
unsigned int m;
unsigned int tmp;
i = 0;
m = 0;
// creer un mask avec les size bits de gauche a 1 (ex: 11111110000000000000000000000000)
while (i++ < s)
m = (m >> 1) | ((m | 1) << 31);
write(1, "\n", 1);
i = 0;
while (i < s * s)
{
// /*
// ** first version :
// **
// ** tmp = ((m >> i) & tab[i / 32]) << i;
// ** tmp |= ((m << (32 - i)) & tab[(i + s) / 32]) >> (32 - i);
// ** tmp >>= 32 - s;
// ** print_bits(tmp, s);
// ** i += s;
// */
//
// tmp = (m & (tab[i / 32] << i)) | (m & (tab[(i + s) / 32] >> (32 - i)));
// print_bits(tmp >> (32 - s), s);
// i += s;
/*
** second version :
** n'utilise pas le mask m
*/
if (!(i % s))
ft_putchar('\n');
tab[i / 32] & (1 << (31 - i % 32)) ? ft_putchar('#') : ft_putchar('.');
ft_putchar(' ');
i++;
}
write(1, "\n", 1);
}
int main(int ac, char **av)
{
unsigned int tab[8];
// ce tableau permet de monter jusqu'a une map de 16*16
tab[0] = 2656554334;
tab[1] = 1394456818;
tab[2] = 1494256918;
tab[3] = 2656554334;
tab[4] = 1592453883;
tab[5] = 1444352908;
tab[6] = 2154339230;
tab[7] = 1576493154;
print_bits(tab[0], 32);
print_bits(tab[1], 32);
print_bits(tab[2], 32);
print_bits(tab[3], 32);
print_bits(tab[4], 32);
print_bits(tab[5], 32);
print_bits(tab[6], 32);
print_bits(tab[7], 32);
if (ac > 1)
{
++av;
// mettre l'option "b" pour afficher la troisieme argument en binaire
if (av[0][0] == 'b' && ac > 2)
ft_putendl(ft_convertbase(av[1], "01", "0123456789"));
print_map(tab, 16);
}
return (0);
}