diff --git a/test_right.c b/test_right.c index 1e5b9ff..cda3782 100644 --- a/test_right.c +++ b/test_right.c @@ -14,40 +14,21 @@ void print_bits(unsigned int bits, int size) write(1, "\n", 1); } -void print_map(unsigned int *tab, int s) +void print_map(unsigned int *tab, int size) { int i; - unsigned int m; + unsigned int mask; unsigned int tmp; i = 0; - m = 0; + mask = 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); + while (i++ < size) + mask = (mask >> 1) | ((mask | 1) << 31); i = 0; - while (i < s * s) + while (i < size * size) { -// /* -// ** 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 et le tmp - */ - if (!(i % s)) + if (!(i % size)) ft_putchar('\n'); tab[i / 32] & (1 << (31 - i % 32)) ? ft_putchar('#') : ft_putchar('.'); ft_putchar(' '); @@ -56,16 +37,18 @@ void print_map(unsigned int *tab, int s) write(1, "\n", 1); } -void find_place(unsigned int *tab, char *line, int s) +void find_place(unsigned int *tab, char *line, int size) { unsigned short tetri; int i; - unsigned int m; + int j; + unsigned int mask; unsigned int tmp; - ft_putendl("# . . # # # # T T # . # . # # # # # . . # # . # T # . # # # # . . # . # . . # # T . . # # # . # # . # # # . . . # # # # . . # . . # . # # . . # . . . # . . . . # . . . # # . # . . . # . # # ."); - // create tetri +// ft_putendl("# . . # # # # T T # . # . # # # # # . . # # . # T # . # # # # . . # . # . . # # T . . # # # . # # . # # # . . . # # # # . . # . . # . # # . . # . . . # . . . . # . . . # # . # . . . # . # # ."); + /////////////// create tetri /////////////// i = 0; + tmp = 0; while (line[i]) { tetri <<= 1; @@ -77,18 +60,32 @@ void find_place(unsigned int *tab, char *line, int s) while (!(tetri & (1 << 15))) tetri <<= 1; print_bits(tetri, 16); - write(1, "\n", 1); + tmp = (tetri | tmp) << 16; + print_map(&tmp, 4); + /////////////// create tetri /////////////// - m = 15 << (32 - 4); + mask = 15 << (32 - 4); i = 0; - while (i < 20) + while (i < 16) { - while (i < 4 * s) + tmp = 0; + j = 3 * size + i; + ft_putnbrendl(j); + while (j >= i) { - tmp = (m & (tab[i / 32] << i)) | (m & (tab[(i + s) / 32] >> (32 - i))); - print_bits(tmp, 32); - i += s; + tmp >>= 4; + tmp |= (mask & (tab[j / 32] << j)); + tmp |= (mask & (tab[(j + size) / 32] >> (32 - j))); + // print_bits(tmp, 32); + j -= size; } + //write(1, "\n", 1); + print_map(&tmp, 4); + print_bits(tmp >> 16, 32); + print_bits(tetri, 32); + //print_bits((tmp >> 16) & tetri, 32); + if (i % size == size - 4) + i += 3; i++; } } @@ -120,10 +117,10 @@ int main(int ac, char **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); + print_map(tab, 10); write(1, "\n", 1); if (av[0][0] == 't' && ac > 2) - find_place(tab, av[1], 16); + find_place(tab, av[1], 10); } return (0); }