From 646d611381f096dcabe858c486c474a785cd2cd2 Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Wed, 1 May 2019 13:49:19 +0200 Subject: [PATCH] add_remove fonctionne --- search_map.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/search_map.c b/search_map.c index fb47c21..9df8f5d 100644 --- a/search_map.c +++ b/search_map.c @@ -6,7 +6,7 @@ /* 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((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(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 + 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 / 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 j -= size; 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 add_remove(tab, list, 10, find_place(tab, list, 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)); 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)); 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 // ft_putstr("test ");