aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pmpd.c282
-rw-r--r--pmpd2d.c300
-rw-r--r--pmpd3d.c340
3 files changed, 860 insertions, 62 deletions
diff --git a/pmpd.c b/pmpd.c
index 6e46a64..b9b2b85 100644
--- a/pmpd.c
+++ b/pmpd.c
@@ -79,6 +79,8 @@ typedef struct _link {
t_float distance;
t_symbol *arrayK;
t_symbol *arrayD;
+ t_float K_L; // longeur du tabeau K
+ t_float D_L; // longeur du tabeau D
} foo1 ;
typedef struct _pmpd {
@@ -123,6 +125,7 @@ void pmpd_reset(t_pmpd *x)
x->nb_mass = 0;
x->minX = -1000000;
x->maxX = 1000000;
+ x->grab = 0;
}
void pmpd_infosL(t_pmpd *x)
@@ -139,7 +142,15 @@ void pmpd_infosL(t_pmpd *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 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;
+ }
}
}
@@ -171,16 +182,12 @@ void pmpd_bang(t_pmpd *x)
{
L = x->link[i].mass1->posX - x->link[i].mass2->posX;
absL = fabs(L);
- if ( (absL >= x->link[i].Lmin) & (absL < x->link[i].Lmax) & (absL - x->link[i].L !=0))
+ if ( (absL >= x->link[i].Lmin) & (absL < x->link[i].Lmax) & (L !=0))
{
if (x->link[i].lType == 2)
{ // K et D viennent d'une table
- if (x->link[i].D == 0)
- F = 0;
- else
- F = tabread2(x, (L - x->link[i].distance) / x->link[i].D, x->link[i].arrayD);
- if (x->link[i].K != 0)
- F += tabread2(x, L / x->link[i].K, x->link[i].arrayK);
+ 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
{
@@ -302,15 +309,19 @@ void pmpd_tabLink(t_pmpd *x, t_symbol *s, int argc, t_atom *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 K = atom_getfloatarg(4, argc, argv);
+ t_float Kl = atom_getfloatarg(4, argc, argv);
+ if (Kl <= 0) Kl = 1;
t_symbol *arrayD = atom_getsymbolarg(5,argc,argv);
- t_float D = atom_getfloatarg(6, argc, argv);
-
+ t_float Dl = atom_getfloatarg(6, argc, argv);
+ if (Dl <= 0) Dl = 1;
+
if ( ( argv[1].a_type == A_FLOAT ) & ( argv[2].a_type == A_FLOAT ) )
{
- pmpd_create_link(x, Id, mass1, mass2, K, D, 1, -1000000, 1000000, 2);
+ pmpd_create_link(x, Id, mass1, mass2, 1, 1, 1, -1000000, 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;
}
else
if ( ( argv[1].a_type == A_SYMBOL ) & ( argv[2].a_type == A_FLOAT ) )
@@ -319,9 +330,11 @@ void pmpd_tabLink(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
{
if ( atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)
{
- pmpd_create_link(x, Id, i, mass2, K, D, 1, -1000000, 1000000, 2);
+ pmpd_create_link(x, Id, i, mass2, 1, 1, 1, -1000000, 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;
}
}
}
@@ -332,9 +345,11 @@ void pmpd_tabLink(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
{
if ( atom_getsymbolarg(2,argc,argv) == x->mass[i].Id)
{
- pmpd_create_link(x, Id, mass1, i, K, D, 1, -1000000, 1000000, 2);
+ pmpd_create_link(x, Id, mass1, i, 1, 1, 1, -1000000, 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;
}
}
}
@@ -349,9 +364,11 @@ void pmpd_tabLink(t_pmpd *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
{
- pmpd_create_link(x, Id, i, j, K, D, 1, -1000000, 1000000, 2);
+ pmpd_create_link(x, Id, i, j, 1, 1, 1, -1000000, 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;
}
}
}
@@ -441,6 +458,52 @@ void pmpd_setL(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
}
}
+void pmpd_setLKTab(t_pmpd *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;
+ 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;
+ }
+ if ( ( argv[0].a_type == A_SYMBOL ) & ( argv[1].a_type == A_FLOAT ) )
+ {
+ for (i=0; i< x->nb_link; i++)
+ {
+ if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id)
+ {
+ x->link[i].K_L = K_l;
+ }
+ }
+ }
+}
+
+void pmpd_setLDTab(t_pmpd *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;
+ 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;
+ }
+ if ( ( argv[0].a_type == A_SYMBOL ) & ( argv[1].a_type == A_FLOAT ) )
+ {
+ for (i=0; i< x->nb_link; i++)
+ {
+ if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id)
+ {
+ x->link[i].D_L = D_l;
+ }
+ }
+ }
+}
+
void pmpd_setLinkId(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
{
int tmp, i;
@@ -465,7 +528,6 @@ void pmpd_setLinkId(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
void pmpd_setMassId(t_pmpd *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 ) )
@@ -978,7 +1040,7 @@ void pmpd_get(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
void pmpd_massesPosL(t_pmpd *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++)
{
@@ -990,7 +1052,7 @@ void pmpd_massesPosL(t_pmpd *x)
void pmpd_massesForcesL(t_pmpd *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++)
{
@@ -1002,7 +1064,7 @@ void pmpd_massesForcesL(t_pmpd *x)
void pmpd_massesSpeedsL(t_pmpd *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++)
{
@@ -1164,6 +1226,180 @@ void pmpd_massesPosStd(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
outlet_anything(x->main_outlet, gensym("massesPosStd"),1 , std_out);
}
+void pmpd_massesForcesMean(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
+{
+ t_float sommeX;
+ t_int i,j;
+ t_atom mean[1];
+
+ sommeX = 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;
+ j++;
+ }
+ }
+ }
+ else
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ sommeX += x->mass[i].forceX;
+ j++;
+ }
+ }
+
+ sommeX /= j;
+
+ SETFLOAT(&(mean[0]),sommeX);
+
+ outlet_anything(x->main_outlet, gensym("massesForcesMean"),1 , mean);
+}
+
+void pmpd_massesForcesStd(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
+{
+ t_float sommeX;
+ t_int i,j;
+ t_float stdX;
+ t_atom std_out[1];
+
+ sommeX = 0;
+ stdX = 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;
+ j++;
+ }
+ }
+ sommeX /= 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);
+ }
+ }
+ }
+ else
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ sommeX += x->mass[i].forceX;
+ j++;
+ }
+ sommeX /= j;
+ for (i=0; i< x->nb_mass; i++)
+ {
+ stdX += sqr(x->mass[i].forceX-sommeX);
+ }
+ }
+
+ stdX = sqrt(stdX/j);
+
+ SETFLOAT(&(std_out[0]),stdX);
+
+ outlet_anything(x->main_outlet, gensym("massesForcesStd"),1 , std_out);
+}
+
+void pmpd_massesSpeedsMean(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
+{
+ t_float sommeX;
+ t_int i,j;
+ t_atom mean[1];
+
+ sommeX = 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;
+ j++;
+ }
+ }
+ }
+ else
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ sommeX += x->mass[i].speedX;
+ j++;
+ }
+ }
+
+ sommeX /= j;
+
+ SETFLOAT(&(mean[0]),sommeX);
+
+ outlet_anything(x->main_outlet, gensym("massesSpeedsMean"),1 , mean);
+}
+
+void pmpd_massesSpeedsStd(t_pmpd *x, t_symbol *s, int argc, t_atom *argv)
+{
+ t_float sommeX;
+ t_int i,j;
+ t_float stdX;
+ t_atom std_out[1];
+
+ sommeX = 0;
+ stdX = 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;
+ j++;
+ }
+ }
+ sommeX /= 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);
+ }
+ }
+ }
+ else
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ sommeX += x->mass[i].speedX;
+ j++;
+ }
+ sommeX /= j;
+ for (i=0; i< x->nb_mass; i++)
+ {
+ stdX += sqr(x->mass[i].speedX-sommeX);
+ }
+ }
+
+ stdX = sqrt(stdX/j);
+
+ SETFLOAT(&(std_out[0]),stdX);
+
+ outlet_anything(x->main_outlet, gensym("massesSpeedsStd"),1 , std_out);
+}
+
void pmpd_grabMass(t_pmpd *x, t_float posX, t_float grab)
{
t_float dist, tmp;
@@ -1216,10 +1452,12 @@ void pmpd_setup(void)
class_addmethod(pmpd_class, (t_method)pmpd_infosL, gensym("print"), 0);
class_addmethod(pmpd_class, (t_method)pmpd_mass, gensym("mass"), A_DEFSYMBOL, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
class_addmethod(pmpd_class, (t_method)pmpd_link, gensym("link"), A_GIMME, 0);
- class_addmethod(pmpd_class, (t_method)pmpd_link, gensym("tabLink"), A_GIMME, 0);
+ class_addmethod(pmpd_class, (t_method)pmpd_tabLink, gensym("tabLink"), A_GIMME, 0);
class_addmethod(pmpd_class, (t_method)pmpd_setK, gensym("setK"), A_GIMME, 0);
class_addmethod(pmpd_class, (t_method)pmpd_setD, gensym("setD"), A_GIMME, 0);
class_addmethod(pmpd_class, (t_method)pmpd_setL, gensym("setL"), A_GIMME, 0);
+ class_addmethod(pmpd_class, (t_method)pmpd_setLKTab, gensym("setLKTab"), A_GIMME, 0);
+ class_addmethod(pmpd_class, (t_method)pmpd_setLDTab, gensym("setLDTab"), A_GIMME, 0);
class_addmethod(pmpd_class, (t_method)pmpd_setLinkId, gensym("setLinkId"), A_GIMME, 0);
class_addmethod(pmpd_class, (t_method)pmpd_setMassId, gensym("setMassId"), A_GIMME, 0);
@@ -1259,6 +1497,10 @@ void pmpd_setup(void)
class_addmethod(pmpd_class, (t_method)pmpd_massesPosMean, gensym("massesPosMean"), A_GIMME, 0);
class_addmethod(pmpd_class, (t_method)pmpd_massesPosStd, gensym("massesPosStd"),A_GIMME, 0);
+ class_addmethod(pmpd_class, (t_method)pmpd_massesForcesMean,gensym("massesForcesMean"), A_GIMME, 0);
+ class_addmethod(pmpd_class, (t_method)pmpd_massesForcesStd, gensym("massesForcesStd"),A_GIMME, 0);
+ class_addmethod(pmpd_class, (t_method)pmpd_massesSpeedsMean,gensym("massesSpeedsMean"), A_GIMME, 0);
+ class_addmethod(pmpd_class, (t_method)pmpd_massesSpeedsStd, gensym("massesSpeedsStd"),A_GIMME, 0);
class_addmethod(pmpd_class, (t_method)pmpd_grabMass, gensym("grabMass"), A_DEFFLOAT, A_DEFFLOAT, 0);
}
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);
diff --git a/pmpd3d.c b/pmpd3d.c
index 2331ea4..4a84a4d 100644
--- a/pmpd3d.c
+++ b/pmpd3d.c
@@ -154,8 +154,19 @@ void pmpd3d_infosL(t_pmpd3d *x)
post("list of link");
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, %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, x->link[i].VZ);
+ 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;
+ }
}
}
@@ -371,7 +382,7 @@ void pmpd3d_tLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
if ( ( argv[1].a_type == A_FLOAT ) & ( argv[2].a_type == A_FLOAT ) )
{
- pmpd3d_create_link(x, Id, mass1, mass2, K, D, Pow, Lmin, Lmax, 0);
+ pmpd3d_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;
}
@@ -382,7 +393,7 @@ void pmpd3d_tLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
{
if ( atom_getsymbolarg(1,argc,argv) == x->mass[i].Id)
{
- pmpd3d_create_link(x, Id, i, mass2, K, D, Pow, Lmin, Lmax, 0);
+ pmpd3d_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;
}
@@ -395,7 +406,7 @@ void pmpd3d_tLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
{
if ( atom_getsymbolarg(2,argc,argv) == x->mass[i].Id)
{
- pmpd3d_create_link(x, Id, mass1, i, K, D, Pow, Lmin, Lmax, 0);
+ pmpd3d_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;
}
@@ -412,7 +423,7 @@ void pmpd3d_tLink(t_pmpd3d *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
{
- pmpd3d_create_link(x, Id, i, j, K, D, Pow, Lmin, Lmax, 0);
+ pmpd3d_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;
}
@@ -442,7 +453,7 @@ void pmpd3d_tabLink(t_pmpd3d *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 ) )
@@ -455,7 +466,7 @@ void pmpd3d_tabLink(t_pmpd3d *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;
}
}
}
@@ -470,7 +481,7 @@ void pmpd3d_tabLink(t_pmpd3d *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;
}
}
}
@@ -489,7 +500,7 @@ void pmpd3d_tabLink(t_pmpd3d *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;
}
}
}
@@ -650,7 +661,6 @@ void pmpd3d_setLinkId(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
void pmpd3d_setMassId(t_pmpd3d *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 ) )
@@ -921,6 +931,20 @@ void pmpd3d_maxZ(t_pmpd3d *x, t_float max)
x->maxZ = max;
}
+void pmpd3d_min(t_pmpd3d *x, t_float minX, t_float minY, t_float minZ)
+{
+ x->minX = minX;
+ x->minY = minY;
+ x->minZ = minZ;
+}
+
+void pmpd3d_max(t_pmpd3d *x, t_float maxX, t_float maxY, t_float maxZ)
+{
+ x->maxX = maxX;
+ x->maxY = maxY;
+ x->maxZ = maxZ;
+}
+
void pmpd3d_setFixed(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
{
int tmp, i;
@@ -1621,7 +1645,7 @@ void pmpd3d_get(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
void pmpd3d_massesPosXL(t_pmpd3d *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++)
{
@@ -1633,7 +1657,7 @@ void pmpd3d_massesPosXL(t_pmpd3d *x)
void pmpd3d_massesForcesXL(t_pmpd3d *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++)
{
@@ -1645,7 +1669,7 @@ void pmpd3d_massesForcesXL(t_pmpd3d *x)
void pmpd3d_massesSpeedsXL(t_pmpd3d *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++)
{
@@ -1723,7 +1747,7 @@ void pmpd3d_massesForcesXT(t_pmpd3d *x, t_symbol *tab_name)
void pmpd3d_massesPosYL(t_pmpd3d *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++)
{
@@ -1735,7 +1759,7 @@ void pmpd3d_massesPosYL(t_pmpd3d *x)
void pmpd3d_massesForcesYL(t_pmpd3d *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++)
{
@@ -1747,7 +1771,7 @@ void pmpd3d_massesForcesYL(t_pmpd3d *x)
void pmpd3d_massesSpeedsYL(t_pmpd3d *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++)
{
@@ -1825,7 +1849,7 @@ void pmpd3d_massesForcesYT(t_pmpd3d *x, t_symbol *tab_name)
void pmpd3d_massesPosZL(t_pmpd3d *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++)
{
@@ -1837,7 +1861,7 @@ void pmpd3d_massesPosZL(t_pmpd3d *x)
void pmpd3d_massesForcesZL(t_pmpd3d *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++)
{
@@ -1849,7 +1873,7 @@ void pmpd3d_massesForcesZL(t_pmpd3d *x)
void pmpd3d_massesSpeedsZL(t_pmpd3d *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++)
{
@@ -1927,7 +1951,7 @@ void pmpd3d_massesForcesZT(t_pmpd3d *x, t_symbol *tab_name)
void pmpd3d_massesPosL(t_pmpd3d *x)
{
int i;
- t_atom pos_list[3*nb_max_link];
+ t_atom pos_list[3*x->nb_mass];
for (i=0; i < x->nb_mass; i++)
{
@@ -1941,7 +1965,7 @@ void pmpd3d_massesPosL(t_pmpd3d *x)
void pmpd3d_massesForcesL(t_pmpd3d *x)
{
int i;
- t_atom pos_list[3*nb_max_link];
+ t_atom pos_list[3*x->nb_mass];
for (i=0; i< x->nb_mass; i++)
{
@@ -1955,7 +1979,7 @@ void pmpd3d_massesForcesL(t_pmpd3d *x)
void pmpd3d_massesSpeedsL(t_pmpd3d *x)
{
int i;
- t_atom pos_list[3*nb_max_link];
+ t_atom pos_list[3*x->nb_mass];
for (i=0; i< x->nb_mass; i++)
{
@@ -2170,6 +2194,270 @@ void pmpd3d_massesPosStd(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
outlet_anything(x->main_outlet, gensym("massesPosStd"),4 , std_out);
}
+void pmpd3d_massesForcesMean(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
+{
+ t_float sommeX, sommeY, sommeZ, somme;
+ t_int i,j;
+ t_atom mean[4];
+
+ sommeX = 0;
+ sommeY = 0;
+ sommeZ = 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;
+ sommeZ += x->mass[i].forceZ;
+ somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY) + sqr(x->mass[i].forceZ)); // force total
+ j++;
+ }
+ }
+ }
+ else
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ sommeX += x->mass[i].forceX;
+ sommeY += x->mass[i].forceY;
+ sommeZ += x->mass[i].forceZ;
+ somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY) + sqr(x->mass[i].forceZ)); // force
+ j++;
+ }
+ }
+
+ sommeX /= j;
+ sommeY /= j;
+ sommeZ /= j;
+ somme /= j;
+
+ SETFLOAT(&(mean[0]),sommeX);
+ SETFLOAT(&(mean[1]),sommeY);
+ SETFLOAT(&(mean[2]),sommeZ);
+ SETFLOAT(&(mean[3]),somme);
+
+ outlet_anything(x->main_outlet, gensym("massesForcesMean"),4 , mean);
+}
+
+void pmpd3d_massesForcesStd(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
+{
+ t_float sommeX, sommeY, sommeZ, somme;
+ t_int i,j;
+ t_float stdX, stdY, stdZ, std;
+ t_atom std_out[4];
+
+ sommeX = 0;
+ sommeY = 0;
+ sommeZ = 0;
+ somme = 0;
+ stdX = 0;
+ stdY = 0;
+ stdZ = 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;
+ sommeZ += x->mass[i].forceZ;
+ somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY) + sqr(x->mass[i].forceZ)); // force
+ j++;
+ }
+ }
+ sommeX /= j;
+ sommeY /= j;
+ sommeZ /= 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);
+ stdZ += sqr(x->mass[i].forceZ-sommeZ);
+ std += sqr(sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY) + sqr(x->mass[i].forceZ))-somme);
+ }
+ }
+ }
+ else
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ sommeX += x->mass[i].forceX;
+ sommeY += x->mass[i].forceY;
+ sommeZ += x->mass[i].forceZ;
+ somme += sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY) + sqr(x->mass[i].forceZ));
+ j++;
+ }
+ sommeX /= j;
+ sommeY /= j;
+ sommeZ /= 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);
+ stdZ += sqr(x->mass[i].forceZ-sommeZ);
+ std += sqr(sqrt(sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY) + sqr(x->mass[i].forceZ))-somme);
+ }
+ }
+
+ stdX = sqrt(stdX/j);
+ stdY = sqrt(stdY/j);
+ stdZ = sqrt(stdZ/j);
+ std = sqrt(std /j);
+
+ SETFLOAT(&(std_out[0]),stdX);
+ SETFLOAT(&(std_out[1]),stdY);
+ SETFLOAT(&(std_out[2]),stdZ);
+ SETFLOAT(&(std_out[3]),std);
+
+ outlet_anything(x->main_outlet, gensym("massesForcesStd"),4 , std_out);
+}
+
+void pmpd3d_massesSpeedsMean(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
+{
+ t_float sommeX, sommeY, sommeZ, somme;
+ t_int i,j;
+ t_atom mean[4];
+
+ sommeX = 0;
+ sommeY = 0;
+ sommeZ = 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;
+ sommeZ += x->mass[i].speedZ;
+ somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY) + sqr(x->mass[i].speedZ)); // speed total
+ j++;
+ }
+ }
+ }
+ else
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ sommeX += x->mass[i].speedX;
+ sommeY += x->mass[i].speedY;
+ sommeZ += x->mass[i].speedZ;
+ somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY) + sqr(x->mass[i].speedZ)); // speed
+ j++;
+ }
+ }
+
+ sommeX /= j;
+ sommeY /= j;
+ sommeZ /= j;
+ somme /= j;
+
+ SETFLOAT(&(mean[0]),sommeX);
+ SETFLOAT(&(mean[1]),sommeY);
+ SETFLOAT(&(mean[2]),sommeZ);
+ SETFLOAT(&(mean[3]),somme);
+
+ outlet_anything(x->main_outlet, gensym("massesFpeedsMean"),4 , mean);
+}
+
+void pmpd3d_massesSpeedsStd(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv)
+{
+ t_float sommeX, sommeY, sommeZ, somme;
+ t_int i,j;
+ t_float stdX, stdY, stdZ, std;
+ t_atom std_out[4];
+
+ sommeX = 0;
+ sommeY = 0;
+ sommeZ = 0;
+ somme = 0;
+ stdX = 0;
+ stdY = 0;
+ stdZ = 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;
+ sommeZ += x->mass[i].speedZ;
+ somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY) + sqr(x->mass[i].speedZ)); // speed
+ j++;
+ }
+ }
+ sommeX /= j;
+ sommeY /= j;
+ sommeZ /= 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);
+ stdZ += sqr(x->mass[i].speedZ-sommeZ);
+ std += sqr(sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY) + sqr(x->mass[i].speedZ))-somme);
+ }
+ }
+ }
+ else
+ {
+ for (i=0; i< x->nb_mass; i++)
+ {
+ sommeX += x->mass[i].speedX;
+ sommeY += x->mass[i].speedY;
+ sommeZ += x->mass[i].speedZ;
+ somme += sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY) + sqr(x->mass[i].speedZ));
+ j++;
+ }
+ sommeX /= j;
+ sommeY /= j;
+ sommeZ /= 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);
+ stdZ += sqr(x->mass[i].speedZ-sommeZ);
+ std += sqr(sqrt(sqr(x->mass[i].speedX) + sqr(x->mass[i].speedY) + sqr(x->mass[i].speedZ))-somme);
+ }
+ }
+
+ stdX = sqrt(stdX/j);
+ stdY = sqrt(stdY/j);
+ stdZ = sqrt(stdZ/j);
+ std = sqrt(std /j);
+
+ SETFLOAT(&(std_out[0]),stdX);
+ SETFLOAT(&(std_out[1]),stdY);
+ SETFLOAT(&(std_out[2]),stdZ);
+ SETFLOAT(&(std_out[3]),std);
+
+ outlet_anything(x->main_outlet, gensym("massesSpeedsStd"),4 , std_out);
+}
+
void pmpd3d_grabMass(t_pmpd3d *x, t_float posX, t_float posY, t_float posZ, t_float grab)
{
t_float dist, tmp;
@@ -2249,6 +2537,8 @@ void pmpd3d_setup(void)
class_addmethod(pmpd3d_class, (t_method)pmpd3d_maxY, gensym("Ymax"), A_DEFFLOAT, 0);
class_addmethod(pmpd3d_class, (t_method)pmpd3d_minZ, gensym("Zmin"), A_DEFFLOAT, 0);
class_addmethod(pmpd3d_class, (t_method)pmpd3d_maxZ, gensym("Zmax"), A_DEFFLOAT, 0);
+ class_addmethod(pmpd3d_class, (t_method)pmpd3d_min, gensym("min"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
+ class_addmethod(pmpd3d_class, (t_method)pmpd3d_max, gensym("max"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
class_addmethod(pmpd3d_class, (t_method)pmpd3d_setFixed, gensym("setFixed"), A_GIMME, 0);
class_addmethod(pmpd3d_class, (t_method)pmpd3d_setMobile, gensym("setMobile"), A_GIMME, 0);
class_addmethod(pmpd3d_class, (t_method)pmpd3d_setD2, gensym("setDEnv"), A_GIMME, 0);
@@ -2297,6 +2587,10 @@ void pmpd3d_setup(void)
class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesPosMean, gensym("massesPosMean"), A_GIMME, 0);
class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesPosStd, gensym("massesPosStd"),A_GIMME, 0);
+ class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesForcesMean,gensym("massesForecesMean"), A_GIMME, 0);
+ class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesForcesStd, gensym("massesForcesStd"),A_GIMME, 0);
+ class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesSpeedsMean,gensym("massesSpeedsMean"), A_GIMME, 0);
+ class_addmethod(pmpd3d_class, (t_method)pmpd3d_massesSpeedsStd, gensym("massesSpeedsStd"),A_GIMME, 0);
// class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLMean, gensym("linkLMean"),A_GIMME, 0);
// class_addmethod(pmpd3d_class, (t_method)pmpd3d_linkLStd, gensym("linkLStd"),A_GIMME, 0);
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-01 21:41:10 +0000