aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/pmpd~.c274
1 files changed, 177 insertions, 97 deletions
diff --git a/src/pmpd~.c b/src/pmpd~.c
index 62013a6..33cfe28 100644
--- a/src/pmpd~.c
+++ b/src/pmpd~.c
@@ -11,22 +11,22 @@
#include "m_pd.h"
-#include "stdio.h"
+#include "stdio.h"
+#include "math.h"
#define max(a,b) ( ((a) > (b)) ? (a) : (b) )
#define min(a,b) ( ((a) < (b)) ? (a) : (b) )
-#define nb_max_link 2000
-#define nb_max_mass 2000
-#define nb_max_out 200
-#define nb_max_in 200
-#define nb_max_outlet 20
-#define nb_max_inlet 20 // hard-coded on the methods definition
+#define nb_max_link 10000
+#define nb_max_mass 10000
+#define nb_max_in 1000
+#define nb_max_out 1000
+#define nb_max_outlet 20
+#define nb_max_inlet 20 // hard-coded on the methods definition
static t_class *pmpd_tilde_class;
typedef struct _mass {
- t_int Id;
t_float invM;
t_float speedX;
t_float posX;
@@ -34,38 +34,58 @@ typedef struct _mass {
} foo;
typedef struct _link {
- t_int Id;
struct _mass *mass1;
struct _mass *mass2;
- t_float Ke, K1, D1, K2, D2;
-} foo1 ;
+ t_float Ke, K1, D1;
+} foo1 ;
+
+typedef struct _NLlink {
+ struct _mass *mass1;
+ struct _mass *mass2;
+ t_float Ke, K1, D1,L0,Lmin, Lmax, Pow;
+} foo1b ;
-typedef struct _out {
- // TODO ajouter un type pour diferencier les outlets en forces et celles en position
- t_int Id;
- t_int nbr_outlet;
+typedef struct _inPos {
+ // in en position
+ t_int nbr_inlet;
struct _mass *mass1;
t_float influence;
} foo2;
-
-typedef struct _in {
- // TODO ajouter un type pour diferencier les inlets en forces et celles en position
- t_int Id;
+
+typedef struct _inForce {
+ // in en force
t_int nbr_inlet;
struct _mass *mass1;
t_float influence;
} foo3;
+
+typedef struct _outPos {
+ // out en position
+ t_int nbr_outlet;
+ struct _mass *mass1;
+ t_float influence;
+} foo4;
+
+typedef struct _outSpeed {
+ // out en vitesse
+ t_int nbr_outlet;
+ struct _mass *mass1;
+ t_float influence;
+} foo5;
typedef struct _pmpd_tilde {
t_object x_obj;
struct _link link[nb_max_link];
+ struct _NLlink NLlink[nb_max_link];
struct _mass mass[nb_max_mass];
- struct _out out[nb_max_out];
- struct _in in[nb_max_in];
+ struct _inPos inPos[nb_max_in];
+ struct _inForce inForce[nb_max_in];
+ struct _outPos outPos[nb_max_out];
+ struct _outSpeed outSpeed[nb_max_out];
t_float outlet[nb_max_outlet];
t_sample *outlet_vector[nb_max_outlet];
t_sample *inlet_vector[nb_max_inlet];
- int nb_link, nb_mass, nb_inlet, nb_outlet, nb_in, nb_out;
+ int nb_link, nb_NLlink, nb_mass, nb_inlet, nb_outlet, nb_inPos, nb_inForce, nb_outPos, nb_outSpeed;
t_sample f; // used for signal inlet
t_int loop, nb_loop; // to be able not to compute everything a each iteration
unsigned int x_state; // random
@@ -89,9 +109,7 @@ static float random_bang_pmpd_tilde(t_pmpd_tilde *x)
nval = ((double)range) * ((double)randval)
* (1./4294967296.);
if (nval >= range) nval = range-1;
-
rnd=nval;
-
rnd-=1000000;
rnd=rnd/1000000.; //pour mettre entre -1 et 1;
return (rnd);
@@ -103,34 +121,29 @@ t_int *pmpd_tilde_perform(t_int *w)
t_pmpd_tilde *x = (t_pmpd_tilde *)(w[1]);
int n = (int)(w[2]);
- t_float F;
+ t_float F,L;
t_int i;
struct _mass mass_1, mass_2;
t_sample *out[nb_max_outlet];
t_sample *in[nb_max_inlet];
- for (i=0; i<x->nb_inlet; i++)
- // TODO : ameliorer la copie du tableau a l'initialisation
+ for (i=0; i<x->nb_inlet; i++)
in[i]= x->inlet_vector[i];
for (i=0; i<x->nb_outlet; i++)
- // TODO : ameliorer la copie du tableau
out[i]= x->outlet_vector[i];
while (n--)
- {
- if (++x->loop == x->nb_loop)
- {
- x->loop = 0;
-
- for (i=0; i<x->nb_in; i++)
- if ( x->in[i].influence == 0)
- // get inlet value and make it a position to the specified mass
- x->in[i].mass1->posX = *in[x->in[i].nbr_inlet];
- else
- // get inlet value and make it a force to the specified mass
- x->in[i].mass1->forceX += x->in[i].influence * *in[x->in[i].nbr_inlet];
+ {
+ x->loop = 0;
+ while (x->loop++ < x->nb_loop)
+ {
+ for (i=0; i<x->nb_inPos; i++)
+ // get inlet value and make it a position to the specified mass x->inPos[i].mass1->posX = x->inPos[i].influence * *in[x->inPos[i].nbr_inlet];
+ for (i=0; i<x->nb_inForce; i++)
+ // get inlet value and make it a force to the specified mass
+ x->inForce[i].mass1->forceX += x->inForce[i].influence * *in[x->inForce[i].nbr_inlet];
for (i=0; i<x->nb_link; i++)
// compute forces generated by links (spring / dashpot)
@@ -144,23 +157,46 @@ t_int *pmpd_tilde_perform(t_int *w)
x->link[i].mass1->forceX -= F;
x->link[i].mass2->forceX += F;
}
-
- for (i=1; i<x->nb_mass; i++)
- // compute new masses position
- if (x->mass[i].Id >0) // only if Id >0
+
+ for (i=0; i<x->nb_NLlink; i++)
+ // compute forces generated by NLlinks (spring / dashpot)
+ {
+ L=x->NLlink[i].mass1->posX - x->NLlink[i].mass2->posX - x->NLlink[i].L0;
+ if (L<x->NLlink[i].Lmax & L>x->NLlink[i].Lmin)
{
- x->mass[i].speedX += x->mass[i].forceX * x->mass[i].invM;
- x->mass[i].forceX = random_bang_pmpd_tilde(x) * 1e-25;
- x->mass[i].posX += x->mass[i].speedX ;
+ F = x->NLlink[i].K1 * pow(fabs(L) ,x->NLlink[i].Pow) ;
+ if (L < 0) F *= -1;
+ // spring
+
+ F += x->NLlink[i].D1 * ( x->NLlink[i].mass1->speedX - x->NLlink[i].mass2->speedX) ;
+ // dashpot
+
+ x->NLlink[i].mass1->forceX -= F;
+ x->NLlink[i].mass2->forceX += F;
}
+ }
+ for (i=1; i<x->nb_mass; i++)
+ {
+ // compute new masses position
+ // a mass does not move if M=0 (i.e : invM = 0)
+ x->mass[i].speedX += x->mass[i].forceX * x->mass[i].invM;
+ x->mass[i].forceX = 0;
+ x->mass[i].forceX = random_bang_pmpd_tilde(x) * 1e-25;
+ // only used for denormal problem
+ // -ffast-math -O6 does not solve the problem
+ x->mass[i].posX += x->mass[i].speedX ;
+ }
}
for (i=0; i<x->nb_inlet; i++)
// increase pointer to inlet vectors value
in[i]++;
- for (i=0; i<x->nb_out; i++)
- x->outlet[x->out[i].nbr_outlet] += x->out[i].mass1->posX * x->out[i].influence;
+ for (i=0; i<x->nb_outPos; i++)
+ x->outlet[x->outPos[i].nbr_outlet] += x->outPos[i].mass1->posX * x->outPos[i].influence;
+ // compute output vector value
+ for (i=0; i<x->nb_outSpeed; i++)
+ x->outlet[x->outSpeed[i].nbr_outlet] += x->outSpeed[i].mass1->speedX * x->outSpeed[i].influence;
// compute output vector value
for (i=0; i<x->nb_outlet; i++)
@@ -176,7 +212,6 @@ t_int *pmpd_tilde_perform(t_int *w)
void pmpd_tilde_dsp(t_pmpd_tilde *x, t_signal **sp)
{
int i;
-
for (i=0; i<x->nb_inlet; i++)
x->inlet_vector[i] = sp[i]->s_vec;
@@ -184,7 +219,6 @@ void pmpd_tilde_dsp(t_pmpd_tilde *x, t_signal **sp)
x->outlet_vector[i] = sp[i+x->nb_inlet]->s_vec;
dsp_add(pmpd_tilde_perform, 2, x, sp[0]->s_n);
-// post("%p, %p, %p", sp, sp2[2], sp[2]->s_vec);
}
void pmpd_tilde_bang(t_pmpd_tilde *x)
@@ -197,7 +231,7 @@ void pmpd_tilde_bang(t_pmpd_tilde *x)
void pmpd_tilde_float(t_pmpd_tilde *x, t_float force)
{
-// add a unity force to all masses
+// add a force to all masses
int i;
for (i=0;i < x->nb_mass; i++)
x->mass[i].forceX += force;
@@ -212,19 +246,24 @@ void pmpd_tilde_forceX(t_pmpd_tilde *x, t_float nbr_mass, t_float force)
void pmpd_tilde_posX(t_pmpd_tilde *x, t_float nbr_mass, t_float posX)
{
-// displace a mass to a certain position
+// move a mass to a certain position
nbr_mass = max(0, min( x->nb_mass, (int)nbr_mass));
x->mass[(int)nbr_mass].posX = posX;
}
-void pmpd_tilde_mass(t_pmpd_tilde *x, t_float Id, t_float M, t_float posX)
+void pmpd_tilde_mass(t_pmpd_tilde *x, t_float M, t_float posX)
// add a mass
-// Id, invM speedX posX forceX
+//invM speedX posX force
{
- if (M==0) M=1;
- x->mass[x->nb_mass].Id = (int)Id;
- x->mass[x->nb_mass].invM = 1/M;
+ if (M<=0)
+ {
+ M = 0;
+ x->mass[x->nb_mass].invM = 0;
+ }
+ else
+ x->mass[x->nb_mass].invM = 1/M;
+
x->mass[x->nb_mass].speedX = 0;
x->mass[x->nb_mass].posX = posX;
x->mass[x->nb_mass].forceX = 0;
@@ -233,12 +272,10 @@ void pmpd_tilde_mass(t_pmpd_tilde *x, t_float Id, t_float M, t_float posX)
x->nb_mass = min ( nb_max_mass -1, x->nb_mass );
}
-void pmpd_tilde_link(t_pmpd_tilde *x, t_float Id, t_float mass_1, t_float mass_2, t_float K1, t_float D1)
+void pmpd_tilde_link(t_pmpd_tilde *x, t_float mass_1, t_float mass_2, t_float K1, t_float D1)
// add a link
-// Id, *mass1, *mass2, Ke, K1, D1, K2, D2;
+// *mass1, *mass2, K1, D1;
{
-
- x->link[x->nb_link].Id = (int)Id;
x->link[x->nb_link].mass1 = &x->mass[max(0, min ( x->nb_mass, (int)mass_1))];
x->link[x->nb_link].mass2 = &x->mass[max(0, min ( x->nb_mass, (int)mass_2))];
x->link[x->nb_link].K1 = K1;
@@ -246,43 +283,86 @@ void pmpd_tilde_link(t_pmpd_tilde *x, t_float Id, t_float mass_1, t_float mass_2
x->nb_link++ ;
x->nb_link = min ( nb_max_link -1, x->nb_link );
+}
+
+void pmpd_tilde_NLlink(t_pmpd_tilde *x, t_symbol *s, int argc, t_atom *argv)
+// t_float mass_1, t_float mass_2, t_float K1, t_float D1, t_float Pow, t_float Lmin, t_float Lmax, t_float L0
+// add a NLlink
+{
+ if (argc == 8)
+ {
+ x->NLlink[x->nb_NLlink].mass1 = &x->mass[max(0, min ( x->nb_mass, (int)atom_getfloatarg(0, argc, argv)))];
+ x->NLlink[x->nb_NLlink].mass2 = &x->mass[max(0, min ( x->nb_mass, (int)atom_getfloatarg(1, argc, argv)))];
+ x->NLlink[x->nb_NLlink].K1 = atom_getfloatarg(2, argc, argv);
+ x->NLlink[x->nb_NLlink].D1 = atom_getfloatarg(3, argc, argv);
+ x->NLlink[x->nb_NLlink].Pow = atom_getfloatarg(4, argc, argv);
+ x->NLlink[x->nb_NLlink].L0 = atom_getfloatarg(5, argc, argv);
+ x->NLlink[x->nb_NLlink].Lmin = atom_getfloatarg(6, argc, argv);
+ x->NLlink[x->nb_NLlink].Lmax = atom_getfloatarg(7, argc, argv);
+
+ x->nb_NLlink++ ;
+ x->nb_NLlink = min ( nb_max_link -1, x->nb_NLlink );
+ }
+ else
+ error("wrong argument number for NLlink");
}
+void pmpd_tilde_inPos(t_pmpd_tilde *x, t_float nb_inlet, t_float mass_1, t_float influence)
+//add an input point
+// nbr_inlet, *mass1, influence;
+{
+ x->inPos[x->nb_inPos].nbr_inlet = max(0, min( x->nb_inlet,(int)nb_inlet));
+ x->inPos[x->nb_inPos].mass1 = &x->mass[max(0, min ( x->nb_mass, (int)mass_1))];
+ x->inPos[x->nb_inPos].influence = influence;
+
+ x->nb_inPos++;
+ x->nb_inPos = min ( nb_max_in - 1, x->nb_inPos );
+}
+void pmpd_tilde_inForce(t_pmpd_tilde *x, t_float nb_inlet, t_float mass_1, t_float influence)
+//add an input point
+// nbr_inlet, *mass1, influence;
+{
+ x->inForce[x->nb_inForce].nbr_inlet = max(0, min( x->nb_inlet,(int)nb_inlet));
+ x->inForce[x->nb_inForce].mass1 = &x->mass[max(0, min ( x->nb_mass, (int)mass_1))];
+ x->inForce[x->nb_inForce].influence = influence;
+
+ x->nb_inForce++;
+ x->nb_inForce = min ( nb_max_in - 1, x->nb_inForce );
+}
-void pmpd_tilde_out(t_pmpd_tilde *x, t_float Id, t_float nb_outlet, t_float mass_1, t_float influence)
+void pmpd_tilde_outPos(t_pmpd_tilde *x, t_float nb_outlet, t_float mass_1, t_float influence)
// add an output point
-// Id, nbr_outlet, *mass1, influence;
+// nbr_outlet, *mass1, influence;
{
- x->out[x->nb_out].Id = (int)Id;
- x->out[x->nb_out].nbr_outlet = max(0, min( x->nb_outlet,(int)nb_outlet));
- x->out[x->nb_out].mass1 = &x->mass[max(0, min ( x->nb_mass, (int)mass_1))];
- x->out[x->nb_out].influence = influence;
+ x->outPos[x->nb_outPos].nbr_outlet = max(0, min( x->nb_outlet,(int)nb_outlet));
+ x->outPos[x->nb_outPos].mass1 = &x->mass[max(0, min ( x->nb_mass, (int)mass_1))];
+ x->outPos[x->nb_outPos].influence = influence;
- x->nb_out++ ;
- x->nb_out = min ( nb_max_out - 1, x->nb_out );
+ x->nb_outPos++ ;
+ x->nb_outPos = min ( nb_max_out - 1, x->nb_outPos );
}
-void pmpd_tilde_in(t_pmpd_tilde *x, t_float Id, t_float nb_inlet, t_float mass_1, t_float influence)
-//add an input point
-// Id, nbr_inlet, *mass1, influence;
+void pmpd_tilde_outSpeed(t_pmpd_tilde *x, t_float nb_outlet, t_float mass_1, t_float influence)
+// add an output point
+// nbr_outlet, *mass1, influence;
{
- x->in[x->nb_in].Id = (int)Id;
- x->in[x->nb_in].nbr_inlet = max(0, min( x->nb_inlet,(int)nb_inlet));
- x->in[x->nb_in].mass1 = &x->mass[max(0, min ( x->nb_mass, (int)mass_1))];
- x->in[x->nb_in].influence = influence;
+ x->outSpeed[x->nb_outSpeed].nbr_outlet = max(0, min( x->nb_outlet,(int)nb_outlet));
+ x->outSpeed[x->nb_outSpeed].mass1 = &x->mass[max(0, min ( x->nb_mass, (int)mass_1))];
+ x->outSpeed[x->nb_outSpeed].influence = influence;
- x->nb_in++;
- x->nb_in = min ( nb_max_in - 1, x->nb_in );
+ x->nb_outSpeed++ ;
+ x->nb_outSpeed = min ( nb_max_out - 1, x->nb_outSpeed );
}
void pmpd_tilde_reset(t_pmpd_tilde *x)
{
- x->nb_link = 0;
- x->nb_mass = 1;
- x->nb_out= 0;
- x->nb_in= 0;
- x->mass[x->nb_mass].posX = 1;
-// ajouter le reset des paramettress de la masse
+ x->nb_link = 0;
+ x->nb_NLlink = 0;
+ x->nb_mass = 0;
+ x->nb_inPos= 0;
+ x->nb_inForce= 0;
+ x->nb_outSpeed= 0;
+ x->nb_outPos= 0;
}
void *pmpd_tilde_new(t_symbol *s, int argc, t_atom *argv)
@@ -304,9 +384,7 @@ void *pmpd_tilde_new(t_symbol *s, int argc, t_atom *argv)
for(i=0; i<x->nb_inlet-1; i++)
inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal);
- x->nb_loop = max (1, (int)atom_getfloatarg(2, argc, argv) );
- x->loop = 0 ;
-
+ x->nb_loop = max (1, (int)atom_getfloatarg(2, argc, argv) );
return (void *)x;
}
@@ -318,13 +396,15 @@ void pmpd_tilde_setup(void) {
class_addbang(pmpd_tilde_class, pmpd_tilde_bang);
class_addfloat(pmpd_tilde_class, (t_method)pmpd_tilde_float);
- class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_mass, gensym("mass"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
- class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_link, gensym("link"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
- class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_out, gensym("out"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
- class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_in, gensym("in"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
- class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_posX, gensym("posX"), A_DEFFLOAT, A_DEFFLOAT, 0);
- class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_forceX, gensym("forceX"), A_DEFFLOAT, A_DEFFLOAT, 0);
-
- class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_reset, gensym("reset"), 0);
- class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_dsp, gensym("dsp"), 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_mass, gensym("mass"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_link, gensym("link"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_NLlink, gensym("NLlink"), A_GIMME, 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_inPos, gensym("inPos"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_inForce, gensym("inForce"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_outPos, gensym("outPos"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_outSpeed, gensym("outSpeed"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_posX, gensym("posX"), A_DEFFLOAT, A_DEFFLOAT, 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_forceX, gensym("forceX"), A_DEFFLOAT, A_DEFFLOAT, 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_reset, gensym("reset"), 0);
+ class_addmethod(pmpd_tilde_class, (t_method)pmpd_tilde_dsp, gensym("dsp"), 0);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-29 12:28:31 +0000