From fbf0f69b2226f0c2a1adab8bf0f533d2646d3f94 Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Mon, 21 Feb 2011 18:28:55 +0000 Subject: should be finised now. svn path=/trunk/externals/pmpd/; revision=14934 --- pmpd2d.c | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 281 insertions(+), 19 deletions(-) (limited to 'pmpd2d.c') diff --git a/pmpd2d.c b/pmpd2d.c index 93e92a4..b21a2a6 100644 --- a/pmpd2d.c +++ b/pmpd2d.c @@ -149,7 +149,18 @@ void pmpd2d_infosL(t_pmpd2d *x) post("number, Id, mass1, mass2, K, D, Pow, L, Lmin, Lmax"); for(i=0; i < x->nb_link; i++) { - 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); + 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; + } } } @@ -348,7 +359,7 @@ 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, 0); + 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; } @@ -359,7 +370,7 @@ 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, 0); + 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; } @@ -372,7 +383,7 @@ 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, 0); + 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; } @@ -389,7 +400,7 @@ void pmpd2d_tLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { 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); + 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; } @@ -420,7 +431,7 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) 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 = Kl; + x->link[x->nb_link-1].D_L = Dl; } else if ( ( argv[1].a_type == A_SYMBOL ) & ( argv[2].a_type == A_FLOAT ) ) @@ -433,7 +444,7 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) 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 = Kl; + x->link[x->nb_link-1].D_L = Dl; } } } @@ -448,7 +459,7 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) 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 = Kl; + x->link[x->nb_link-1].D_L = Dl; } } } @@ -467,7 +478,7 @@ void pmpd2d_tabLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) 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 = Kl; + x->link[x->nb_link-1].D_L = Dl; } } } @@ -628,7 +639,6 @@ void pmpd2d_setLinkId(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) void pmpd2d_setMassId(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { -// add a force to a specific mass int tmp, i; if ( ( argv[0].a_type == A_FLOAT ) & ( argv[1].a_type == A_SYMBOL ) ) @@ -832,6 +842,18 @@ void pmpd2d_maxY(t_pmpd2d *x, t_float max) x->maxY = max; } +void pmpd2d_min(t_pmpd2d *x, t_float minX, t_float 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; +} + void pmpd2d_setFixed(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) { int tmp, i; @@ -1430,7 +1452,7 @@ void pmpd2d_get(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) void pmpd2d_massesPosXL(t_pmpd2d *x) { int i; - t_atom pos_list[nb_max_link]; + t_atom pos_list[x->nb_mass]; for (i=0; i < x->nb_mass; i++) { @@ -1442,7 +1464,7 @@ void pmpd2d_massesPosXL(t_pmpd2d *x) void pmpd2d_massesForcesXL(t_pmpd2d *x) { int i; - t_atom pos_list[nb_max_link]; + t_atom pos_list[x->nb_mass]; for (i=0; i< x->nb_mass; i++) { @@ -1454,7 +1476,7 @@ void pmpd2d_massesForcesXL(t_pmpd2d *x) void pmpd2d_massesSpeedsXL(t_pmpd2d *x) { int i; - t_atom pos_list[nb_max_link]; + t_atom pos_list[x->nb_mass]; for (i=0; i< x->nb_mass; i++) { @@ -1532,7 +1554,7 @@ void pmpd2d_massesForcesXT(t_pmpd2d *x, t_symbol *tab_name) void pmpd2d_massesPosYL(t_pmpd2d *x) { int i; - t_atom pos_list[nb_max_link]; + t_atom pos_list[x->nb_mass]; for (i=0; i < x->nb_mass; i++) { @@ -1544,7 +1566,7 @@ void pmpd2d_massesPosYL(t_pmpd2d *x) void pmpd2d_massesForcesYL(t_pmpd2d *x) { int i; - t_atom pos_list[nb_max_link]; + t_atom pos_list[x->nb_mass]; for (i=0; i< x->nb_mass; i++) { @@ -1556,7 +1578,7 @@ void pmpd2d_massesForcesYL(t_pmpd2d *x) void pmpd2d_massesSpeedsYL(t_pmpd2d *x) { int i; - t_atom pos_list[nb_max_link]; + t_atom pos_list[x->nb_mass]; for (i=0; i< x->nb_mass; i++) { @@ -1634,7 +1656,7 @@ void pmpd2d_massesForcesYT(t_pmpd2d *x, t_symbol *tab_name) void pmpd2d_massesPosL(t_pmpd2d *x) { int i; - t_atom pos_list[2*nb_max_link]; + t_atom pos_list[2*x->nb_mass]; for (i=0; i < x->nb_mass; i++) { @@ -1647,7 +1669,7 @@ void pmpd2d_massesPosL(t_pmpd2d *x) void pmpd2d_massesForcesL(t_pmpd2d *x) { int i; - t_atom pos_list[2*nb_max_link]; + t_atom pos_list[2*x->nb_mass]; for (i=0; i< x->nb_mass; i++) { @@ -1660,7 +1682,7 @@ void pmpd2d_massesForcesL(t_pmpd2d *x) void pmpd2d_massesSpeedsL(t_pmpd2d *x) { int i; - t_atom pos_list[2*nb_max_link]; + t_atom pos_list[2*x->nb_mass]; for (i=0; i< x->nb_mass; i++) { @@ -1856,6 +1878,240 @@ void pmpd2d_massesPosStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) outlet_anything(x->main_outlet, gensym("massesPosStd"),3 , std_out); } +void pmpd2d_massesForcesMean(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) +{ + t_float sommeX, sommeY, somme; + t_int i,j; + t_atom mean[3]; + + 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; + + SETFLOAT(&(mean[0]),sommeX); + SETFLOAT(&(mean[1]),sommeY); + SETFLOAT(&(mean[2]),somme); + + outlet_anything(x->main_outlet, gensym("massesForcesMean"),3 , mean); +} + +void pmpd2d_massesForcesStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) +{ + t_float sommeX, sommeY, somme; + t_int i,j; + t_float stdX, stdY,std; + t_atom std_out[3]; + + 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); + + SETFLOAT(&(std_out[0]),stdX); + SETFLOAT(&(std_out[1]),stdY); + SETFLOAT(&(std_out[2]),std); + + outlet_anything(x->main_outlet, gensym("massesForcesStd"),3 , std_out); +} + +void pmpd2d_massesSpeedsMean(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) +{ + t_float sommeX, sommeY, somme; + t_int i,j; + t_atom mean[3]; + + 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; + + SETFLOAT(&(mean[0]),sommeX); + SETFLOAT(&(mean[1]),sommeY); + SETFLOAT(&(mean[2]),somme); + + outlet_anything(x->main_outlet, gensym("massesSpeedsMean"),3 , mean); +} + +void pmpd2d_massesSpeedsStd(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) +{ + t_float sommeX, sommeY, somme; + t_int i,j; + t_float stdX, stdY,std; + t_atom std_out[3]; + + 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); + + SETFLOAT(&(std_out[0]),stdX); + SETFLOAT(&(std_out[1]),stdY); + SETFLOAT(&(std_out[2]),std); + + outlet_anything(x->main_outlet, gensym("massesSpeedsStd"),3 , std_out); +} + void pmpd2d_grabMass(t_pmpd2d *x, t_float posX, t_float posY, t_float grab) { t_float dist, tmp; @@ -1929,6 +2185,8 @@ void pmpd2d_setup(void) 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); @@ -1967,6 +2225,10 @@ void pmpd2d_setup(void) 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_linkLMean, gensym("linkLMean"),A_GIMME, 0); // class_addmethod(pmpd2d_class, (t_method)pmpd2d_linkLStd, gensym("linkLStd"),A_GIMME, 0); -- cgit v1.2.1