WIP: if (address_of_the_arrow_to_erase_in_the_arrows_list == arrows_nb) 👀️ is a particular case 😄️
This commit is contained in:
parent
874d237fc7
commit
67508cd830
|
@ -669,32 +669,52 @@ static inline int create_arrow (int arrows_nb,
|
||||||
return arrows_nb;
|
return arrows_nb;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int erase_arrow (int arrows_nb, int address,
|
static inline int erase_arrow (int arrows_nb, int address_of_the_arrow_to_erase_in_the_arrows_list,
|
||||||
int site, int x, int y, int z,
|
int site, int x, int y, int z,
|
||||||
int console)
|
int console)
|
||||||
{
|
{
|
||||||
assert (arrows_nb);
|
assert (arrows_nb);
|
||||||
assert (address <= arrows_nb);
|
|
||||||
arrows_nb --;
|
arrows_nb --;
|
||||||
|
if (address_of_the_arrow_to_erase_in_the_arrows_list == arrows_nb)
|
||||||
|
{
|
||||||
|
void *new_arrows_vertex_ptr = g_realloc(buffer_vertex_origin, buffer_vertex_size * sizeof(GLfloat));
|
||||||
|
if (new_arrows_vertex_ptr) buffer_vertex_origin = new_arrows_vertex_ptr;
|
||||||
|
else perror("In graphics.erase_arrow(), can't re_allocate for arrows vertex buffer.\n");
|
||||||
|
|
||||||
int mem = arrows_ptr[address].site;
|
void *new_arrows_colors_ptr = g_realloc(buffer_colors_origin, buffer_colors_size * sizeof(GLfloat));
|
||||||
|
if (new_arrows_colors_ptr) buffer_colors_origin = new_arrows_colors_ptr;
|
||||||
|
else perror("In graphics.erase_arrow(), can't re_allocate for arrows colors buffer.\n");
|
||||||
|
|
||||||
arrows_ptr[address].load = arrows_ptr[arrows_nb].load;
|
buffer_vertex_size -= 6; // <<< ceci n'est pas fait dans : graphics_write_vertex()
|
||||||
arrows_ptr[address].site = arrows_ptr[arrows_nb].site;
|
buffer_colors_size -= 6; // <<< ceci n'est pas fait dans : graphics_write_colors()
|
||||||
arrows_ptr[address].x = arrows_ptr[arrows_nb].x;
|
buffer_lines_size -= 2; // <<< ceci n'est pas fait dans : graphics_write_line()
|
||||||
arrows_ptr[address].y = arrows_ptr[arrows_nb].y;
|
|
||||||
arrows_ptr[address].z = arrows_ptr[arrows_nb].z;
|
if (console) printf("in erase_arrow() : arrows_nb decreases from %d to %d. the erased arrow was at address : %d = %d : arrows_nb\n\
|
||||||
|
buffer_vertex_size - 6 = %ld buffer_lines_size - 2 = %ld\n",\
|
||||||
|
arrows_nb + 1, arrows_nb, address_of_the_arrow_to_erase_in_the_arrows_list, arrows_nb, buffer_vertex_size, buffer_lines_size);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
int mem = arrows_ptr[address_of_the_arrow_to_erase_in_the_arrows_list].site;
|
||||||
|
|
||||||
|
arrows_ptr[address_of_the_arrow_to_erase_in_the_arrows_list].load = arrows_ptr[arrows_nb].load;
|
||||||
|
arrows_ptr[address_of_the_arrow_to_erase_in_the_arrows_list].site = arrows_ptr[arrows_nb].site;
|
||||||
|
arrows_ptr[address_of_the_arrow_to_erase_in_the_arrows_list].x = arrows_ptr[arrows_nb].x;
|
||||||
|
arrows_ptr[address_of_the_arrow_to_erase_in_the_arrows_list].y = arrows_ptr[arrows_nb].y;
|
||||||
|
arrows_ptr[address_of_the_arrow_to_erase_in_the_arrows_list].z = arrows_ptr[arrows_nb].z;
|
||||||
|
|
||||||
|
|
||||||
if (console) printf("in erase_arrow() : arrows_nb decreases from %d to %d. the erased arrow was at address : %d\n\
|
if (console) printf("in erase_arrow() : arrows_nb decreases from %d to %d. the erased arrow was at address : %d\n\
|
||||||
: arrows_ptr[%d].site (value: %d) was replaced by %d (%d was the value of the last arrow.site)\n",\
|
: arrows_ptr[%d].site (value: %d) was replaced by %d (%d was the value of the last arrow.site)\n",\
|
||||||
arrows_nb + 1, arrows_nb, address, address, mem, arrows_ptr[arrows_nb].site, arrows_ptr[arrows_nb].site);
|
arrows_nb + 1, arrows_nb, address_of_the_arrow_to_erase_in_the_arrows_list, address_of_the_arrow_to_erase_in_the_arrows_list, \
|
||||||
|
mem, arrows_ptr[arrows_nb].site, arrows_ptr[arrows_nb].site);
|
||||||
|
|
||||||
void *new_arrows_vertex_ptr = g_realloc(buffer_vertex_origin, buffer_vertex_size * sizeof(GLfloat));
|
void *new_arrows_vertex_ptr = g_realloc(buffer_vertex_origin, buffer_vertex_size * sizeof(GLfloat));
|
||||||
if (new_arrows_vertex_ptr) buffer_vertex_origin = new_arrows_vertex_ptr;
|
if (new_arrows_vertex_ptr) buffer_vertex_origin = new_arrows_vertex_ptr;
|
||||||
else perror("In graphics.erase_arrow(), can't re_allocate for arrows vertex buffer.\n");
|
else perror("In graphics.erase_arrow(), can't re_allocate for arrows vertex buffer.\n");
|
||||||
|
|
||||||
for (long i = 0 + address * 6; i < 6 + address * 6; i++)
|
for (long i = 0 + address_of_the_arrow_to_erase_in_the_arrows_list * 6;
|
||||||
|
i < 6 + address_of_the_arrow_to_erase_in_the_arrows_list * 6; i++)
|
||||||
buffer_vertex_origin [buffer_vertex_0_arrow + i]
|
buffer_vertex_origin [buffer_vertex_0_arrow + i]
|
||||||
= buffer_vertex_origin [buffer_vertex_size - 6 + i];
|
= buffer_vertex_origin [buffer_vertex_size - 6 + i];
|
||||||
|
|
||||||
|
@ -704,7 +724,7 @@ static inline int erase_arrow (int arrows_nb, int address,
|
||||||
else perror("In graphics.erase_arrow(), can't re_allocate for arrows colors buffer.\n");
|
else perror("In graphics.erase_arrow(), can't re_allocate for arrows colors buffer.\n");
|
||||||
|
|
||||||
for (long i = 0; i < 6; i++)
|
for (long i = 0; i < 6; i++)
|
||||||
buffer_colors_origin [buffer_colors_0_arrow + (address + 4) * 6 + i]
|
buffer_colors_origin [buffer_colors_0_arrow + (address_of_the_arrow_to_erase_in_the_arrows_list + 4) * 6 + i]
|
||||||
= buffer_colors_origin [buffer_colors_size - 6 + i];
|
= buffer_colors_origin [buffer_colors_size - 6 + i];
|
||||||
|
|
||||||
|
|
||||||
|
@ -719,6 +739,7 @@ static inline int erase_arrow (int arrows_nb, int address,
|
||||||
|
|
||||||
if (console) print_arrows_array (arrows_ptr, arrows_nb, 0);
|
if (console) print_arrows_array (arrows_ptr, arrows_nb, 0);
|
||||||
|
|
||||||
|
}
|
||||||
return arrows_nb;
|
return arrows_nb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue