From ce02dec1ef3dc6862e2491edb68d21531726b42c Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Wed, 21 May 2014 15:05:05 +0000 Subject: setPos familly now accept tables svn path=/trunk/externals/pmpd/; revision=17312 --- pmpd2d-help.pd | 6 +- pmpd2d_set.c | 160 ++++++++++++++++++++++-- pmpd3d-help.pd | 6 +- pmpd3d_set.c | 388 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 534 insertions(+), 26 deletions(-) diff --git a/pmpd2d-help.pd b/pmpd2d-help.pd index 5fed962..434c9dc 100644 --- a/pmpd2d-help.pd +++ b/pmpd2d-help.pd @@ -1,4 +1,4 @@ -#N canvas 289 169 572 750 10; +#N canvas 287 174 572 750 10; #X declare -lib Gem; #X obj 4 309 cnv 15 550 15 empty empty empty 20 12 0 14 -158509 -66577 0; @@ -574,7 +574,7 @@ the model. Messages create links and masses or destroy them.; links. They work as general links but their calculation is made following a vector.; #X restore 12 407 pd creation____________; -#N canvas 82 124 1057 814 dynamic 0; +#N canvas 80 129 1057 814 dynamic 0; #X obj -35 3 cnv 15 900 15 empty empty empty 20 12 0 14 -233017 -66577 0; #X obj -30 85 cnv 15 150 670 empty empty empty 20 12 0 14 -233017 -66577 @@ -623,7 +623,6 @@ a vector.; #X text 160 505 \$2 / \$3 : Value; #X msg 0 487 setForceX \$1 \$2; #X msg 0 506 setForceY \$1 \$2; -#X text 150 131 \$2 / \$3 : Value; #X msg -20 163 force \$1 \$2 \$3; #X text 156 241 \$1 / \$2 : Value; #X msg -1 550 setSpeedX \$1 \$2; @@ -699,6 +698,7 @@ uses this argument as the value applied to all masses (or links); #X text 152 202 \$2 / \$3 : Value (float or symbol); #X msg 443 532 setInactive \$1; #X msg 444 576 setActive \$1; +#X text 150 131 \$2 / \$3 : Value (float or table); #X restore 12 427 pd dynamic settings ___; #X text 112 658 54_pmpd2dtest.pd; #X obj 325 272 print; 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; } } } diff --git a/pmpd3d-help.pd b/pmpd3d-help.pd index 543ca5c..0f48325 100644 --- a/pmpd3d-help.pd +++ b/pmpd3d-help.pd @@ -1,4 +1,4 @@ -#N canvas 375 233 570 717 10; +#N canvas 373 238 570 717 10; #X declare -lib Gem; #X obj 4 289 cnv 15 550 15 empty empty empty 20 12 0 14 -158509 -66577 0; @@ -200,7 +200,7 @@ the model. Messages create links and masses or destroy them.; links. They work as general links except their calculation is made following a vector.; #X restore 12 377 pd creation____________; -#N canvas 70 189 1143 866 dynamic 0; +#N canvas 68 189 1143 866 dynamic 0; #X obj 5 3 cnv 15 1050 15 empty empty empty 20 12 0 14 -233017 -66577 0; #X obj 5 84 cnv 15 150 750 empty empty empty 20 12 0 14 -233017 -66577 @@ -247,7 +247,6 @@ following a vector.; #X text 193 512 \$2 / \$3 : Value; #X msg 39 502 setForceX \$1 \$2; #X msg 39 521 setForceY \$1 \$2; -#X text 189 131 \$2 / \$3 : Value; #X msg 15 171 force \$1 \$2 \$3; #X text 173 730 Change environement damping; #X msg 39 582 setSpeedX \$1 \$2; @@ -334,6 +333,7 @@ uses this argument as the value applied to all masses (or links); #X text 195 761 \$2 : damping (float or table); #X text 193 467 \$2 : New Id; #X text 189 212 \$2 / \$3 : Value (float or symbol); +#X text 189 131 \$2 / \$3 : Value (float or table); #X restore 12 397 pd dynamic settings ___; #X text 158 397 To set the model parameters after creation.; #N canvas 153 264 1157 693 masses_attributes 0; diff --git a/pmpd3d_set.c b/pmpd3d_set.c index 94bfa32..d65602e 100644 --- a/pmpd3d_set.c +++ b/pmpd3d_set.c @@ -1,6 +1,6 @@ void pmpd3d_setK(t_pmpd3d *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; @@ -44,11 +44,51 @@ void pmpd3d_setK(t_pmpd3d *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_link; i++) + { + if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id) + { + x->link[i].K = K*vec[n].w_float; + n++; + if (n >= npoints) 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(npoints,x->nb_link-atom_getfloatarg(1, argc, argv)); + for (i=0; i < n; i++) + { + x->link[i+offset].K = K*vec[i].w_float; + } + } + } } void pmpd3d_setD(t_pmpd3d *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; @@ -92,11 +132,51 @@ void pmpd3d_setD(t_pmpd3d *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_link; i++) + { + if ( atom_getsymbolarg(0,argc,argv) == x->link[i].Id) + { + x->link[i].D = K*vec[n].w_float; + n++; + if (n >= npoints) 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(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 pmpd3d_setDEnv(t_pmpd3d *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; @@ -147,11 +227,51 @@ void pmpd3d_setDEnv(t_pmpd3d *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].D2 = K*vec[n].w_float; + n++; + if (n >= npoints) 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(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 pmpd3d_setDEnvOffset(t_pmpd3d *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; @@ -202,11 +322,51 @@ void pmpd3d_setDEnvOffset(t_pmpd3d *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].D2offset = K*vec[n].w_float; + n++; + if (n >= npoints) 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(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 pmpd3d_setL(t_pmpd3d *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; @@ -696,7 +856,11 @@ void pmpd3d_setInactive(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) void pmpd3d_pos(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { // displace a mass to a certain position - t_int tmp, i; + t_int tmp, i, offset; + t_garray *a; + int npoints, n; + t_word *vec; + t_float K; if ( (argc == 4) && ( argv[0].a_type == A_FLOAT ) && ( argv[1].a_type == A_FLOAT ) && ( argv[2].a_type == A_FLOAT ) && ( argv[3].a_type == A_FLOAT ) ) { @@ -730,12 +894,75 @@ void pmpd3d_pos(t_pmpd3d *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++; + x->mass[i].posZ = K*vec[n].w_float; + x->mass[i].speedZ = 0; + x->mass[i].forceZ = 0; + n++; + if (n >= npoints +2) 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/3,x->nb_mass-offset); + n+=offset; + for (i=offset; i < n; i++) + { + x->mass[i].posX = K*vec[3*i].w_float; + x->mass[i].posY = K*vec[3*i+1].w_float; + x->mass[i].posZ = K*vec[3*i+2].w_float; + x->mass[i].speedX = 0; + x->mass[i].forceX = 0; + x->mass[i].speedY = 0; + x->mass[i].forceY = 0; + x->mass[i].speedZ = 0; + x->mass[i].forceZ = 0; + } + } + } } void pmpd3d_posX(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { // displace a mass to a certain position - t_int tmp, i; + t_int tmp, i, offset; + 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 ) ) { @@ -759,12 +986,61 @@ void pmpd3d_posX(t_pmpd3d *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++; + if (n >= npoints) 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(npoints,x->nb_mass-offset); + n+=offset; + for (i=offset; i < n; i++) + { + x->mass[i].posX = K*vec[i].w_float; + x->mass[i].speedX = 0; + x->mass[i].forceX = 0; + } + } + } } void pmpd3d_posY(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { // displace a mass to a certain position - t_int tmp, i; + t_int tmp, i, offset; + 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 ) ) { @@ -787,12 +1063,61 @@ void pmpd3d_posY(t_pmpd3d *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].posY = K*vec[n].w_float; + x->mass[i].speedY = 0; + x->mass[i].forceY = 0; + n++; + if (n >= npoints) 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(npoints,x->nb_mass-offset); + n+=offset; + for (i=offset; i < n; i++) + { + x->mass[i].posY = K*vec[i].w_float; + x->mass[i].speedY = 0; + x->mass[i].forceY = 0; + } + } + } } void pmpd3d_posZ(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { // displace a mass to a certain position - t_int tmp, i; + t_int tmp, i, offset; + 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 ) ) { @@ -815,6 +1140,51 @@ void pmpd3d_posZ(t_pmpd3d *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].posZ = K*vec[n].w_float; + x->mass[i].speedZ = 0; + x->mass[i].forceZ = 0; + n++; + if (n >= npoints) 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(npoints,x->nb_mass-offset); + n+=offset; + for (i=offset; i < n; i++) + { + x->mass[i].posZ = K*vec[i].w_float; + x->mass[i].speedZ = 0; + x->mass[i].forceZ = 0; + } + } + } } void pmpd3d_overdamp(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) -- cgit v1.2.1