From 5b0276ed3c468299b0fb5dedd53783aee080fab8 Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Fri, 13 Jun 2014 16:43:05 +0000 Subject: more border check svn path=/trunk/externals/pmpd/; revision=17323 --- pmpd2d_tab.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'pmpd2d_tab.c') diff --git a/pmpd2d_tab.c b/pmpd2d_tab.c index f247714..8eeb83f 100644 --- a/pmpd2d_tab.c +++ b/pmpd2d_tab.c @@ -14,7 +14,7 @@ void pmpd2d_massesPosT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize/2 - 1); + taille_max = min(taille_max, vecsize/2 ); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = x->mass[i].posX; @@ -35,7 +35,7 @@ void pmpd2d_massesPosT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-1) && (j < x->nb_mass)) + while ((i < vecsize) && (j < x->nb_mass)) { if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) { @@ -67,7 +67,7 @@ void pmpd2d_massesSpeedsT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize/2 - 1); + taille_max = min(taille_max, vecsize/2 ); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = x->mass[i].speedX; @@ -120,7 +120,7 @@ void pmpd2d_massesForcesT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize/2 - 1) ; + taille_max = min(taille_max, vecsize/2) ; for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = x->mass[i].forceX; @@ -626,7 +626,7 @@ void pmpd2d_linksPosT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/2 - 1); + taille_max = min(taille_max, vecsize/2 ); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = (x->link[i].mass2->posX + x->link[i].mass1->posX)/2; @@ -647,7 +647,7 @@ void pmpd2d_linksPosT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize-1) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -679,7 +679,7 @@ void pmpd2d_linksLengthT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/2 - 1); + taille_max = min(taille_max, vecsize/2); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = x->link[i].mass2->posX - x->link[i].mass1->posX; @@ -700,7 +700,7 @@ void pmpd2d_linksLengthT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize-1) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -732,7 +732,7 @@ void pmpd2d_linksPosSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/2 - 1); + taille_max = min(taille_max, vecsize/2); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = (x->link[i].mass2->speedX + x->link[i].mass1->speedX)/2; @@ -753,7 +753,7 @@ void pmpd2d_linksPosSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize-1) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -785,7 +785,7 @@ void pmpd2d_linksLengthSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/2 - 1); + taille_max = min(taille_max, vecsize/2); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = x->link[i].mass2->speedX - x->link[i].mass1->speedX; @@ -806,7 +806,7 @@ void pmpd2d_linksLengthSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize-1) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -1459,7 +1459,7 @@ void pmpd2d_linkEndT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/4 - 3); + taille_max = min(taille_max, vecsize/4 ); for (i=0; i < taille_max ; i++) { vec[4*i ].w_float = x->link[i].mass1->posX; @@ -1518,7 +1518,7 @@ void pmpd2d_linkEndXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, (vecsize-1)/2); + taille_max = min(taille_max, vecsize/2); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = x->link[i].mass1->posX; @@ -1539,7 +1539,7 @@ void pmpd2d_linkEndXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize-1) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -1571,7 +1571,7 @@ void pmpd2d_linkEndYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/2-1); + taille_max = min(taille_max, vecsize/2); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = x->link[i].mass1->posY; @@ -1592,7 +1592,7 @@ void pmpd2d_linkEndYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize-1) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -1624,7 +1624,7 @@ void pmpd2d_linkEnd1T(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/2-1); + taille_max = min(taille_max, vecsize/2); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = x->link[i].mass1->posX; @@ -1645,7 +1645,7 @@ void pmpd2d_linkEnd1T(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize-1) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -1697,7 +1697,7 @@ void pmpd2d_linkEnd1XT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -1747,7 +1747,7 @@ void pmpd2d_linkEnd1YT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -1777,7 +1777,7 @@ void pmpd2d_linkEnd2T(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/2 -1); + taille_max = min(taille_max, vecsize/2); for (i=0; i < taille_max ; i++) { vec[2*i ].w_float = x->link[i].mass2->posX; @@ -1798,7 +1798,7 @@ void pmpd2d_linkEnd2T(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize-1) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -1850,7 +1850,7 @@ void pmpd2d_linkEnd2XT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -1900,7 +1900,7 @@ void pmpd2d_linkEnd2YT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) + while ((i < vecsize) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { -- cgit v1.2.1