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 --- pmpd3d_tab.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'pmpd3d_tab.c') diff --git a/pmpd3d_tab.c b/pmpd3d_tab.c index ec80533..0ca41da 100644 --- a/pmpd3d_tab.c +++ b/pmpd3d_tab.c @@ -14,7 +14,7 @@ void pmpd3d_massesPosT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize/3 -2); + taille_max = min(taille_max, vecsize/3 ); for (i=0; i < taille_max ; i++) { vec[3*i ].w_float = x->mass[i].posX; @@ -70,7 +70,7 @@ void pmpd3d_massesSpeedsT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize/3 - 2); + taille_max = min(taille_max, vecsize/3); for (i=0; i < taille_max ; i++) { vec[3*i ].w_float = x->mass[i].speedX; @@ -126,7 +126,7 @@ void pmpd3d_massesForcesT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize/3 - 2); + taille_max = min(taille_max, vecsize/3); for (i=0; i < taille_max ; i++) { vec[3*i ].w_float = x->mass[i].forceX; @@ -787,7 +787,7 @@ void pmpd3d_linkPosT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/3 -2); + taille_max = min(taille_max, vecsize/3); for (i=0; i < taille_max ; i++) { vec[3*i ].w_float = (x->link[i].mass2->posX + x->link[i].mass1->posX)/2; @@ -843,7 +843,7 @@ void pmpd3d_linkLengthT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/3 - 2); + taille_max = min(taille_max, vecsize/3); for (i=0; i < taille_max ; i++) { vec[3*i ].w_float = x->link[i].mass2->posX - x->link[i].mass1->posX; @@ -899,7 +899,7 @@ void pmpd3d_linkPosSpeedT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/3 - 2); + taille_max = min(taille_max, vecsize/3); for (i=0; i < taille_max ; i++) { vec[3*i ].w_float = (x->link[i].mass2->speedX + x->link[i].mass1->speedX)/2; @@ -955,7 +955,7 @@ void pmpd3d_linkLengthSpeedT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/3 - 2); + taille_max = min(taille_max, vecsize/3); for (i=0; i < taille_max ; i++) { vec[3*i ].w_float = x->link[i].mass2->speedX - x->link[i].mass1->speedX; @@ -1839,7 +1839,7 @@ void pmpd3d_linkEndT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/6 - 5 ); + taille_max = min(taille_max, vecsize/6 ); for (i=0; i < taille_max ; i++) { vec[6*i ].w_float = x->link[i].mass1->posX; @@ -1904,7 +1904,7 @@ void pmpd3d_linkEndXT(t_pmpd3d *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; @@ -1925,7 +1925,7 @@ void pmpd3d_linkEndXT(t_pmpd3d *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) { @@ -1957,7 +1957,7 @@ void pmpd3d_linkEndYT(t_pmpd3d *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; @@ -1978,7 +1978,7 @@ void pmpd3d_linkEndYT(t_pmpd3d *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) { @@ -2010,7 +2010,7 @@ void pmpd3d_linkEndZT(t_pmpd3d *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->posZ; @@ -2031,7 +2031,7 @@ void pmpd3d_linkEndZT(t_pmpd3d *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) { @@ -2063,7 +2063,7 @@ void pmpd3d_linkEnd1T(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/3 -2); + taille_max = min(taille_max, vecsize/3); for (i=0; i < taille_max ; i++) { vec[3*i ].w_float = x->link[i].mass1->posX; @@ -2085,7 +2085,7 @@ void pmpd3d_linkEnd1T(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-3) && (j < x->nb_link)) + while ((i < vecsize-2) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -2139,7 +2139,7 @@ void pmpd3d_linkEnd1XT(t_pmpd3d *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) { @@ -2189,7 +2189,7 @@ void pmpd3d_linkEnd1YT(t_pmpd3d *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) { @@ -2239,7 +2239,7 @@ void pmpd3d_linkEnd1ZT(t_pmpd3d *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) { @@ -2269,7 +2269,7 @@ void pmpd3d_linkEnd2T(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) else { int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize/3 -2); + taille_max = min(taille_max, vecsize/3); for (i=0; i < taille_max ; i++) { vec[3*i ].w_float = x->link[i].mass2->posX; @@ -2291,7 +2291,7 @@ void pmpd3d_linkEnd2T(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { i = 0; j = 0; - while ((i < vecsize-3) && (j < x->nb_link)) + while ((i < vecsize-2) && (j < x->nb_link)) { if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) { @@ -2345,7 +2345,7 @@ void pmpd3d_linkEnd2XT(t_pmpd3d *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) { @@ -2395,7 +2395,7 @@ void pmpd3d_linkEnd2YT(t_pmpd3d *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) { @@ -2445,7 +2445,7 @@ void pmpd3d_linkEnd2ZT(t_pmpd3d *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