aboutsummaryrefslogtreecommitdiff
path: root/pmpd2d_set.c
diff options
context:
space:
mode:
Diffstat (limited to 'pmpd2d_set.c')
-rw-r--r--pmpd2d_set.c160
1 files changed, 149 insertions, 11 deletions
diff --git a/pmpd2d_set.c b/pmpd2d_set.c
index afbc6ac..4f52839 100644
--- a/pmpd2d_set.c
+++ b/pmpd2d_set.c
@@ -66,7 +66,7 @@ void pmpd2d_setK(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
void pmpd2d_setD(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
{
- int tmp, i;
+ int tmp, i, offset;
t_garray *a;
int npoints, n;
t_word *vec;
@@ -110,11 +110,29 @@ void pmpd2d_setD(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
}
}
}
+ else if ( (argc >= 2) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_SYMBOL ) )
+ {
+ K=1;
+ if ((argc >= 3) && ( argv[2].a_type == A_FLOAT )) K=atom_getfloatarg(2, argc, argv);
+ if (!(a = (t_garray *)pd_findbyclass(atom_getsymbolarg(1,argc,argv), garray_class)))
+ pd_error(x, "%s: no such array", atom_getsymbolarg(1,argc,argv)->s_name);
+ else if (!garray_getfloatwords(a, &npoints, &vec))
+ pd_error(x, "%s: bad template for tabLink", atom_getsymbolarg(1,argc,argv)->s_name);
+ else
+ {
+ offset = atom_getfloatarg(1, argc, argv);
+ n=min(npoints,x->nb_link-atom_getfloatarg(1, argc, argv));
+ for (i=0; i < n; i++)
+ {
+ x->link[i+offset].D = K*vec[i].w_float;
+ }
+ }
+ }
}
void pmpd2d_setDEnv(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
{
- int tmp, i;
+ int tmp, i, offset;
t_garray *a;
int npoints, n;
t_word *vec;
@@ -165,11 +183,29 @@ void pmpd2d_setDEnv(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
}
}
}
+ else if ( (argc >= 2) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_SYMBOL ) )
+ {
+ K=1;
+ if ((argc >= 3) && ( argv[2].a_type == A_FLOAT )) K=atom_getfloatarg(2, argc, argv);
+ if (!(a = (t_garray *)pd_findbyclass(atom_getsymbolarg(1,argc,argv), garray_class)))
+ pd_error(x, "%s: no such array", atom_getsymbolarg(1,argc,argv)->s_name);
+ else if (!garray_getfloatwords(a, &npoints, &vec))
+ pd_error(x, "%s: bad template for tabLink", atom_getsymbolarg(1,argc,argv)->s_name);
+ else
+ {
+ offset = atom_getfloatarg(1, argc, argv);
+ n=min(npoints,x->nb_mass-atom_getfloatarg(1, argc, argv));
+ for (i=0; i < n; i++)
+ {
+ x->mass[i+offset].D2 = K*vec[i].w_float;
+ }
+ }
+ }
}
void pmpd2d_setDEnvOffset(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
{
- int tmp, i;
+ int tmp, i, offset;
t_garray *a;
int npoints, n;
t_word *vec;
@@ -220,11 +256,29 @@ void pmpd2d_setDEnvOffset(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
}
}
}
+ else if ( (argc >= 2) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_SYMBOL ) )
+ {
+ K=1;
+ if ((argc >= 3) && ( argv[2].a_type == A_FLOAT )) K=atom_getfloatarg(2, argc, argv);
+ if (!(a = (t_garray *)pd_findbyclass(atom_getsymbolarg(1,argc,argv), garray_class)))
+ pd_error(x, "%s: no such array", atom_getsymbolarg(1,argc,argv)->s_name);
+ else if (!garray_getfloatwords(a, &npoints, &vec))
+ pd_error(x, "%s: bad template for tabLink", atom_getsymbolarg(1,argc,argv)->s_name);
+ else
+ {
+ offset = atom_getfloatarg(1, argc, argv);
+ n=min(npoints,x->nb_mass-atom_getfloatarg(1, argc, argv));
+ for (i=0; i < n; i++)
+ {
+ x->mass[i+offset].D2offset = K*vec[i].w_float;
+ }
+ }
+ }
}
void pmpd2d_setL(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
{
- int tmp, i;
+ int tmp, i, offset;
t_garray *a;
int npoints, n;
t_word *vec;
@@ -284,6 +338,24 @@ void pmpd2d_setL(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
}
}
}
+ else if ( (argc >= 2) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_SYMBOL ) )
+ {
+ K=1;
+ if ((argc >= 3) && ( argv[2].a_type == A_FLOAT )) K=atom_getfloatarg(2, argc, argv);
+ if (!(a = (t_garray *)pd_findbyclass(atom_getsymbolarg(1,argc,argv), garray_class)))
+ pd_error(x, "%s: no such array", atom_getsymbolarg(1,argc,argv)->s_name);
+ else if (!garray_getfloatwords(a, &npoints, &vec))
+ pd_error(x, "%s: bad template for tabLink", atom_getsymbolarg(1,argc,argv)->s_name);
+ else
+ {
+ offset = atom_getfloatarg(1, argc, argv);
+ n=min(npoints,x->nb_link-atom_getfloatarg(1, argc, argv));
+ for (i=0; i < n; i++)
+ {
+ x->link[i+offset].L = K*vec[i].w_float;
+ }
+ }
+ }
}
void pmpd2d_setLCurrent(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
@@ -665,7 +737,11 @@ void pmpd2d_setInactive(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
void pmpd2d_pos(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
{
// displace a mass to a certain position
- int tmp, i;
+ int tmp, i, offset;
+ t_garray *a;
+ int npoints, n;
+ t_word *vec;
+ t_float K;
if ( (argc == 3) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) )
{
@@ -695,6 +771,58 @@ void pmpd2d_pos(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
}
}
}
+ else if ( (argc >= 2) && ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_SYMBOL ) )
+ {
+ K=1;
+ if ((argc >= 3) && ( argv[2].a_type == A_FLOAT )) K=atom_getfloatarg(2, argc, argv);
+ if (!(a = (t_garray *)pd_findbyclass(atom_getsymbolarg(1,argc,argv), garray_class)))
+ pd_error(x, "%s: no such array", atom_getsymbolarg(1,argc,argv)->s_name);
+ else if (!garray_getfloatwords(a, &npoints, &vec))
+ pd_error(x, "%s: bad template for tabLink", atom_getsymbolarg(1,argc,argv)->s_name);
+ else
+ {
+ n=0;
+ for (i=0; i < x->nb_mass; i++)
+ {
+ if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id)
+ {
+ x->mass[i].posX = K*vec[n].w_float;
+ x->mass[i].speedX = 0;
+ x->mass[i].forceX = 0;
+ n++;
+ x->mass[i].posY = K*vec[n].w_float;
+ x->mass[i].speedY = 0;
+ x->mass[i].forceY = 0;
+ n++;
+ if (n >= npoints +1) break;
+ }
+ }
+ }
+ }
+ else if ( (argc >= 2) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_SYMBOL ) )
+ {
+ K=1;
+ if ((argc >= 3) && ( argv[2].a_type == A_FLOAT )) K=atom_getfloatarg(2, argc, argv);
+ if (!(a = (t_garray *)pd_findbyclass(atom_getsymbolarg(1,argc,argv), garray_class)))
+ pd_error(x, "%s: no such array", atom_getsymbolarg(1,argc,argv)->s_name);
+ else if (!garray_getfloatwords(a, &npoints, &vec))
+ pd_error(x, "%s: bad template for tabLink", atom_getsymbolarg(1,argc,argv)->s_name);
+ else
+ {
+ offset = atom_getfloatarg(1, argc, argv);
+ n=min((int)npoints/2,x->nb_mass-offset);
+ n+=offset;
+ for (i=offset; i < n; i++)
+ {
+ x->mass[i].posX = K*vec[2*i].w_float;
+ x->mass[i].posY = K*vec[2*i+1].w_float;
+ x->mass[i].speedX = 0;
+ x->mass[i].forceX = 0;
+ x->mass[i].speedY = 0;
+ x->mass[i].forceY = 0;
+ }
+ }
+ }
}
void pmpd2d_posX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
@@ -742,6 +870,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 = K*vec[n].w_float;
+ x->mass[i].speedX = 0;
+ x->mass[i].forceX = 0;
n++;
if (n >= npoints) break;
}
@@ -759,10 +889,13 @@ void pmpd2d_posX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
else
{
offset = atom_getfloatarg(1, argc, argv);
- n=min(npoints,x->nb_mass-atom_getfloatarg(1, argc, argv));
- for (i=0; i < n; i++)
+ n=min(npoints,x->nb_mass-offset);
+ n+=offset;
+ for (i=offset; i < n; i++)
{
- x->mass[i+offset].posX = K*vec[i].w_float;
+ x->mass[i].posX = K*vec[i].w_float;
+ x->mass[i].speedX = 0;
+ x->mass[i].forceX = 0;
}
}
}
@@ -814,6 +947,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 = K*vec[n].w_float;
+ x->mass[i].speedY = 0;
+ x->mass[i].forceY = 0;
n++;
if (n >= npoints) break;
}
@@ -831,10 +966,13 @@ void pmpd2d_posY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
else
{
offset = atom_getfloatarg(1, argc, argv);
- n=min(npoints,x->nb_mass-atom_getfloatarg(1, argc, argv));
- for (i=0; i < n; i++)
+ n=min(npoints,x->nb_mass-offset);
+ n+=offset;
+ for (i=offset; i < n; i++)
{
- x->mass[i+offset].posY = K*vec[i].w_float;
+ x->mass[i].posY = K*vec[i].w_float;
+ x->mass[i].speedY = 0;
+ x->mass[i].forceY = 0;
}
}
}