From e826cff4ba49080c19752e770912308b225de1aa Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Wed, 9 Jan 2013 17:52:22 +0000 Subject: few cleanup svn path=/trunk/externals/pmpd/; revision=16848 --- pmpd2d.c | 3958 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 1979 insertions(+), 1979 deletions(-) (limited to 'pmpd2d.c') diff --git a/pmpd2d.c b/pmpd2d.c index 15057b5..4b5bef3 100644 --- a/pmpd2d.c +++ b/pmpd2d.c @@ -1,7 +1,7 @@ /* -------------------------- pmpd2d ---------------------------------------- - + pmpd = physical modeling for pure data Written by Cyrille Henry (ch@chnry.net) @@ -43,37 +43,37 @@ t_float sign_ch(t_float v) t_float sqr(t_float x) { - return x*x ; + return x*x ; } t_float pow_ch(t_float x, t_float y) { - return x > 0 ? pow(x,y) : -pow(-x,y); + return x > 0 ? pow(x,y) : -pow(-x,y); } - + static t_class *pmpd2d_class; typedef struct _mass { t_symbol *Id; int mobile; - t_float invM; - t_float speedX; - t_float speedY; - t_float posX; - t_float posY; - t_float forceX; - t_float forceY; - t_float D2; - t_float D2offset; + t_float invM; + t_float speedX; + t_float speedY; + t_float posX; + t_float posY; + t_float forceX; + t_float forceY; + t_float D2; + t_float D2offset; int num; } foo; typedef struct _link { t_symbol *Id; int lType; - struct _mass *mass1; - struct _mass *mass2; - t_float K; + struct _mass *mass1; + struct _mass *mass2; + t_float K; t_float D; t_float L; t_float Pow; @@ -85,49 +85,49 @@ typedef struct _link { t_symbol *arrayK; t_symbol *arrayD; t_float K_L; // longeur du tabeau K - t_float D_L; // longeur du tabeau D + t_float D_L; // longeur du tabeau D } foo1 ; typedef struct _pmpd2d { - t_object x_obj; - struct _link link[nb_max_link]; - struct _mass mass[nb_max_mass]; - t_outlet *main_outlet; + t_object x_obj; + struct _link link[nb_max_link]; + struct _mass mass[nb_max_mass]; + t_outlet *main_outlet; t_outlet *info_outlet; int nb_link; - int nb_mass; + int nb_mass; t_float minX, maxX, minY, maxY; t_int grab; // si on grab une mass ou pas - t_int grab_nb; // la masse grabé + t_int grab_nb; // la masse grabé } t_pmpd2d; t_float tabread2(t_pmpd2d *x, t_float pos, t_symbol *array) { t_garray *a; - int npoints; - t_word *vec; - t_float posx; - + int npoints; + t_word *vec; + t_float posx; + if (!(a = (t_garray *)pd_findbyclass(array, garray_class))) pd_error(x, "%s: no such array", array->s_name); else if (!garray_getfloatwords(a, &npoints, &vec)) pd_error(x, "%s: bad template for tabLink", array->s_name); - else + else { - posx = fabs(pos)*npoints; - int n=posx; - if (n >= npoints - 1) - return (sign_ch(pos)*vec[npoints-1].w_float); - float fract = posx-n; - return (sign_ch(pos) * ( fract*vec[n+1].w_float+(1-fract)*vec[n].w_float)); - } - return( pos); // si il y a un pb sur le tableau, on renvoie l'identité + posx = fabs(pos)*npoints; + int n=posx; + if (n >= npoints - 1) + return (sign_ch(pos)*vec[npoints-1].w_float); + float fract = posx-n; + return (sign_ch(pos) * ( fract*vec[n+1].w_float+(1-fract)*vec[n].w_float)); + } + return( pos); // si il y a un pb sur le tableau, on renvoie l'identité } void pmpd2d_reset(t_pmpd2d *x) { - x->nb_link = 0; - x->nb_mass = 0; + x->nb_link = 0; + x->nb_mass = 0; x->minX = -1000000; x->maxX = 1000000; x->minY = -1000000; @@ -140,131 +140,131 @@ void pmpd2d_infosL(t_pmpd2d *x) int i; post("list of mass"); post("number, Id, mobile, mass, damping, positionX Y, speedX Y, forcesX Y"); - for(i=0; i < x->nb_mass; i++) + for(i=0; i < x->nb_mass; i++) { post("masse %i: %s, %d, %f, %f, %f, %f, %f, %f, %f, %f",i, x->mass[i].Id->s_name, \ - x->mass[i].mobile, 1/x->mass[i].invM, x->mass[i].D2, x->mass[i].posX, x->mass[i].posY, \ - x->mass[i].speedX, x->mass[i].speedY, x->mass[i].forceX, x->mass[i].forceY ); + x->mass[i].mobile, 1/x->mass[i].invM, x->mass[i].D2, x->mass[i].posX, x->mass[i].posY, \ + x->mass[i].speedX, x->mass[i].speedY, x->mass[i].forceX, x->mass[i].forceY ); } post("list of link"); post("number, Id, mass1, mass2, K, D, Pow, L, Lmin, Lmax"); - for(i=0; i < x->nb_link; i++) - { - switch(x->link[i].lType) - { - case 0 : - post("link %i: %s, %i, %i, %f, %f, %f, %f, %f, %f", i, x->link[i].Id->s_name, \ - x->link[i].mass1->num, x->link[i].mass2->num, x->link[i].K, x->link[i].D, \ - x->link[i].Pow, x->link[i].L, x->link[i].Lmin, x->link[i].Lmax); - break; - case 1 : - post("tLink %i: %s, %i, %i, %f, %f, %f, %f, %f, %f, %f, %f", i, x->link[i].Id->s_name, \ - x->link[i].mass1->num, x->link[i].mass2->num, x->link[i].K, x->link[i].D, \ - x->link[i].Pow, x->link[i].L, x->link[i].Lmin, x->link[i].Lmax, x->link[i].VX, x->link[i].VY); - break; - case 2 : - post("tabLink %i: %s, %i, %i, %f, %f, %s, %f, %s, %f", i, x->link[i].Id->s_name, \ - x->link[i].mass1->num, x->link[i].mass2->num, x->link[i].K, x->link[i].D, \ - x->link[i].arrayK->s_name, x->link[i].K_L, x->link[i].arrayD->s_name, x->link[i].D_L); - break; - } + for(i=0; i < x->nb_link; i++) + { + switch(x->link[i].lType) + { + case 0 : + post("link %i: %s, %i, %i, %f, %f, %f, %f, %f, %f", i, x->link[i].Id->s_name, \ + x->link[i].mass1->num, x->link[i].mass2->num, x->link[i].K, x->link[i].D, \ + x->link[i].Pow, x->link[i].L, x->link[i].Lmin, x->link[i].Lmax); + break; + case 1 : + post("tLink %i: %s, %i, %i, %f, %f, %f, %f, %f, %f, %f, %f", i, x->link[i].Id->s_name, \ + x->link[i].mass1->num, x->link[i].mass2->num, x->link[i].K, x->link[i].D, \ + x->link[i].Pow, x->link[i].L, x->link[i].Lmin, x->link[i].Lmax, x->link[i].VX, x->link[i].VY); + break; + case 2 : + post("tabLink %i: %s, %i, %i, %f, %f, %s, %f, %s, %f", i, x->link[i].Id->s_name, \ + x->link[i].mass1->num, x->link[i].mass2->num, x->link[i].K, x->link[i].D, \ + x->link[i].arrayK->s_name, x->link[i].K_L, x->link[i].arrayD->s_name, x->link[i].D_L); + break; + } } } void pmpd2d_bang(t_pmpd2d *x) { // this part is doing all the PM - t_float F, L, Lx,Ly, Fx, Fy, tmpX, tmpY,speed; - t_int i; + t_float F, L, Lx,Ly, Fx, Fy, tmpX, tmpY,speed; + t_int i; // post("bang"); - for (i=0; inb_mass; i++) - // compute new masses position - if (x->mass[i].mobile > 0) // only if mobile - { - x->mass[i].speedX += x->mass[i].forceX * x->mass[i].invM; - x->mass[i].speedY += x->mass[i].forceY * x->mass[i].invM; - // x->mass[i].forceX = 0; - // x->mass[i].forceY = 0; - x->mass[i].posX += x->mass[i].speedX ; - x->mass[i].posY += x->mass[i].speedY ; + for (i=0; inb_mass; i++) + // compute new masses position + if (x->mass[i].mobile > 0) // only if mobile + { + x->mass[i].speedX += x->mass[i].forceX * x->mass[i].invM; + x->mass[i].speedY += x->mass[i].forceY * x->mass[i].invM; + // x->mass[i].forceX = 0; + // x->mass[i].forceY = 0; + x->mass[i].posX += x->mass[i].speedX ; + x->mass[i].posY += x->mass[i].speedY ; if ( (x->mass[i].posX < x->minX) || (x->mass[i].posX > x->maxX) || (x->mass[i].posY < x->minY) || (x->mass[i].posY > x->maxY) ) { - tmpX = min(x->maxX,max(x->minX,x->mass[i].posX)); - tmpY = min(x->maxY,max(x->minY,x->mass[i].posY)); - x->mass[i].speedX -= x->mass[i].posX - tmpX; - x->mass[i].speedY -= x->mass[i].posY - tmpY; - x->mass[i].posX = tmpX; - x->mass[i].posY = tmpY; - } - x->mass[i].forceX = -x->mass[i].D2 * x->mass[i].speedX; - x->mass[i].forceY = -x->mass[i].D2 * x->mass[i].speedY; + tmpX = min(x->maxX,max(x->minX,x->mass[i].posX)); + tmpY = min(x->maxY,max(x->minY,x->mass[i].posY)); + x->mass[i].speedX -= x->mass[i].posX - tmpX; + x->mass[i].speedY -= x->mass[i].posY - tmpY; + x->mass[i].posX = tmpX; + x->mass[i].posY = tmpY; + } + x->mass[i].forceX = -x->mass[i].D2 * x->mass[i].speedX; + x->mass[i].forceY = -x->mass[i].D2 * x->mass[i].speedY; speed = sqrt(x->mass[i].speedX * x->mass[i].speedX + x->mass[i].speedY * x->mass[i].speedY); if (speed != 0) { x->mass[i].forceX += x->mass[i].D2offset * (x->mass[i].speedX/speed); x->mass[i].forceY += x->mass[i].D2offset * (x->mass[i].speedY/speed); } - } - - for (i=0; inb_link; i++) - // compute link forces - { - Lx = x->link[i].mass1->posX - x->link[i].mass2->posX; - Ly = x->link[i].mass1->posY - x->link[i].mass2->posY; - L = sqrt( sqr(Lx) + sqr(Ly) ); - - if ( (L >= x->link[i].Lmin) && (L < x->link[i].Lmax) && (L != 0)) - { - if (x->link[i].lType == 2) - { // K et D viennent d'une table - F = x->link[i].D * tabread2(x, (L - x->link[i].distance) / x->link[i].D_L, x->link[i].arrayD); - F += x->link[i].K * tabread2(x, L / x->link[i].K_L, x->link[i].arrayK); - } - else - { - F = x->link[i].D * (L - x->link[i].distance) ; - F += x->link[i].K * pow_ch( L - x->link[i].L, x->link[i].Pow); - } - - Fx = F * Lx/L; - Fy = F * Ly/L; - - if (x->link[i].lType == 1) - { // on projette selon 1 axe - // F = Fx*x->link[i].VX + Fy*x->link[i].VY; // produit scalaire de la force sur le vecteur qui la porte - Fx = Fx*x->link[i].VX; // V est unitaire, dc on projete sans pb - Fy = Fy*x->link[i].VY; - } - - x->link[i].mass1->forceX -= Fx; - x->link[i].mass1->forceY -= Fy; - x->link[i].mass2->forceX += Fx; - x->link[i].mass2->forceY += Fy; - } - x->link[i].distance=L; - } + } + + for (i=0; inb_link; i++) + // compute link forces + { + Lx = x->link[i].mass1->posX - x->link[i].mass2->posX; + Ly = x->link[i].mass1->posY - x->link[i].mass2->posY; + L = sqrt( sqr(Lx) + sqr(Ly) ); + + if ( (L >= x->link[i].Lmin) && (L < x->link[i].Lmax) && (L != 0)) + { + if (x->link[i].lType == 2) + { // K et D viennent d'une table + F = x->link[i].D * tabread2(x, (L - x->link[i].distance) / x->link[i].D_L, x->link[i].arrayD); + F += x->link[i].K * tabread2(x, L / x->link[i].K_L, x->link[i].arrayK); + } + else + { + F = x->link[i].D * (L - x->link[i].distance) ; + F += x->link[i].K * pow_ch( L - x->link[i].L, x->link[i].Pow); + } + + Fx = F * Lx/L; + Fy = F * Ly/L; + + if (x->link[i].lType == 1) + { // on projette selon 1 axe + // F = Fx*x->link[i].VX + Fy*x->link[i].VY; // produit scalaire de la force sur le vecteur qui la porte + Fx = Fx*x->link[i].VX; // V est unitaire, dc on projete sans pb + Fy = Fy*x->link[i].VY; + } + + x->link[i].mass1->forceX -= Fx; + x->link[i].mass1->forceY -= Fy; + x->link[i].mass2->forceX += Fx; + x->link[i].mass2->forceY += Fy; + } + x->link[i].distance=L; + } } void pmpd2d_mass(t_pmpd2d *x, t_symbol *Id, t_float mobile, t_float M, t_float posX, t_float posY ) { // add a mass : Id, invM speedX posX - if (M<=0) M=1; - x->mass[x->nb_mass].Id = Id; - x->mass[x->nb_mass].mobile = (int)mobile; - x->mass[x->nb_mass].invM = 1/M; - x->mass[x->nb_mass].speedX = 0; - x->mass[x->nb_mass].speedY = 0; - x->mass[x->nb_mass].posX = posX; - x->mass[x->nb_mass].posY = posY; - x->mass[x->nb_mass].forceX = 0; - x->mass[x->nb_mass].forceY = 0; - x->mass[x->nb_mass].num = x->nb_mass; - x->mass[x->nb_mass].D2 = 0; - x->mass[x->nb_mass].D2offset = 0; + if (M<=0) M=1; + x->mass[x->nb_mass].Id = Id; + x->mass[x->nb_mass].mobile = (int)mobile; + x->mass[x->nb_mass].invM = 1/M; + x->mass[x->nb_mass].speedX = 0; + x->mass[x->nb_mass].speedY = 0; + x->mass[x->nb_mass].posX = posX; + x->mass[x->nb_mass].posY = posY; + x->mass[x->nb_mass].forceX = 0; + x->mass[x->nb_mass].forceY = 0; + x->mass[x->nb_mass].num = x->nb_mass; + x->mass[x->nb_mass].D2 = 0; + x->mass[x->nb_mass].D2offset = 0; - x->nb_mass++ ; - x->nb_mass = min ( nb_max_mass -1, x->nb_mass ); + x->nb_mass++ ; + x->nb_mass = min ( nb_max_mass -1, x->nb_mass ); } void pmpd2d_create_link(t_pmpd2d *x, t_symbol *Id, int mass1, int mass2, t_float K, t_float D, t_float Pow, t_float Lmin, t_float Lmax, t_int type) @@ -272,20 +272,20 @@ void pmpd2d_create_link(t_pmpd2d *x, t_symbol *Id, int mass1, int mass2, t_float if ((x->nb_mass>1) && (mass1 != mass2) && (mass1 >= 0) && (mass2 >= 0) && (mass1 < x->nb_mass) && (mass2 < x->nb_mass) ) { - x->link[x->nb_link].lType = type; - x->link[x->nb_link].Id = Id; - x->link[x->nb_link].mass1 = &x->mass[mass1]; - x->link[x->nb_link].mass2 = &x->mass[mass2]; - x->link[x->nb_link].K = K; - x->link[x->nb_link].D = D; - x->link[x->nb_link].L = sqrt(sqr(x->mass[mass1].posX - x->mass[mass2].posX) + sqr(x->mass[mass1].posY - x->mass[mass2].posY)); - x->link[x->nb_link].Pow = Pow; - x->link[x->nb_link].Lmin = Lmin; - x->link[x->nb_link].Lmax = Lmax; - x->link[x->nb_link].distance = x->link[x->nb_link].L ; + x->link[x->nb_link].lType = type; + x->link[x->nb_link].Id = Id; + x->link[x->nb_link].mass1 = &x->mass[mass1]; + x->link[x->nb_link].mass2 = &x->mass[mass2]; + x->link[x->nb_link].K = K; + x->link[x->nb_link].D = D; + x->link[x->nb_link].L = sqrt(sqr(x->mass[mass1].posX - x->mass[mass2].posX) + sqr(x->mass[mass1].posY - x->mass[mass2].posY)); + x->link[x->nb_link].Pow = Pow; + x->link[x->nb_link].Lmin = Lmin; + x->link[x->nb_link].Lmax = Lmax; + x->link[x->nb_link].distance = x->link[x->nb_link].L ; - x->nb_link++ ; - x->nb_link = min ( nb_max_link -1, x->nb_link ); + x->nb_link++ ; + x->nb_link = min ( nb_max_link -1, x->nb_link ); } } @@ -342,9 +342,9 @@ void pmpd2d_link(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( (atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)&&(atom_getsymbolarg(2,argc,argv) == x->mass[j].Id)) { - if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) )) - // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances - pmpd2d_create_link(x, Id, i, j, K, D, Pow, Lmin, Lmax, 0); + if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) )) + // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances + pmpd2d_create_link(x, Id, i, j, K, D, Pow, Lmin, Lmax, 0); } } } @@ -355,7 +355,7 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { // add a link : Id, *mass1, *mass2, K, D, Vx, Vy, Pow, Lmin, Lmax; int i, j; - + t_symbol *Id = atom_getsymbolarg(0,argc,argv); int mass1 = atom_getfloatarg(1, argc, argv); int mass2 = atom_getfloatarg(2, argc, argv); @@ -376,8 +376,8 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) ) { pmpd2d_create_link(x, Id, mass1, mass2, K, D, Pow, Lmin, Lmax, 1); - x->link[x->nb_link-1].VX = vecteurX; - x->link[x->nb_link-1].VY = vecteurY; + x->link[x->nb_link-1].VX = vecteurX; + x->link[x->nb_link-1].VY = vecteurY; } else if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) ) @@ -386,9 +386,9 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(1,argc,argv) == x->mass[i].Id) { - pmpd2d_create_link(x, Id, i, mass2, K, D, Pow, Lmin, Lmax, 1); - x->link[x->nb_link-1].VX = vecteurX; - x->link[x->nb_link-1].VY = vecteurY; + pmpd2d_create_link(x, Id, i, mass2, K, D, Pow, Lmin, Lmax, 1); + x->link[x->nb_link-1].VX = vecteurX; + x->link[x->nb_link-1].VY = vecteurY; } } } @@ -400,9 +400,9 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( atom_getsymbolarg(2,argc,argv) == x->mass[i].Id) { pmpd2d_create_link(x, Id, mass1, i, K, D, Pow, Lmin, Lmax, 1); - x->link[x->nb_link-1].VX = vecteurX; - x->link[x->nb_link-1].VY = vecteurY; - } + x->link[x->nb_link-1].VX = vecteurX; + x->link[x->nb_link-1].VY = vecteurY; + } } } else @@ -414,15 +414,15 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( (atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)&(atom_getsymbolarg(2,argc,argv) == x->mass[j].Id)) { - if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) )) - // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances - { - pmpd2d_create_link(x, Id, i, j, K, D, Pow, Lmin, Lmax, 1); - x->link[x->nb_link-1].VX = vecteurX; - x->link[x->nb_link-1].VY = vecteurY; - } - - } + if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) )) + // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances + { + pmpd2d_create_link(x, Id, i, j, K, D, Pow, Lmin, Lmax, 1); + x->link[x->nb_link-1].VX = vecteurX; + x->link[x->nb_link-1].VY = vecteurY; + } + + } } } } @@ -431,24 +431,24 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { int i, j; - + t_symbol *Id = atom_getsymbolarg(0,argc,argv); int mass1 = atom_getfloatarg(1, argc, argv); int mass2 = atom_getfloatarg(2, argc, argv); t_symbol *arrayK = atom_getsymbolarg(3,argc,argv); t_float Kl = atom_getfloatarg(4, argc, argv); - if (Kl <= 0) Kl = 1; + if (Kl <= 0) Kl = 1; t_symbol *arrayD = atom_getsymbolarg(5,argc,argv); t_float Dl = atom_getfloatarg(6, argc, argv); - if (Dl <= 0) Dl = 1; + if (Dl <= 0) Dl = 1; if ( ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) ) { pmpd2d_create_link(x, Id, mass1, mass2, 1, 1, 1, 0, 1000000, 2); - x->link[x->nb_link-1].arrayK = arrayK; - x->link[x->nb_link-1].arrayD = arrayD; - x->link[x->nb_link-1].K_L = Kl; - x->link[x->nb_link-1].D_L = Dl; + x->link[x->nb_link-1].arrayK = arrayK; + x->link[x->nb_link-1].arrayD = arrayD; + x->link[x->nb_link-1].K_L = Kl; + x->link[x->nb_link-1].D_L = Dl; } else if ( ( argv[1].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) ) @@ -458,10 +458,10 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( atom_getsymbolarg(1,argc,argv) == x->mass[i].Id) { pmpd2d_create_link(x, Id, i, mass2, 1, 1, 1, 0, 1000000, 2); - x->link[x->nb_link-1].arrayK = arrayK; - x->link[x->nb_link-1].arrayD = arrayD; - x->link[x->nb_link-1].K_L = Kl; - x->link[x->nb_link-1].D_L = Dl; + x->link[x->nb_link-1].arrayK = arrayK; + x->link[x->nb_link-1].arrayD = arrayD; + x->link[x->nb_link-1].K_L = Kl; + x->link[x->nb_link-1].D_L = Dl; } } } @@ -473,11 +473,11 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( atom_getsymbolarg(2,argc,argv) == x->mass[i].Id) { pmpd2d_create_link(x, Id, mass1, i, 1, 1, 1, 0, 1000000, 2); - x->link[x->nb_link-1].arrayK = arrayK; - x->link[x->nb_link-1].arrayD = arrayD; - x->link[x->nb_link-1].K_L = Kl; - x->link[x->nb_link-1].D_L = Dl; - } + x->link[x->nb_link-1].arrayK = arrayK; + x->link[x->nb_link-1].arrayD = arrayD; + x->link[x->nb_link-1].K_L = Kl; + x->link[x->nb_link-1].D_L = Dl; + } } } else @@ -489,16 +489,16 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( (atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)&(atom_getsymbolarg(2,argc,argv) == x->mass[j].Id)) { - if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) )) - // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances - { - pmpd2d_create_link(x, Id, i, j, 1, 1, 1, 0, 1000000, 2); - x->link[x->nb_link-1].arrayK = arrayK; - x->link[x->nb_link-1].arrayD = arrayD; - x->link[x->nb_link-1].K_L = Kl; - x->link[x->nb_link-1].D_L = Dl; - } - } + if (!( (x->mass[i].Id == x->mass[j].Id) && (i>j) )) + // si lien entre 2 serie de masses identique entres elle, alors on ne creer qu'un lien sur 2, pour evider les redondances + { + pmpd2d_create_link(x, Id, i, j, 1, 1, 1, 0, 1000000, 2); + x->link[x->nb_link-1].arrayK = arrayK; + x->link[x->nb_link-1].arrayD = arrayD; + x->link[x->nb_link-1].K_L = Kl; + x->link[x->nb_link-1].D_L = Dl; + } + } } } } @@ -513,7 +513,7 @@ void pmpd2d_setK(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_link-1, tmp)); - x->link[tmp].K = atom_getfloatarg(1, argc, argv); + x->link[tmp].K = atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -521,7 +521,7 @@ void pmpd2d_setK(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id) { - x->link[i].K = atom_getfloatarg(1, argc, argv); + x->link[i].K = atom_getfloatarg(1, argc, argv); } } } @@ -535,7 +535,7 @@ void pmpd2d_setD(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_link-1, tmp)); - x->link[tmp].D = atom_getfloatarg(1, argc, argv); + x->link[tmp].D = atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -543,7 +543,7 @@ void pmpd2d_setD(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id) { - x->link[i].D = atom_getfloatarg(1, argc, argv); + x->link[i].D = atom_getfloatarg(1, argc, argv); } } } @@ -557,7 +557,7 @@ void pmpd2d_setL(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_link-1, tmp)); - x->link[tmp].L = atom_getfloatarg(1, argc, argv); + x->link[tmp].L = atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -565,11 +565,11 @@ void pmpd2d_setL(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id) { - x->link[i].L = atom_getfloatarg(1, argc, argv); + x->link[i].L = atom_getfloatarg(1, argc, argv); } } } - if ( ( argv[0].a_type == A_FLOAT ) && ( argc == 1 ) ) + if ( ( argv[0].a_type == A_FLOAT ) && ( argc == 1 ) ) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_link-1, tmp)); @@ -590,13 +590,13 @@ void pmpd2d_setL(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) void pmpd2d_setLKTab(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { int tmp, i; - t_float K_l = atom_getfloatarg(1, argc, argv); - if (K_l <= 0) K_l = 1; + t_float K_l = atom_getfloatarg(1, argc, argv); + if (K_l <= 0) K_l = 1; if ( ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_FLOAT ) ) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_link-1, tmp)); - x->link[tmp].K_L = K_l; + x->link[tmp].K_L = K_l; } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -604,7 +604,7 @@ void pmpd2d_setLKTab(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id) { - x->link[i].K_L = K_l; + x->link[i].K_L = K_l; } } } @@ -613,13 +613,13 @@ void pmpd2d_setLKTab(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) void pmpd2d_setLDTab(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { int tmp, i; - t_float D_l = atom_getfloatarg(1, argc, argv); - if (D_l <= 0) D_l = 1; + t_float D_l = atom_getfloatarg(1, argc, argv); + if (D_l <= 0) D_l = 1; if ( ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_FLOAT ) ) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_link-1, tmp)); - x->link[tmp].D_L = D_l; + x->link[tmp].D_L = D_l; } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -627,7 +627,7 @@ void pmpd2d_setLDTab(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id) { - x->link[i].D_L = D_l; + x->link[i].D_L = D_l; } } } @@ -641,7 +641,7 @@ void pmpd2d_setLinkId(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_link-1, tmp)); - x->link[tmp].Id = atom_getsymbolarg(1, argc, argv); + x->link[tmp].Id = atom_getsymbolarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_SYMBOL ) ) { @@ -649,7 +649,7 @@ void pmpd2d_setLinkId(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id) { - x->link[i].Id = atom_getsymbolarg(1, argc, argv); + x->link[i].Id = atom_getsymbolarg(1, argc, argv); } } } @@ -663,7 +663,7 @@ void pmpd2d_setMassId(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].Id = atom_getsymbolarg(1, argc, argv); + x->mass[tmp].Id = atom_getsymbolarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_SYMBOL ) ) { @@ -671,7 +671,7 @@ void pmpd2d_setMassId(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].Id = atom_getsymbolarg(1, argc, argv); + x->mass[i].Id = atom_getsymbolarg(1, argc, argv); } } } @@ -686,7 +686,7 @@ void pmpd2d_forceX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].forceX += atom_getfloatarg(1, argc, argv); + x->mass[tmp].forceX += atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -694,7 +694,7 @@ void pmpd2d_forceX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].forceX += atom_getfloatarg(1, argc, argv); + x->mass[i].forceX += atom_getfloatarg(1, argc, argv); } } } @@ -709,7 +709,7 @@ void pmpd2d_forceY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].forceY += atom_getfloatarg(1, argc, argv); + x->mass[tmp].forceY += atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -717,7 +717,7 @@ void pmpd2d_forceY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].forceY += atom_getfloatarg(1, argc, argv); + x->mass[i].forceY += atom_getfloatarg(1, argc, argv); } } } @@ -732,8 +732,8 @@ void pmpd2d_force(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].forceX += atom_getfloatarg(1, argc, argv); - x->mass[tmp].forceY += atom_getfloatarg(2, argc, argv); + x->mass[tmp].forceX += atom_getfloatarg(1, argc, argv); + x->mass[tmp].forceY += atom_getfloatarg(2, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) ) { @@ -741,8 +741,8 @@ void pmpd2d_force(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].forceX += atom_getfloatarg(1, argc, argv); - x->mass[i].forceY += atom_getfloatarg(2, argc, argv); + x->mass[i].forceX += atom_getfloatarg(1, argc, argv); + x->mass[i].forceY += atom_getfloatarg(2, argc, argv); } } } @@ -757,8 +757,8 @@ void pmpd2d_posX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].posX = atom_getfloatarg(1, argc, argv); - x->mass[tmp].speedX = 0; + x->mass[tmp].posX = atom_getfloatarg(1, argc, argv); + x->mass[tmp].speedX = 0; x->mass[tmp].forceX = 0; } @@ -768,8 +768,8 @@ void pmpd2d_posX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].posX = atom_getfloatarg(1, argc, argv); - x->mass[i].speedX = 0; + x->mass[i].posX = atom_getfloatarg(1, argc, argv); + x->mass[i].speedX = 0; x->mass[i].forceX = 0; } @@ -786,8 +786,8 @@ void pmpd2d_posY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].posY = atom_getfloatarg(1, argc, argv); - x->mass[tmp].speedY = 0; + x->mass[tmp].posY = atom_getfloatarg(1, argc, argv); + x->mass[tmp].speedY = 0; x->mass[tmp].forceY = 0; } @@ -797,8 +797,8 @@ void pmpd2d_posY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].posY = atom_getfloatarg(1, argc, argv); - x->mass[i].speedY = 0; + x->mass[i].posY = atom_getfloatarg(1, argc, argv); + x->mass[i].speedY = 0; x->mass[i].forceY = 0; } } @@ -814,11 +814,11 @@ void pmpd2d_pos(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].posX = atom_getfloatarg(1, argc, argv); - x->mass[tmp].speedX = 0; + x->mass[tmp].posX = atom_getfloatarg(1, argc, argv); + x->mass[tmp].speedX = 0; x->mass[tmp].forceX = 0; - x->mass[tmp].posY = atom_getfloatarg(2, argc, argv); - x->mass[tmp].speedY = 0; + x->mass[tmp].posY = atom_getfloatarg(2, argc, argv); + x->mass[tmp].speedY = 0; x->mass[tmp].forceY = 0; } @@ -828,11 +828,11 @@ void pmpd2d_pos(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].posX = atom_getfloatarg(1, argc, argv); - x->mass[i].speedX = 0; + x->mass[i].posX = atom_getfloatarg(1, argc, argv); + x->mass[i].speedX = 0; x->mass[i].forceX = 0; x->mass[i].posY = atom_getfloatarg(2, argc, argv); - x->mass[i].speedY = 0; + x->mass[i].speedY = 0; x->mass[i].forceY = 0; } @@ -842,34 +842,34 @@ void pmpd2d_pos(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) void pmpd2d_minX(t_pmpd2d *x, t_float min) { - x->minX = min; + x->minX = min; } void pmpd2d_maxX(t_pmpd2d *x, t_float max) { - x->maxX = max; + x->maxX = max; } void pmpd2d_minY(t_pmpd2d *x, t_float min) { - x->minY = min; + x->minY = min; } void pmpd2d_maxY(t_pmpd2d *x, t_float max) { - x->maxY = max; + x->maxY = max; } void pmpd2d_min(t_pmpd2d *x, t_float minX, t_float minY) { - x->minX = minX; - x->minY = minY; + x->minX = minX; + x->minY = minY; } void pmpd2d_max(t_pmpd2d *x, t_float maxX, t_float maxY) { - x->maxX = maxX; - x->maxY = maxY; + x->maxX = maxX; + x->maxY = maxY; } void pmpd2d_setFixed(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -880,7 +880,7 @@ void pmpd2d_setFixed(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].mobile = 0; + x->mass[tmp].mobile = 0; } if ( argv[0].a_type == A_SYMBOL ) { @@ -888,7 +888,7 @@ void pmpd2d_setFixed(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].mobile = 0; + x->mass[i].mobile = 0; } } } @@ -902,7 +902,7 @@ void pmpd2d_setMobile(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].mobile = 1; + x->mass[tmp].mobile = 1; } if ( argv[0].a_type == A_SYMBOL ) { @@ -910,7 +910,7 @@ void pmpd2d_setMobile(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].mobile = 1; + x->mass[i].mobile = 1; } } } @@ -924,7 +924,7 @@ void pmpd2d_setD2(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].D2 = atom_getfloatarg(1, argc, argv); + x->mass[tmp].D2 = atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -932,7 +932,7 @@ void pmpd2d_setD2(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].D2 = atom_getfloatarg(1, argc, argv); + x->mass[i].D2 = atom_getfloatarg(1, argc, argv); } } } @@ -940,7 +940,7 @@ void pmpd2d_setD2(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { for (i=0; i< x->nb_mass; i++) { - x->mass[i].D2 = atom_getfloatarg(0, argc, argv); + x->mass[i].D2 = atom_getfloatarg(0, argc, argv); } } } @@ -953,7 +953,7 @@ void pmpd2d_setD2offset(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].D2offset = atom_getfloatarg(1, argc, argv); + x->mass[tmp].D2offset = atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -961,7 +961,7 @@ void pmpd2d_setD2offset(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].D2offset = atom_getfloatarg(1, argc, argv); + x->mass[i].D2offset = atom_getfloatarg(1, argc, argv); } } } @@ -969,7 +969,7 @@ void pmpd2d_setD2offset(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { for (i=0; i< x->nb_mass; i++) { - x->mass[i].D2offset = atom_getfloatarg(0, argc, argv); + x->mass[i].D2offset = atom_getfloatarg(0, argc, argv); } } } @@ -982,7 +982,7 @@ void pmpd2d_setSpeedX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].speedX = atom_getfloatarg(1, argc, argv); + x->mass[tmp].speedX = atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -990,7 +990,7 @@ void pmpd2d_setSpeedX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].speedX = atom_getfloatarg(1, argc, argv); + x->mass[i].speedX = atom_getfloatarg(1, argc, argv); } } } @@ -1004,7 +1004,7 @@ void pmpd2d_setSpeedY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].speedY = atom_getfloatarg(1, argc, argv); + x->mass[tmp].speedY = atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -1012,7 +1012,7 @@ void pmpd2d_setSpeedY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].speedY = atom_getfloatarg(1, argc, argv); + x->mass[i].speedY = atom_getfloatarg(1, argc, argv); } } } @@ -1026,8 +1026,8 @@ void pmpd2d_setSpeed(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].speedX = atom_getfloatarg(1, argc, argv); - x->mass[tmp].speedY = atom_getfloatarg(2, argc, argv); + x->mass[tmp].speedX = atom_getfloatarg(1, argc, argv); + x->mass[tmp].speedY = atom_getfloatarg(2, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) ) { @@ -1035,8 +1035,8 @@ void pmpd2d_setSpeed(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].speedX = atom_getfloatarg(1, argc, argv); - x->mass[i].speedY = atom_getfloatarg(2, argc, argv); + x->mass[i].speedX = atom_getfloatarg(1, argc, argv); + x->mass[i].speedY = atom_getfloatarg(2, argc, argv); } } } @@ -1050,7 +1050,7 @@ void pmpd2d_addPosX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].posX += atom_getfloatarg(1, argc, argv); + x->mass[tmp].posX += atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -1058,7 +1058,7 @@ void pmpd2d_addPosX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].posX += atom_getfloatarg(1, argc, argv); + x->mass[i].posX += atom_getfloatarg(1, argc, argv); } } } @@ -1072,7 +1072,7 @@ void pmpd2d_addPosY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].posY += atom_getfloatarg(1, argc, argv); + x->mass[tmp].posY += atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -1080,7 +1080,7 @@ void pmpd2d_addPosY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].posY += atom_getfloatarg(1, argc, argv); + x->mass[i].posY += atom_getfloatarg(1, argc, argv); } } } @@ -1094,8 +1094,8 @@ void pmpd2d_addPos(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].posX += atom_getfloatarg(1, argc, argv); - x->mass[tmp].posY += atom_getfloatarg(2, argc, argv); + x->mass[tmp].posX += atom_getfloatarg(1, argc, argv); + x->mass[tmp].posY += atom_getfloatarg(2, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) ) { @@ -1103,8 +1103,8 @@ void pmpd2d_addPos(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].posX += atom_getfloatarg(1, argc, argv); - x->mass[i].posY += atom_getfloatarg(2, argc, argv); + x->mass[i].posX += atom_getfloatarg(1, argc, argv); + x->mass[i].posY += atom_getfloatarg(2, argc, argv); } } } @@ -1118,7 +1118,7 @@ void pmpd2d_setForceX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].forceX = atom_getfloatarg(1, argc, argv); + x->mass[tmp].forceX = atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -1126,7 +1126,7 @@ void pmpd2d_setForceX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].forceX = atom_getfloatarg(1, argc, argv); + x->mass[i].forceX = atom_getfloatarg(1, argc, argv); } } } @@ -1140,7 +1140,7 @@ void pmpd2d_setForceY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].forceY = atom_getfloatarg(1, argc, argv); + x->mass[tmp].forceY = atom_getfloatarg(1, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -1148,7 +1148,7 @@ void pmpd2d_setForceY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].forceY = atom_getfloatarg(1, argc, argv); + x->mass[i].forceY = atom_getfloatarg(1, argc, argv); } } } @@ -1162,8 +1162,8 @@ void pmpd2d_setForce(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_mass-1, tmp)); - x->mass[tmp].forceX = atom_getfloatarg(1, argc, argv); - x->mass[tmp].forceY = atom_getfloatarg(2, argc, argv); + x->mass[tmp].forceX = atom_getfloatarg(1, argc, argv); + x->mass[tmp].forceY = atom_getfloatarg(2, argc, argv); } if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) ) { @@ -1171,8 +1171,8 @@ void pmpd2d_setForce(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { - x->mass[i].forceX = atom_getfloatarg(1, argc, argv); - x->mass[i].forceY = atom_getfloatarg(2, argc, argv); + x->mass[i].forceX = atom_getfloatarg(1, argc, argv); + x->mass[i].forceY = atom_getfloatarg(2, argc, argv); } } } @@ -1242,7 +1242,7 @@ void pmpd2d_get(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { SETSYMBOL(&(toout[0]), x->mass[i].Id); SETFLOAT(&(toout[1]), x->mass[i].posX); - SETFLOAT(&(toout[2]), x->mass[i].posY); + SETFLOAT(&(toout[2]), x->mass[i].posY); outlet_anything(x->main_outlet, gensym("massesPosNameId"), 3, toout); } } @@ -1279,7 +1279,7 @@ void pmpd2d_get(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { SETFLOAT(&(toout[0]), i); SETFLOAT(&(toout[1]), x->mass[i].speedX); - SETFLOAT(&(toout[2]), x->mass[i].speedY); + SETFLOAT(&(toout[2]), x->mass[i].speedY); outlet_anything(x->main_outlet, gensym("massesSpeedsId"), 3, toout); } } @@ -1316,7 +1316,7 @@ void pmpd2d_get(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { SETSYMBOL(&(toout[0]), x->mass[i].Id); SETFLOAT(&(toout[1]), x->mass[i].speedX); - SETFLOAT(&(toout[2]), x->mass[i].speedY); + SETFLOAT(&(toout[2]), x->mass[i].speedY); outlet_anything(x->main_outlet, gensym("massesSpeedsNameId"), 3, toout); } } @@ -1353,7 +1353,7 @@ void pmpd2d_get(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { SETFLOAT(&(toout[0]), i); SETFLOAT(&(toout[1]), x->mass[i].forceX); - SETFLOAT(&(toout[2]), x->mass[i].forceY); + SETFLOAT(&(toout[2]), x->mass[i].forceY); outlet_anything(x->main_outlet, gensym("massesForcesId"), 3, toout); } } @@ -1390,7 +1390,7 @@ void pmpd2d_get(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { SETSYMBOL(&(toout[0]), x->mass[i].Id); SETFLOAT(&(toout[1]), x->mass[i].forceX); - SETFLOAT(&(toout[2]), x->mass[i].forceY); + SETFLOAT(&(toout[2]), x->mass[i].forceY); outlet_anything(x->main_outlet, gensym("massesForcesNameId"), 3, toout); } } @@ -1427,12 +1427,12 @@ void pmpd2d_get(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { if ( atom_getsymbolarg(1,argc,argv) == x->link[i].Id) { - SETFLOAT(&(toout[0]), i); - SETFLOAT(&(toout[1]), x->link[i].mass1->posX); - SETFLOAT(&(toout[2]), x->link[i].mass1->posY); - SETFLOAT(&(toout[3]), x->link[i].mass2->posX); - SETFLOAT(&(toout[4]), x->link[i].mass2->posY); - outlet_anything(x->main_outlet, gensym("linksPosNo"), 5, toout); + SETFLOAT(&(toout[0]), i); + SETFLOAT(&(toout[1]), x->link[i].mass1->posX); + SETFLOAT(&(toout[2]), x->link[i].mass1->posY); + SETFLOAT(&(toout[3]), x->link[i].mass2->posX); + SETFLOAT(&(toout[4]), x->link[i].mass2->posY); + outlet_anything(x->main_outlet, gensym("linksPosNo"), 5, toout); } } } @@ -1539,46 +1539,46 @@ void pmpd2d_massesPosXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_word *vec; if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->mass[i].posX; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = x->mass[j].posX; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->mass[i].posX; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = x->mass[j].posX; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesSpeedsXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -1588,47 +1588,47 @@ void pmpd2d_massesSpeedsXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_word *vec; if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->mass[i].speedX; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = x->mass[j].speedX; - i++; - } - j++; - } - garray_redraw(a); - } - } + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->mass[i].speedX; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = x->mass[j].speedX; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesForcesXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -1639,46 +1639,46 @@ void pmpd2d_massesForcesXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->mass[i].forceX; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = x->mass[j].forceX; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->mass[i].forceX; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = x->mass[j].forceX; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesPosYL(t_pmpd2d *x) @@ -1725,46 +1725,46 @@ void pmpd2d_massesPosYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->mass[i].posY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = x->mass[j].posY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->mass[i].posY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = x->mass[j].posY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesSpeedsYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -1775,46 +1775,46 @@ void pmpd2d_massesSpeedsYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->mass[i].speedY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = x->mass[j].speedY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->mass[i].speedY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = x->mass[j].speedY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesForcesYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -1825,46 +1825,46 @@ void pmpd2d_massesForcesYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->mass[i].forceY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = x->mass[j].forceY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->mass[i].forceY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = x->mass[j].forceY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesPosL(t_pmpd2d *x) @@ -1914,49 +1914,49 @@ void pmpd2d_massesPosT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, (vecsize-1)/2); - for (i=0; i < taille_max ; i++) - { - vec[2*i ].w_float = x->mass[i].posX; - vec[2*i+1].w_float = x->mass[i].posY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize-1) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = x->mass[j].posX; - i++; - vec[i].w_float = x->mass[j].posY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, (vecsize-1)/2); + for (i=0; i < taille_max ; i++) + { + vec[2*i ].w_float = x->mass[i].posX; + vec[2*i+1].w_float = x->mass[i].posY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize-1) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = x->mass[j].posX; + i++; + vec[i].w_float = x->mass[j].posY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesSpeedsT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -1967,49 +1967,49 @@ void pmpd2d_massesSpeedsT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, (vecsize-1)/2); - for (i=0; i < taille_max ; i++) - { - vec[2*i ].w_float = x->mass[i].speedX; - vec[2*i+1].w_float = x->mass[i].speedY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize-1) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = x->mass[j].speedX; - i++; - vec[i].w_float = x->mass[j].speedY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, (vecsize-1)/2); + for (i=0; i < taille_max ; i++) + { + vec[2*i ].w_float = x->mass[i].speedX; + vec[2*i+1].w_float = x->mass[i].speedY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize-1) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = x->mass[j].speedX; + i++; + vec[i].w_float = x->mass[j].speedY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesForcesT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -2020,49 +2020,49 @@ void pmpd2d_massesForcesT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, (vecsize-1)/2); - for (i=0; i < taille_max ; i++) - { - vec[2*i ].w_float = x->mass[i].forceX; - vec[2*i+1].w_float = x->mass[i].forceY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize-1) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = x->mass[j].forceX; - i++; - vec[i].w_float = x->mass[j].forceY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, (vecsize-1)/2); + for (i=0; i < taille_max ; i++) + { + vec[2*i ].w_float = x->mass[i].forceX; + vec[2*i+1].w_float = x->mass[i].forceY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize-1) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = x->mass[j].forceX; + i++; + vec[i].w_float = x->mass[j].forceY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesPosNormL(t_pmpd2d *x) @@ -2109,46 +2109,46 @@ void pmpd2d_massesPosNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = sqrt(sqr(x->mass[i].posX)+sqr(x->mass[i].posY)); - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = sqrt(sqr(x->mass[j].posX)+sqr(x->mass[j].posY)); - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = sqrt(sqr(x->mass[i].posX)+sqr(x->mass[i].posY)); + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = sqrt(sqr(x->mass[j].posX)+sqr(x->mass[j].posY)); + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesSpeedsNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -2160,46 +2160,46 @@ void pmpd2d_massesSpeedsNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = sqrt(sqr(x->mass[i].speedX)+sqr(x->mass[i].speedY)); - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = sqrt(sqr(x->mass[j].speedX)+sqr(x->mass[j].speedY)); - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = sqrt(sqr(x->mass[i].speedX)+sqr(x->mass[i].speedY)); + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = sqrt(sqr(x->mass[j].speedX)+sqr(x->mass[j].speedY)); + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesForcesNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -2210,46 +2210,46 @@ void pmpd2d_massesForcesNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_mass; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = sqrt(sqr(x->mass[i].forceX)+sqr(x->mass[i].forceY)); - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_mass)) - { - if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) - { - vec[i].w_float = sqrt(sqr(x->mass[j].forceX)+sqr(x->mass[j].forceY)); - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_mass; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = sqrt(sqr(x->mass[i].forceX)+sqr(x->mass[i].forceY)); + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_mass)) + { + if (atom_getsymbolarg(1,argc,argv) == x->mass[j].Id) + { + vec[i].w_float = sqrt(sqr(x->mass[j].forceX)+sqr(x->mass[j].forceY)); + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_massesPosMean(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -2258,39 +2258,39 @@ void pmpd2d_massesPosMean(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_int i,j; t_atom mean[3]; - sommeX = 0; - sommeY = 0; - somme = 0; - j = 0; - + sommeX = 0; + sommeY = 0; + somme = 0; + j = 0; + if ( (argc >= 1) && (argv[0].a_type == A_SYMBOL) ) { - for (i=0; i< x->nb_mass; i++) - { - if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) - { - sommeX += x->mass[i].posX; - sommeY += x->mass[i].posY; - somme += sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY)); // distance au centre - j++; - } - } - } - else - { - for (i=0; i< x->nb_mass; i++) - { - sommeX += x->mass[i].posX; - sommeY += x->mass[i].posY; - somme += sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY)); // distance au centre - j++; - } - } - - sommeX /= j; - sommeY /= j; - somme /= j; - + for (i=0; i< x->nb_mass; i++) + { + if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) + { + sommeX += x->mass[i].posX; + sommeY += x->mass[i].posY; + somme += sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY)); // distance au centre + j++; + } + } + } + else + { + for (i=0; i< x->nb_mass; i++) + { + sommeX += x->mass[i].posX; + sommeY += x->mass[i].posY; + somme += sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY)); // distance au centre + j++; + } + } + + sommeX /= j; + sommeY /= j; + somme /= j; + SETFLOAT(&(mean[0]),sommeX); SETFLOAT(&(mean[1]),sommeY); SETFLOAT(&(mean[2]),somme); @@ -2305,62 +2305,62 @@ void pmpd2d_massesPosStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_float stdX, stdY,std; t_atom std_out[3]; - sommeX = 0; - sommeY = 0; - somme = 0; - stdX = 0; - stdY = 0; - std = 0; - j = 0; - + sommeX = 0; + sommeY = 0; + somme = 0; + stdX = 0; + stdY = 0; + std = 0; + j = 0; + if ( (argc >= 1) && (argv[0].a_type == A_SYMBOL) ) { - for (i=0; i< x->nb_mass; i++) - { - if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) - { - sommeX += x->mass[i].posX; - sommeY += x->mass[i].posY; - somme += sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY)); // distance au centre - j++; - } - } - sommeX /= j; - sommeY /= j; - somme /= j; - for (i=0; i< x->nb_mass; i++) - { - if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) - { - stdX += sqr(x->mass[i].posX-sommeX); - stdY += sqr(x->mass[i].posY-sommeY); - std += sqr(sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY))-somme); - } - } - } - else - { - for (i=0; i< x->nb_mass; i++) - { - sommeX += x->mass[i].posX; - sommeY += x->mass[i].posY; - somme += sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY)); // distance au centre - j++; - } - sommeX /= j; - sommeY /= j; - somme /= j; - for (i=0; i< x->nb_mass; i++) - { - stdX += sqr(x->mass[i].posX-sommeX); - stdY += sqr(x->mass[i].posY-sommeY); - std += sqr(sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY))-somme); - } - } - - stdX = sqrt(stdX/j); - stdY = sqrt(stdY/j); - std = sqrt(std /j); + for (i=0; i< x->nb_mass; i++) + { + if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) + { + sommeX += x->mass[i].posX; + sommeY += x->mass[i].posY; + somme += sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY)); // distance au centre + j++; + } + } + sommeX /= j; + sommeY /= j; + somme /= j; + for (i=0; i< x->nb_mass; i++) + { + if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) + { + stdX += sqr(x->mass[i].posX-sommeX); + stdY += sqr(x->mass[i].posY-sommeY); + std += sqr(sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY))-somme); + } + } + } + else + { + for (i=0; i< x->nb_mass; i++) + { + sommeX += x->mass[i].posX; + sommeY += x->mass[i].posY; + somme += sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY)); // distance au centre + j++; + } + sommeX /= j; + sommeY /= j; + somme /= j; + for (i=0; i< x->nb_mass; i++) + { + stdX += sqr(x->mass[i].posX-sommeX); + stdY += sqr(x->mass[i].posY-sommeY); + std += sqr(sqrt(sqr(x->mass[i].posX) + sqr(x->mass[i].posY))-somme); + } + } + + stdX = sqrt(stdX/j); + stdY = sqrt(stdY/j); + std = sqrt(std /j); SETFLOAT(&(std_out[0]),stdX); SETFLOAT(&(std_out[1]),stdY); @@ -2375,39 +2375,39 @@ void pmpd2d_massesForcesMean(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_int i,j; t_atom mean[3]; - sommeX = 0; - sommeY = 0; - somme = 0; - j = 0; - + sommeX = 0; + sommeY = 0; + somme = 0; + j = 0; + if ( (argc >= 1) && (argv[0].a_type == A_SYMBOL) ) { - for (i=0; i< x->nb_mass; i++) - { - if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) - { - sommeX += x->mass[i].forceX; - sommeY += x->mass[i].forceY; - somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY)); // distance au centre - j++; - } - } - } - else - { - for (i=0; i< x->nb_mass; i++) - { - sommeX += x->mass[i].forceX; - sommeY += x->mass[i].forceY; - somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY)); // distance au centre - j++; - } - } - - sommeX /= j; - sommeY /= j; - somme /= j; - + for (i=0; i< x->nb_mass; i++) + { + if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) + { + sommeX += x->mass[i].forceX; + sommeY += x->mass[i].forceY; + somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY)); // distance au centre + j++; + } + } + } + else + { + for (i=0; i< x->nb_mass; i++) + { + sommeX += x->mass[i].forceX; + sommeY += x->mass[i].forceY; + somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY)); // distance au centre + j++; + } + } + + sommeX /= j; + sommeY /= j; + somme /= j; + SETFLOAT(&(mean[0]),sommeX); SETFLOAT(&(mean[1]),sommeY); SETFLOAT(&(mean[2]),somme); @@ -2422,62 +2422,62 @@ void pmpd2d_massesForcesStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_float stdX, stdY,std; t_atom std_out[3]; - sommeX = 0; - sommeY = 0; - somme = 0; - stdX = 0; - stdY = 0; - std = 0; - j = 0; - + sommeX = 0; + sommeY = 0; + somme = 0; + stdX = 0; + stdY = 0; + std = 0; + j = 0; + if ( (argc >= 1) && (argv[0].a_type == A_SYMBOL) ) { - for (i=0; i< x->nb_mass; i++) - { - if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) - { - sommeX += x->mass[i].forceX; - sommeY += x->mass[i].forceY; - somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY)); // distance au centre - j++; - } - } - sommeX /= j; - sommeY /= j; - somme /= j; - for (i=0; i< x->nb_mass; i++) - { - if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) - { - stdX += sqr(x->mass[i].forceX-sommeX); - stdY += sqr(x->mass[i].forceY-sommeY); - std += sqr(sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY))-somme); - } - } - } - else - { - for (i=0; i< x->nb_mass; i++) - { - sommeX += x->mass[i].forceX; - sommeY += x->mass[i].forceY; - somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY)); // distance au centre - j++; - } - sommeX /= j; - sommeY /= j; - somme /= j; - for (i=0; i< x->nb_mass; i++) - { - stdX += sqr(x->mass[i].forceX-sommeX); - stdY += sqr(x->mass[i].forceY-sommeY); - std += sqr(sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY))-somme); - } - } - - stdX = sqrt(stdX/j); - stdY = sqrt(stdY/j); - std = sqrt(std /j); + for (i=0; i< x->nb_mass; i++) + { + if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) + { + sommeX += x->mass[i].forceX; + sommeY += x->mass[i].forceY; + somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY)); // distance au centre + j++; + } + } + sommeX /= j; + sommeY /= j; + somme /= j; + for (i=0; i< x->nb_mass; i++) + { + if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) + { + stdX += sqr(x->mass[i].forceX-sommeX); + stdY += sqr(x->mass[i].forceY-sommeY); + std += sqr(sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY))-somme); + } + } + } + else + { + for (i=0; i< x->nb_mass; i++) + { + sommeX += x->mass[i].forceX; + sommeY += x->mass[i].forceY; + somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY)); // distance au centre + j++; + } + sommeX /= j; + sommeY /= j; + somme /= j; + for (i=0; i< x->nb_mass; i++) + { + stdX += sqr(x->mass[i].forceX-sommeX); + stdY += sqr(x->mass[i].forceY-sommeY); + std += sqr(sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY))-somme); + } + } + + stdX = sqrt(stdX/j); + stdY = sqrt(stdY/j); + std = sqrt(std /j); SETFLOAT(&(std_out[0]),stdX); SETFLOAT(&(std_out[1]),stdY); @@ -2492,39 +2492,39 @@ void pmpd2d_massesSpeedsMean(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_int i,j; t_atom mean[3]; - sommeX = 0; - sommeY = 0; - somme = 0; - j = 0; - + sommeX = 0; + sommeY = 0; + somme = 0; + j = 0; + if ( (argc >= 1) && (argv[0].a_type == A_SYMBOL) ) { - for (i=0; i< x->nb_mass; i++) - { - if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) - { - sommeX += x->mass[i].speedX; - sommeY += x->mass[i].speedY; - somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY)); // distance au centre - j++; - } - } - } - else - { - for (i=0; i< x->nb_mass; i++) - { - sommeX += x->mass[i].speedX; - sommeY += x->mass[i].speedY; - somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY)); // distance au centre - j++; - } - } - - sommeX /= j; - sommeY /= j; - somme /= j; - + for (i=0; i< x->nb_mass; i++) + { + if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) + { + sommeX += x->mass[i].speedX; + sommeY += x->mass[i].speedY; + somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY)); // distance au centre + j++; + } + } + } + else + { + for (i=0; i< x->nb_mass; i++) + { + sommeX += x->mass[i].speedX; + sommeY += x->mass[i].speedY; + somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY)); // distance au centre + j++; + } + } + + sommeX /= j; + sommeY /= j; + somme /= j; + SETFLOAT(&(mean[0]),sommeX); SETFLOAT(&(mean[1]),sommeY); SETFLOAT(&(mean[2]),somme); @@ -2539,62 +2539,62 @@ void pmpd2d_massesSpeedsStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_float stdX, stdY,std; t_atom std_out[3]; - sommeX = 0; - sommeY = 0; - somme = 0; - stdX = 0; - stdY = 0; - std = 0; - j = 0; - + sommeX = 0; + sommeY = 0; + somme = 0; + stdX = 0; + stdY = 0; + std = 0; + j = 0; + if ( (argc >= 1) && (argv[0].a_type == A_SYMBOL) ) { - for (i=0; i< x->nb_mass; i++) - { - if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) - { - sommeX += x->mass[i].speedX; - sommeY += x->mass[i].speedY; - somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY)); // distance au centre - j++; - } - } - sommeX /= j; - sommeY /= j; - somme /= j; - for (i=0; i< x->nb_mass; i++) - { - if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) - { - stdX += sqr(x->mass[i].speedX-sommeX); - stdY += sqr(x->mass[i].speedY-sommeY); - std += sqr(sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY))-somme); - } - } - } - else - { - for (i=0; i< x->nb_mass; i++) - { - sommeX += x->mass[i].speedX; - sommeY += x->mass[i].speedY; - somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY)); // distance au centre - j++; - } - sommeX /= j; - sommeY /= j; - somme /= j; - for (i=0; i< x->nb_mass; i++) - { - stdX += sqr(x->mass[i].speedX-sommeX); - stdY += sqr(x->mass[i].speedY-sommeY); - std += sqr(sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY))-somme); - } - } - - stdX = sqrt(stdX/j); - stdY = sqrt(stdY/j); - std = sqrt(std /j); + for (i=0; i< x->nb_mass; i++) + { + if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) + { + sommeX += x->mass[i].speedX; + sommeY += x->mass[i].speedY; + somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY)); // distance au centre + j++; + } + } + sommeX /= j; + sommeY /= j; + somme /= j; + for (i=0; i< x->nb_mass; i++) + { + if (atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) + { + stdX += sqr(x->mass[i].speedX-sommeX); + stdY += sqr(x->mass[i].speedY-sommeY); + std += sqr(sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY))-somme); + } + } + } + else + { + for (i=0; i< x->nb_mass; i++) + { + sommeX += x->mass[i].speedX; + sommeY += x->mass[i].speedY; + somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY)); // distance au centre + j++; + } + sommeX /= j; + sommeY /= j; + somme /= j; + for (i=0; i< x->nb_mass; i++) + { + stdX += sqr(x->mass[i].speedX-sommeX); + stdY += sqr(x->mass[i].speedY-sommeY); + std += sqr(sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY))-somme); + } + } + + stdX = sqrt(stdX/j); + stdY = sqrt(stdY/j); + std = sqrt(std /j); SETFLOAT(&(std_out[0]),stdX); SETFLOAT(&(std_out[1]),stdY); @@ -2661,46 +2661,46 @@ void pmpd2d_linksPosXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = (x->link[i].mass1->posX + x->link[i].mass2->posX)/2; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = (x->link[j].mass1->posX + x->link[j].mass2->posX)/2; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = (x->link[i].mass1->posX + x->link[i].mass2->posX)/2; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = (x->link[j].mass1->posX + x->link[j].mass2->posX)/2; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksLengthXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -2711,46 +2711,46 @@ void pmpd2d_linksLengthXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->link[i].mass2->posX - x->link[i].mass1->posX; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = x->link[j].mass2->posX - x->link[j].mass1->posX; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->link[i].mass2->posX - x->link[i].mass1->posX; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = x->link[j].mass2->posX - x->link[j].mass1->posX; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksPosSpeedXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -2761,46 +2761,46 @@ void pmpd2d_linksPosSpeedXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = (x->link[i].mass1->speedX + x->link[i].mass2->speedX)/2; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = (x->link[j].mass1->speedX + x->link[j].mass2->speedX)/2; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = (x->link[i].mass1->speedX + x->link[i].mass2->speedX)/2; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = (x->link[j].mass1->speedX + x->link[j].mass2->speedX)/2; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksLengthSpeedXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -2811,46 +2811,46 @@ void pmpd2d_linksLengthSpeedXT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->link[i].mass2->speedX - x->link[i].mass1->speedX; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = x->link[j].mass2->speedX - x->link[j].mass1->speedX; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->link[i].mass2->speedX - x->link[i].mass1->speedX; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = x->link[j].mass2->speedX - x->link[j].mass1->speedX; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksPosYL(t_pmpd2d *x) @@ -2909,46 +2909,46 @@ void pmpd2d_linksPosYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = (x->link[i].mass1->posY + x->link[i].mass2->posY)/2; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = (x->link[j].mass1->posY + x->link[j].mass2->posY)/2; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = (x->link[i].mass1->posY + x->link[i].mass2->posY)/2; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = (x->link[j].mass1->posY + x->link[j].mass2->posY)/2; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksLengthYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -2959,46 +2959,46 @@ void pmpd2d_linksLengthYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->link[i].mass2->posY - x->link[i].mass1->posY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = x->link[j].mass2->posY - x->link[j].mass1->posY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->link[i].mass2->posY - x->link[i].mass1->posY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = x->link[j].mass2->posY - x->link[j].mass1->posY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksPosSpeedYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -3009,46 +3009,46 @@ void pmpd2d_linksPosSpeedYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = (x->link[i].mass1->speedY + x->link[i].mass2->speedY)/2; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = (x->link[j].mass1->speedY + x->link[j].mass2->speedY)/2; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = (x->link[i].mass1->speedY + x->link[i].mass2->speedY)/2; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = (x->link[j].mass1->speedY + x->link[j].mass2->speedY)/2; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksLengthSpeedYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -3059,46 +3059,46 @@ void pmpd2d_linksLengthSpeedYT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = x->link[i].mass2->speedY - x->link[i].mass1->speedY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = x->link[j].mass2->speedY - x->link[j].mass1->speedY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = x->link[i].mass2->speedY - x->link[i].mass1->speedY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = x->link[j].mass2->speedY - x->link[j].mass1->speedY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksPosL(t_pmpd2d *x) @@ -3161,49 +3161,49 @@ void pmpd2d_linksPosT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, (vecsize-2)/2); - for (i=0; i < taille_max ; i++) - { - vec[2*i ].w_float = (x->link[i].mass2->posX + x->link[i].mass1->posX)/2; - vec[2*i+1].w_float = (x->link[i].mass2->posY + x->link[i].mass1->posY)/2; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = (x->link[j].mass2->posX + x->link[j].mass1->posX)/2; - i++; - vec[i].w_float = (x->link[j].mass2->posY + x->link[j].mass1->posY)/2; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, (vecsize-2)/2); + for (i=0; i < taille_max ; i++) + { + vec[2*i ].w_float = (x->link[i].mass2->posX + x->link[i].mass1->posX)/2; + vec[2*i+1].w_float = (x->link[i].mass2->posY + x->link[i].mass1->posY)/2; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize-2) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = (x->link[j].mass2->posX + x->link[j].mass1->posX)/2; + i++; + vec[i].w_float = (x->link[j].mass2->posY + x->link[j].mass1->posY)/2; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksLengthT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -3214,49 +3214,49 @@ void pmpd2d_linksLengthT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, (vecsize-2)/2); - for (i=0; i < taille_max ; i++) - { - vec[2*i ].w_float = x->link[i].mass2->posX - x->link[i].mass1->posX; - vec[2*i+1].w_float = x->link[i].mass2->posY - x->link[i].mass1->posY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = x->link[j].mass2->posX + x->link[j].mass1->posX; - i++; - vec[i].w_float = x->link[j].mass2->posY + x->link[j].mass1->posY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, (vecsize-2)/2); + for (i=0; i < taille_max ; i++) + { + vec[2*i ].w_float = x->link[i].mass2->posX - x->link[i].mass1->posX; + vec[2*i+1].w_float = x->link[i].mass2->posY - x->link[i].mass1->posY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize-2) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = x->link[j].mass2->posX + x->link[j].mass1->posX; + i++; + vec[i].w_float = x->link[j].mass2->posY + x->link[j].mass1->posY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksPosSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -3267,49 +3267,49 @@ void pmpd2d_linksPosSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, (vecsize-2)/2); - for (i=0; i < taille_max ; i++) - { - vec[2*i ].w_float = (x->link[i].mass2->speedX + x->link[i].mass1->speedX)/2; - vec[2*i+1].w_float = (x->link[i].mass2->speedY + x->link[i].mass1->speedY)/2; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = (x->link[j].mass2->speedX + x->link[j].mass1->speedX)/2; - i++; - vec[i].w_float = (x->link[j].mass2->speedY + x->link[j].mass1->speedY)/2; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, (vecsize-2)/2); + for (i=0; i < taille_max ; i++) + { + vec[2*i ].w_float = (x->link[i].mass2->speedX + x->link[i].mass1->speedX)/2; + vec[2*i+1].w_float = (x->link[i].mass2->speedY + x->link[i].mass1->speedY)/2; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize-2) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = (x->link[j].mass2->speedX + x->link[j].mass1->speedX)/2; + i++; + vec[i].w_float = (x->link[j].mass2->speedY + x->link[j].mass1->speedY)/2; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksLengthSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -3320,49 +3320,49 @@ void pmpd2d_linksLengthSpeedT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, (vecsize-2)/2); - for (i=0; i < taille_max ; i++) - { - vec[2*i ].w_float = x->link[i].mass2->speedX - x->link[i].mass1->speedX; - vec[2*i+1].w_float = x->link[i].mass2->speedY - x->link[i].mass1->speedY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize-2) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = x->link[j].mass2->speedX + x->link[j].mass1->speedX; - i++; - vec[i].w_float = x->link[j].mass2->speedY + x->link[j].mass1->speedY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, (vecsize-2)/2); + for (i=0; i < taille_max ; i++) + { + vec[2*i ].w_float = x->link[i].mass2->speedX - x->link[i].mass1->speedX; + vec[2*i+1].w_float = x->link[i].mass2->speedY - x->link[i].mass1->speedY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize-2) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = x->link[j].mass2->speedX + x->link[j].mass1->speedX; + i++; + vec[i].w_float = x->link[j].mass2->speedY + x->link[j].mass1->speedY; + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksPosNormL(t_pmpd2d *x) @@ -3373,8 +3373,8 @@ void pmpd2d_linksPosNormL(t_pmpd2d *x) for (i=0; i < x->nb_link; i++) { SETFLOAT(&(pos_list[i]),sqrt( \ - sqr((x->link[i].mass1->posX + x->link[i].mass2->posX)/2) + \ - sqr((x->link[i].mass1->posY + x->link[i].mass2->posY)/2) )); + sqr((x->link[i].mass1->posX + x->link[i].mass2->posX)/2) + \ + sqr((x->link[i].mass1->posY + x->link[i].mass2->posY)/2) )); } outlet_anything(x->main_outlet, gensym("linksPosNormL"),x->nb_link , pos_list); } @@ -3387,8 +3387,8 @@ void pmpd2d_linksLengthNormL(t_pmpd2d *x) for (i=0; i < x->nb_link; i++) { SETFLOAT(&(pos_list[i]),sqrt( \ - sqr(x->link[i].mass2->posX - x->link[i].mass1->posX) + \ - sqr(x->link[i].mass2->posY - x->link[i].mass1->posY) )); + sqr(x->link[i].mass2->posX - x->link[i].mass1->posX) + \ + sqr(x->link[i].mass2->posY - x->link[i].mass1->posY) )); } outlet_anything(x->main_outlet, gensym("linksLengthNormL"),x->nb_link , pos_list); } @@ -3401,8 +3401,8 @@ void pmpd2d_linksPosSpeedNormL(t_pmpd2d *x) for (i=0; i < x->nb_link; i++) { SETFLOAT(&(pos_list[i]),sqrt( \ - sqr((x->link[i].mass1->speedX + x->link[i].mass2->speedX)/2) + \ - sqr((x->link[i].mass1->speedY + x->link[i].mass2->speedY)/2) )); + sqr((x->link[i].mass1->speedX + x->link[i].mass2->speedX)/2) + \ + sqr((x->link[i].mass1->speedY + x->link[i].mass2->speedY)/2) )); } outlet_anything(x->main_outlet, gensym("linksPosSpeedNormL"),x->nb_link , pos_list); } @@ -3415,8 +3415,8 @@ void pmpd2d_linksLengthSpeedNormL(t_pmpd2d *x) for (i=0; i < x->nb_link; i++) { SETFLOAT(&(pos_list[i]),sqrt( \ - sqr(x->link[i].mass2->speedX - x->link[i].mass1->speedX) + \ - sqr(x->link[i].mass2->speedY - x->link[i].mass1->speedY) )); + sqr(x->link[i].mass2->speedX - x->link[i].mass1->speedX) + \ + sqr(x->link[i].mass2->speedY - x->link[i].mass1->speedY) )); } outlet_anything(x->main_outlet, gensym("linksLengthSpeedNormL"),x->nb_link , pos_list); } @@ -3429,50 +3429,50 @@ void pmpd2d_linksPosNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = sqrt( \ - sqr((x->link[i].mass1->posX + x->link[i].mass2->posX)/2) + \ - sqr((x->link[i].mass1->posY + x->link[i].mass2->posY)/2) ); - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[j].w_float = sqrt( \ - sqr((x->link[j].mass1->posX + x->link[j].mass2->posX)/2) + \ - sqr((x->link[j].mass1->posY + x->link[j].mass2->posY)/2) ); - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = sqrt( \ + sqr((x->link[i].mass1->posX + x->link[i].mass2->posX)/2) + \ + sqr((x->link[i].mass1->posY + x->link[i].mass2->posY)/2) ); + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[j].w_float = sqrt( \ + sqr((x->link[j].mass1->posX + x->link[j].mass2->posX)/2) + \ + sqr((x->link[j].mass1->posY + x->link[j].mass2->posY)/2) ); + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksLengthNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -3483,50 +3483,50 @@ void pmpd2d_linksLengthNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = sqrt( \ - sqr(x->link[i].mass2->posX - x->link[i].mass1->posX) + \ - sqr(x->link[i].mass2->posY - x->link[i].mass1->posY) ); - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = sqrt( \ - sqr(x->link[j].mass2->posX - x->link[j].mass1->posX) + \ - sqr(x->link[j].mass2->posY - x->link[j].mass1->posY) ); - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = sqrt( \ + sqr(x->link[i].mass2->posX - x->link[i].mass1->posX) + \ + sqr(x->link[i].mass2->posY - x->link[i].mass1->posY) ); + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = sqrt( \ + sqr(x->link[j].mass2->posX - x->link[j].mass1->posX) + \ + sqr(x->link[j].mass2->posY - x->link[j].mass1->posY) ); + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksPosSpeedNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -3537,50 +3537,50 @@ void pmpd2d_linksPosSpeedNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = sqrt( \ - sqr((x->link[i].mass1->speedX + x->link[i].mass2->speedX)/2) + \ - sqr((x->link[i].mass1->speedY + x->link[i].mass2->speedY)/2) ); - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = sqrt( \ - sqr((x->link[j].mass1->speedX + x->link[j].mass2->speedX)/2) + \ - sqr((x->link[j].mass1->speedY + x->link[j].mass2->speedY)/2) ); - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = sqrt( \ + sqr((x->link[i].mass1->speedX + x->link[i].mass2->speedX)/2) + \ + sqr((x->link[i].mass1->speedY + x->link[i].mass2->speedY)/2) ); + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = sqrt( \ + sqr((x->link[j].mass1->speedX + x->link[j].mass2->speedX)/2) + \ + sqr((x->link[j].mass1->speedY + x->link[j].mass2->speedY)/2) ); + i++; + } + j++; + } + garray_redraw(a); + } + } } void pmpd2d_linksLengthSpeedNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) @@ -3591,54 +3591,54 @@ void pmpd2d_linksLengthSpeedNormT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *ar if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, vecsize); - for (i=0; i < taille_max ; i++) - { - vec[i].w_float = sqrt( \ - sqr(x->link[i].mass2->speedX - x->link[i].mass1->speedX) + \ - sqr(x->link[i].mass2->speedY - x->link[i].mass1->speedY) ); - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = sqrt( \ - sqr(x->link[j].mass2->speedX - x->link[j].mass1->speedX) + \ - sqr(x->link[j].mass2->speedY - x->link[j].mass1->speedY) ); - i++; - } - j++; - } - garray_redraw(a); - } - } -} - - -void pmpd2d_linksExtremT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, vecsize); + for (i=0; i < taille_max ; i++) + { + vec[i].w_float = sqrt( \ + sqr(x->link[i].mass2->speedX - x->link[i].mass1->speedX) + \ + sqr(x->link[i].mass2->speedY - x->link[i].mass1->speedY) ); + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = sqrt( \ + sqr(x->link[j].mass2->speedX - x->link[j].mass1->speedX) + \ + sqr(x->link[j].mass2->speedY - x->link[j].mass1->speedY) ); + i++; + } + j++; + } + garray_redraw(a); + } + } +} + + +void pmpd2d_linksEndT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { int i, j, vecsize; t_garray *a; @@ -3646,151 +3646,151 @@ void pmpd2d_linksExtremT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( (argc==1) && (argv[0].a_type == A_SYMBOL) ) { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - int taille_max = x->nb_link; - taille_max = min(taille_max, (vecsize-3)/4); - for (i=0; i < taille_max ; i++) - { - vec[4*i ].w_float = x->link[i].mass1->posX; - vec[4*i+1].w_float = x->link[i].mass1->posY; - vec[4*i+2].w_float = x->link[i].mass2->posX; - vec[4*i+3].w_float = x->link[i].mass2->posY; - } - garray_redraw(a); - } - } - else - if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) - { - t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); - if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) - pd_error(x, "%s: no such array", tab_name->s_name); - else if (!garray_getfloatwords(a, &vecsize, &vec)) - pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); - else - { - i = 0; - j = 0; - while ((i < vecsize-3) && (j < x->nb_link)) - { - if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) - { - vec[i].w_float = x->link[j].mass1->posX; - i++; - vec[i].w_float = x->link[j].mass1->posY; - i++; - vec[i].w_float = x->link[j].mass2->posX; - i++; - vec[i].w_float = x->link[j].mass2->posY; - i++; - } - j++; - } - garray_redraw(a); - } - } + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + int taille_max = x->nb_link; + taille_max = min(taille_max, (vecsize-3)/4); + for (i=0; i < taille_max ; i++) + { + vec[4*i ].w_float = x->link[i].mass1->posX; + vec[4*i+1].w_float = x->link[i].mass1->posY; + vec[4*i+2].w_float = x->link[i].mass2->posX; + vec[4*i+3].w_float = x->link[i].mass2->posY; + } + garray_redraw(a); + } + } + else + if ( (argc==2) && (argv[0].a_type == A_SYMBOL) && (argv[1].a_type == A_SYMBOL) ) + { + t_symbol *tab_name = atom_getsymbolarg(0, argc, argv); + if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class))) + pd_error(x, "%s: no such array", tab_name->s_name); + else if (!garray_getfloatwords(a, &vecsize, &vec)) + pd_error(x, "%s: bad template for tabwrite", tab_name->s_name); + else + { + i = 0; + j = 0; + while ((i < vecsize-3) && (j < x->nb_link)) + { + if (atom_getsymbolarg(1,argc,argv) == x->link[j].Id) + { + vec[i].w_float = x->link[j].mass1->posX; + i++; + vec[i].w_float = x->link[j].mass1->posY; + i++; + vec[i].w_float = x->link[j].mass2->posX; + i++; + vec[i].w_float = x->link[j].mass2->posY; + i++; + } + j++; + } + garray_redraw(a); + } + } } //---------------------------------------------- void pmpd2d_grabMass(t_pmpd2d *x, t_float posX, t_float posY, t_float grab) { - t_float dist, tmp; - t_int i; - - if (grab == 0) - x->grab=0; - if ((x->grab == 0)&(grab == 1)&(x->nb_mass > 0)) - { - x->grab=1; - x->grab_nb= 0; - dist = sqr(x->mass[0].posX - posX) + sqr(x->mass[0].posY - posY); - for (i=1; inb_mass; i++) - { - tmp = sqr(x->mass[i].posX - posX) + sqr(x->mass[i].posY - posY); - if (tmp < dist) - { - dist = tmp; - x->grab_nb= i; - } - } - } - if (x->grab == 1) - { - x->mass[x->grab_nb].posX = posX; - x->mass[x->grab_nb].posY = posY; - } + t_float dist, tmp; + t_int i; + + if (grab == 0) + x->grab=0; + if ((x->grab == 0)&(grab == 1)&(x->nb_mass > 0)) + { + x->grab=1; + x->grab_nb= 0; + dist = sqr(x->mass[0].posX - posX) + sqr(x->mass[0].posY - posY); + for (i=1; inb_mass; i++) + { + tmp = sqr(x->mass[i].posX - posX) + sqr(x->mass[i].posY - posY); + if (tmp < dist) + { + dist = tmp; + x->grab_nb= i; + } + } + } + if (x->grab == 1) + { + x->mass[x->grab_nb].posX = posX; + x->mass[x->grab_nb].posY = posY; + } } void pmpd2d_closestMass(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)// t_float posX, t_float posY) { - t_float dist, tmp; - t_int i; - t_atom std_out[3]; - - t_float posX, posY; - posX = atom_getfloatarg(0, argc, argv); - posY = atom_getfloatarg(1, argc, argv); + t_float dist, tmp; + t_int i; + t_atom std_out[3]; + + t_float posX, posY; + posX = atom_getfloatarg(0, argc, argv); + posY = atom_getfloatarg(1, argc, argv); if ( (argc == 3) && (argv[2].a_type == A_SYMBOL) ) { - //t_symbol *mass_name = atom_getsymbolarg(2, argc, argv); - if ((x->nb_mass > 0)) - { - dist = 1000000000;//sqr(x->mass[0].posX - posX) + sqr(x->mass[0].posY - posY); - for (i=0; inb_mass; i++) - { - if (atom_getsymbolarg(2,argc,argv) == x->mass[i].Id) - { - tmp = sqr(x->mass[i].posX - posX) + sqr(x->mass[i].posY - posY); - if (tmp < dist) - { - dist = tmp; - x->grab_nb= i; - } - } - } - } - } - else { - if ((x->nb_mass > 0)) - { - dist = sqr(x->mass[0].posX - posX) + sqr(x->mass[0].posY - posY); - for (i=1; inb_mass; i++) - { - tmp = sqr(x->mass[i].posX - posX) + sqr(x->mass[i].posY - posY); - if (tmp < dist) - { - dist = tmp; - x->grab_nb= i; - } - } - } - } - - - SETFLOAT(&(std_out[0]),x->grab_nb); - SETFLOAT(&(std_out[1]), x->mass[x->grab_nb].posX); - SETFLOAT(&(std_out[2]), x->mass[x->grab_nb].posY); - outlet_anything(x->main_outlet, gensym("closestMass"),3,std_out); + //t_symbol *mass_name = atom_getsymbolarg(2, argc, argv); + if ((x->nb_mass > 0)) + { + dist = 1000000000;//sqr(x->mass[0].posX - posX) + sqr(x->mass[0].posY - posY); + for (i=0; inb_mass; i++) + { + if (atom_getsymbolarg(2,argc,argv) == x->mass[i].Id) + { + tmp = sqr(x->mass[i].posX - posX) + sqr(x->mass[i].posY - posY); + if (tmp < dist) + { + dist = tmp; + x->grab_nb= i; + } + } + } + } + } + else { + if ((x->nb_mass > 0)) + { + dist = sqr(x->mass[0].posX - posX) + sqr(x->mass[0].posY - posY); + for (i=1; inb_mass; i++) + { + tmp = sqr(x->mass[i].posX - posX) + sqr(x->mass[i].posY - posY); + if (tmp < dist) + { + dist = tmp; + x->grab_nb= i; + } + } + } + } + + + SETFLOAT(&(std_out[0]),x->grab_nb); + SETFLOAT(&(std_out[1]), x->mass[x->grab_nb].posX); + SETFLOAT(&(std_out[2]), x->mass[x->grab_nb].posY); + outlet_anything(x->main_outlet, gensym("closestMass"),3,std_out); } void *pmpd2d_new() { - t_pmpd2d *x = (t_pmpd2d *)pd_new(pmpd2d_class); + t_pmpd2d *x = (t_pmpd2d *)pd_new(pmpd2d_class); - pmpd2d_reset(x); - - x->main_outlet=outlet_new(&x->x_obj, 0); - // x->info_outlet=outlet_new(&x->x_obj, 0); // TODO + pmpd2d_reset(x); + + x->main_outlet=outlet_new(&x->x_obj, 0); + // x->info_outlet=outlet_new(&x->x_obj, 0); // TODO - return (void *)x; + return (void *)x; } void pmpd2d_setup(void) @@ -3799,147 +3799,147 @@ void pmpd2d_setup(void) (t_newmethod)pmpd2d_new, 0, sizeof(t_pmpd2d),CLASS_DEFAULT, 0); - class_addbang(pmpd2d_class, pmpd2d_bang); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_reset, gensym("reset"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_infosL, gensym("infosL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_infosL, gensym("print"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_mass, gensym("mass"), A_DEFSYMBOL, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_link, gensym("link"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_tabLink, gensym("tabLink"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_tLink, gensym("tLink"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setK, gensym("setK"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setD, gensym("setD"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setL, gensym("setL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setLKTab, gensym("setLKTab"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setLDTab, gensym("setLDTab"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setLinkId, gensym("setLinkId"), A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setMassId, gensym("setMassId"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_pos, gensym("pos"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_posX, gensym("posX"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_posY, gensym("posY"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_force, gensym("force"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_forceX, gensym("forceX"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_forceY, gensym("forceY"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_minX, gensym("Xmin"), A_DEFFLOAT, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_maxX, gensym("Xmax"), A_DEFFLOAT, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_minY, gensym("Ymin"), A_DEFFLOAT, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_maxY, gensym("Ymax"), A_DEFFLOAT, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_min, gensym("min"), A_DEFFLOAT, A_DEFFLOAT, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_max, gensym("max"), A_DEFFLOAT, A_DEFFLOAT, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setFixed, gensym("setFixed"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setMobile, gensym("setMobile"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setD2, gensym("setDEnv"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setD2offset, gensym("setDEnvOffset"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setSpeed, gensym("setSpeed"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setSpeedX, gensym("setSpeedX"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setSpeedY, gensym("setSpeedY"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setForce, gensym("setForce"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setForceX, gensym("setForceX"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_setForceY, gensym("setForceY"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_addPos, gensym("addPos"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_addPosX, gensym("addPosX"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_addPosY, gensym("addPosY"), A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_get, gensym("get"), A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosL, gensym("massesPosL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsL, gensym("massesSpeedsL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesL, gensym("massesForcesL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosT, gensym("massesPosT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsT, gensym("massesSpeedsT"),A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesT, gensym("massesForcesT"),A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosXL, gensym("massesPosXL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsXL, gensym("massesSpeedsXL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesXL, gensym("massesForcesXL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosXT, gensym("massesPosXT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsXT, gensym("massesSpeedsXT"),A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesXT, gensym("massesForcesXT"),A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosYL, gensym("massesPosYL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsYL, gensym("massesSpeedsYL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesYL, gensym("massesForcesYL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosYT, gensym("massesPosYT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsYT, gensym("massesSpeedsYT"),A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesYT, gensym("massesForcesYT"),A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosNormL, gensym("massesPosNormL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsNormL, gensym("massesSpeedsNormL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesNormL, gensym("massesForcesNormL"), 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosNormT, gensym("massesPosNormT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsNormT, gensym("massesSpeedsNormT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesNormT, gensym("massesForcesNormT"), A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosMean, gensym("massesPosMean"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosStd, gensym("massesPosStd"),A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesMean, gensym("massesForcesMean"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesStd, gensym("massesForcesStd"),A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsMean, gensym("massesSpeedsMean"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsStd, gensym("massesSpeedsStd"),A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosXL, gensym("linksPosXL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthXL, gensym("linksLengthXL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedXL, gensym("linksPosSpeedXL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedXL, gensym("linksLengthSpeedXL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosXT, gensym("linksPosXT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthXT, gensym("linksLengthXT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedXT, gensym("linksPosSpeedXT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedXT, gensym("linksLengthSpeedXT"), A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosYL, gensym("linksPosYL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthYL, gensym("linksLengthYL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedYL, gensym("linksPosSpeedYL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedYL, gensym("linksLengthSpeedYL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosYT, gensym("linksPosYT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthYT, gensym("linksLengthYT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedYT, gensym("linksPosSpeedYT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedYT, gensym("linksLengthSpeedYT"), A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosL, gensym("linksPosL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthL, gensym("linksLengthL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedL, gensym("linksPosSpeedL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedL, gensym("linksLengthSpeedL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosT, gensym("linksPosT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthT, gensym("linksLengthT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedT, gensym("linksPosSpeedT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedT, gensym("linksLengthSpeedT"), A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosNormL, gensym("linksPosNormL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthNormL, gensym("linksLengthNormL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedNormL, gensym("linksPosSpeedNormL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedNormL, gensym("linksLengthSpeedNormL"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosNormT, gensym("linksPosNormT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthNormT, gensym("linksLengthNormT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedNormT, gensym("linksPosSpeedNormT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedNormT, gensym("linksLengthSpeedNormT"), A_GIMME, 0); - - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtremT, gensym("linksExtremT"), A_GIMME, 0); -/* class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtrem1T, gensym("linksExtrem1T"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtrem2T, gensym("linksExtrem2T"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtremXT, gensym("linksExtremXT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtrem1XT, gensym("linksExtrem1XT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtrem2XT, gensym("linksExtrem2XT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtremYT, gensym("linksExtremYT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtrem1YT, gensym("linksExtrem1YT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtrem2YT, gensym("linksExtrem2YT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtremZT, gensym("linksExtremZT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtrem1ZT, gensym("linksExtrem1ZT"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksExtrem2ZT, gensym("linksExtrem2ZT"), A_GIMME, 0); + class_addbang(pmpd2d_class, pmpd2d_bang); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_reset, gensym("reset"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_infosL, gensym("infosL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_infosL, gensym("print"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_mass, gensym("mass"), A_DEFSYMBOL, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_link, gensym("link"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_tabLink, gensym("tabLink"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_tLink, gensym("tLink"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setK, gensym("setK"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setD, gensym("setD"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setL, gensym("setL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setLKTab, gensym("setLKTab"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setLDTab, gensym("setLDTab"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setLinkId, gensym("setLinkId"), A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setMassId, gensym("setMassId"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_pos, gensym("pos"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_posX, gensym("posX"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_posY, gensym("posY"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_force, gensym("force"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_forceX, gensym("forceX"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_forceY, gensym("forceY"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_minX, gensym("Xmin"), A_DEFFLOAT, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_maxX, gensym("Xmax"), A_DEFFLOAT, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_minY, gensym("Ymin"), A_DEFFLOAT, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_maxY, gensym("Ymax"), A_DEFFLOAT, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_min, gensym("min"), A_DEFFLOAT, A_DEFFLOAT, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_max, gensym("max"), A_DEFFLOAT, A_DEFFLOAT, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setFixed, gensym("setFixed"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setMobile, gensym("setMobile"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setD2, gensym("setDEnv"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setD2offset, gensym("setDEnvOffset"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setSpeed, gensym("setSpeed"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setSpeedX, gensym("setSpeedX"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setSpeedY, gensym("setSpeedY"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setForce, gensym("setForce"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setForceX, gensym("setForceX"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_setForceY, gensym("setForceY"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_addPos, gensym("addPos"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_addPosX, gensym("addPosX"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_addPosY, gensym("addPosY"), A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_get, gensym("get"), A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosL, gensym("massesPosL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsL, gensym("massesSpeedsL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesL, gensym("massesForcesL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosT, gensym("massesPosT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsT, gensym("massesSpeedsT"),A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesT, gensym("massesForcesT"),A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosXL, gensym("massesPosXL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsXL, gensym("massesSpeedsXL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesXL, gensym("massesForcesXL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosXT, gensym("massesPosXT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsXT, gensym("massesSpeedsXT"),A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesXT, gensym("massesForcesXT"),A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosYL, gensym("massesPosYL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsYL, gensym("massesSpeedsYL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesYL, gensym("massesForcesYL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosYT, gensym("massesPosYT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsYT, gensym("massesSpeedsYT"),A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesYT, gensym("massesForcesYT"),A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosNormL, gensym("massesPosNormL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsNormL, gensym("massesSpeedsNormL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesNormL, gensym("massesForcesNormL"), 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosNormT, gensym("massesPosNormT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsNormT, gensym("massesSpeedsNormT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesNormT, gensym("massesForcesNormT"), A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosMean, gensym("massesPosMean"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesPosStd, gensym("massesPosStd"),A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesMean, gensym("massesForcesMean"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesForcesStd, gensym("massesForcesStd"),A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsMean, gensym("massesSpeedsMean"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_massesSpeedsStd, gensym("massesSpeedsStd"),A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosXL, gensym("linksPosXL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthXL, gensym("linksLengthXL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedXL, gensym("linksPosSpeedXL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedXL, gensym("linksLengthSpeedXL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosXT, gensym("linksPosXT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthXT, gensym("linksLengthXT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedXT, gensym("linksPosSpeedXT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedXT, gensym("linksLengthSpeedXT"), A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosYL, gensym("linksPosYL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthYL, gensym("linksLengthYL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedYL, gensym("linksPosSpeedYL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedYL, gensym("linksLengthSpeedYL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosYT, gensym("linksPosYT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthYT, gensym("linksLengthYT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedYT, gensym("linksPosSpeedYT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedYT, gensym("linksLengthSpeedYT"), A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosL, gensym("linksPosL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthL, gensym("linksLengthL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedL, gensym("linksPosSpeedL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedL, gensym("linksLengthSpeedL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosT, gensym("linksPosT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthT, gensym("linksLengthT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedT, gensym("linksPosSpeedT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedT, gensym("linksLengthSpeedT"), A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosNormL, gensym("linksPosNormL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthNormL, gensym("linksLengthNormL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedNormL, gensym("linksPosSpeedNormL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedNormL, gensym("linksLengthSpeedNormL"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosNormT, gensym("linksPosNormT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthNormT, gensym("linksLengthNormT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedNormT, gensym("linksPosSpeedNormT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedNormT, gensym("linksLengthSpeedNormT"), A_GIMME, 0); + + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEndT, gensym("linksEndT"), A_GIMME, 0); +/* class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEnd1T, gensym("linksEnd1T"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEnd2T, gensym("linksEnd2T"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEndXT, gensym("linksEndXT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEnd1XT, gensym("linksEnd1XT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEnd2XT, gensym("linksEnd2XT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEndYT, gensym("linksEndYT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEnd1YT, gensym("linksEnd1YT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEnd2YT, gensym("linksEnd2YT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEndZT, gensym("linksEndZT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEnd1ZT, gensym("linksEnd1ZT"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksEnd2ZT, gensym("linksEnd2ZT"), A_GIMME, 0); */ -/* class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosMean, gensym("linksPosMean"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthMean, gensym("linksLengthMean"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedMean, gensym("linksPosSpeedMean"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedMean, gensym("linksLengthSpeedMean"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosStd, gensym("linksPosStd"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthStd, gensym("linksLengthStd"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedStd, gensym("linksPosSpeedStd"), A_GIMME, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedStd0, gensym("linksLengthSpeedStd"), A_GIMME, 0); +/* class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosMean, gensym("linksPosMean"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthMean, gensym("linksLengthMean"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedMean, gensym("linksPosSpeedMean"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedMean, gensym("linksLengthSpeedMean"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosStd, gensym("linksPosStd"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthStd, gensym("linksLengthStd"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksPosSpeedStd, gensym("linksPosSpeedStd"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_linksLengthSpeedStd0, gensym("linksLengthSpeedStd"), A_GIMME, 0); */ - class_addmethod(pmpd2d_class, (t_method)pmpd2d_grabMass, gensym("grabMass"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0); - class_addmethod(pmpd2d_class, (t_method)pmpd2d_closestMass, gensym("closestMass"), A_GIMME, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_grabMass, gensym("grabMass"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0); + class_addmethod(pmpd2d_class, (t_method)pmpd2d_closestMass, gensym("closestMass"), A_GIMME, 0); } -- cgit v1.2.1