diff options
| author | Cyrille Henry <nusmuk@users.sourceforge.net> | 2014-02-18 10:59:19 +0000 |
|---|---|---|
| committer | Cyrille Henry <nusmuk@users.sourceforge.net> | 2014-02-18 10:59:19 +0000 |
| commit | a279f0b055123b98c0f216d57a895a6dbe74d5c7 (patch) | |
| tree | c1dde72421103c979d2122aef899f7798cb08781 /pmpd2d_various.c | |
| parent | 63ead5d63bb2322c5184cfd2f2fd13801d9ae5f6 (diff) | |
adding optional float for message set symbol symbol and force symbol symbol
svn path=/trunk/externals/pmpd/; revision=17266
Diffstat (limited to 'pmpd2d_various.c')
| -rw-r--r-- | pmpd2d_various.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/pmpd2d_various.c b/pmpd2d_various.c index d0deec0..9eb9248 100644 --- a/pmpd2d_various.c +++ b/pmpd2d_various.c @@ -42,6 +42,7 @@ void pmpd2d_force(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) 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 ) ) { @@ -61,8 +62,10 @@ void pmpd2d_force(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 ) ) + 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)) @@ -75,9 +78,9 @@ void pmpd2d_force(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) if ( atom_getsymbolarg(0,argc,argv) == x->mass[i].Id) { if (n >= npoints-2) break; - x->mass[i].forceX += vec[n].w_float; + x->mass[i].forceX += K*vec[n].w_float; n++; - x->mass[i].forceY += vec[n].w_float; + x->mass[i].forceY += K*vec[n].w_float; n++; } } @@ -92,6 +95,7 @@ void pmpd2d_forceX(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_garray *a; int npoints, n; t_word *vec; + t_float K; if ( (argc == 2) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -109,8 +113,10 @@ void pmpd2d_forceX(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 ) ) + 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)) @@ -122,7 +128,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 += vec[n].w_float; + x->mass[i].forceX += K*vec[n].w_float; n++; if (n >= npoints) break; } @@ -137,6 +143,7 @@ void pmpd2d_forceY(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv) t_garray *a; int npoints, n; t_word *vec; + t_float K; if ( (argc == 2) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_FLOAT ) ) { @@ -154,8 +161,10 @@ void pmpd2d_forceY(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 ) ) + 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)) @@ -167,7 +176,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 += vec[n].w_float; + x->mass[i].forceY += K*vec[n].w_float; n++; if (n >= npoints) break; } |