diff options
| author | Cyrille Henry <nusmuk@users.sourceforge.net> | 2013-01-16 14:57:52 +0000 |
|---|---|---|
| committer | Cyrille Henry <nusmuk@users.sourceforge.net> | 2013-01-16 14:57:52 +0000 |
| commit | d23606cba1c9094706ce978b72398efa80ac2208 (patch) | |
| tree | a8f3f162f90c6c8cb7386fc05b5317381f235f8a /pmpd3d_set.c | |
| parent | d29de3d1ef7403dd65c6ed912d5bab0a6c341c04 (diff) | |
remove adaptLength to be replace by setL Id curent % (flaot)
svn path=/trunk/externals/pmpd/; revision=16880
Diffstat (limited to 'pmpd3d_set.c')
| -rw-r--r-- | pmpd3d_set.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/pmpd3d_set.c b/pmpd3d_set.c index 43b58a5..d6f5d2e 100644 --- a/pmpd3d_set.c +++ b/pmpd3d_set.c @@ -110,7 +110,7 @@ void pmpd3d_setL(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) tmp = max(0, min( x->nb_link-1, tmp)); x->link[tmp].L = atom_getfloatarg(1, argc, argv); } - if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) + else if ( ( argv[0].a_type == A_SYMBOL ) && ( argv[1].a_type == A_FLOAT ) ) { for (i=0; i< x->nb_link; i++) { @@ -120,13 +120,13 @@ void pmpd3d_setL(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) } } } - if ( ( argv[0].a_type == A_FLOAT ) && ( argc == 1 ) ) + else if ( ( argv[0].a_type == A_FLOAT ) && ( argc == 1 ) ) { tmp = atom_getfloatarg(0, argc, argv); tmp = max(0, min( x->nb_link-1, tmp)); x->link[tmp].L = x->link[tmp].mass2->posX - x->link[tmp].mass1->posX; } - if ( ( argv[0].a_type == A_SYMBOL ) && ( argc == 1 ) ) + else if ( ( argv[0].a_type == A_SYMBOL ) && ( argc == 1 ) ) { for (i=0; i< x->nb_link; i++) { @@ -136,6 +136,22 @@ void pmpd3d_setL(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) } } } + else if ( (argc== 3) && ( argv[0].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) && ( atom_getsymbolarg(1,argc,argv) == gensym("current") ) ) + { + i = atom_getfloatarg(0, argc, argv); + i = max(0, min( x->nb_link-1, i)); + x->link[i].L = mix(x->link[i].L,x->link[i].distance,atom_getfloatarg(2, argc, argv)); + } + else if ( (argc== 3) && ( argv[0].a_type == A_SYMBOL ) && ( argv[2].a_type == A_FLOAT ) && ( atom_getsymbolarg(1,argc,argv) == gensym("current") ) ) + { + for (i=0; i< x->nb_link; i++) + { + if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id) + { + x->link[i].L = mix(x->link[i].L,x->link[i].distance,atom_getfloatarg(2, argc, argv)); + } + } + } } void pmpd3d_setLKTab(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) |