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

add_remove fonctionne

Browse Source
This commit is contained in:
Hugo LAMY
2019-05-01 13:49:19 +02:00
parent c40da94786
commit 646d611381
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
search_map.c
View File

@@ -6,7 +6,7 @@
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */ /* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */ /* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */
/* Updated: 2019/05/01 12:34:29 by hulamy ### ########.fr */ /* Updated: 2019/05/01 13:48:35 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -84,9 +84,10 @@ void add_remove(unsigned int *map, t_fillist *list, int size, int pos)
print_bits(map[(j + list->width) / 32], 32); print_bits(map[(j + list->width) / 32], 32);
print_bits((mask >> i & list->tetribit << 16), 32); print_bits((mask >> i & list->tetribit << 16), 32);
print_bits((mask >> i & list->tetribit << 16) << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32)), 32); print_bits((mask >> i & list->tetribit << 16) << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32)), 32);
print_bits(map[(j + list->width) / 32] | (mask >> i & list->tetribit << 16) << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32)), 32);
*/ */
map[j / 32] |= (mask >> i & list->tetribit << 16) >> (j - i - 1); map[j / 32] ^= (mask >> i & list->tetribit << 16) >> (j - i - 1);
map[(j + size) / 32] |= (mask >> i & list->tetribit << 16) << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32)); // cette deuxieme ligne est la au cas ou on serait a cheval sur deux int du tab map[(j + size) / 32] ^= (mask >> i & list->tetribit << 16) << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32)); // cette deuxieme ligne est la au cas ou on serait a cheval sur deux int du tab
j -= size; j -= size;
i -= list->width; i -= list->width;
} }
@@ -183,10 +184,18 @@ void search_map(t_fillist *list)
// quand add_remove_marchera la ligne d'apres imprimera la map avec les pixels du tetri rajoutes a la bonne place // quand add_remove_marchera la ligne d'apres imprimera la map avec les pixels du tetri rajoutes a la bonne place
add_remove(tab, list, 10, find_place(tab, list, 10)); add_remove(tab, list, 10, find_place(tab, list, 10));
print_map(tab, 10, 10); print_map(tab, 10, 10);
add_remove(tab, list, 10, list->position);
print_map(tab, 10, 10);
add_remove(tab, list->next, 10, find_place(tab, list->next, 10)); add_remove(tab, list->next, 10, find_place(tab, list->next, 10));
print_map(tab, 10, 10); print_map(tab, 10, 10);
add_remove(tab, list->next, 10, list->next->position);
print_map(tab, 10, 10);
add_remove(tab, list->next->next, 10, find_place(tab, list->next->next, 10)); add_remove(tab, list->next->next, 10, find_place(tab, list->next->next, 10));
print_map(tab, 10, 10); print_map(tab, 10, 10);
add_remove(tab, list->next->next, 10, list->next->next->position);
print_map(tab, 10, 10);
// lance la recursive fill_map en augmentant la taille de la map tant qu'il n'y a pas de solution // lance la recursive fill_map en augmentant la taille de la map tant qu'il n'y a pas de solution
// ft_putstr("test "); // ft_putstr("test ");