From ebbeac04a2f1f57cac1bfd87b6da0f58c033e9a8 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Thu, 28 Apr 2005 15:22:14 +0000 Subject: MSD version 0.05 svn path=/trunk/externals/nusmuk/; revision=2846 --- msd/03_msdwave.pd | 22 ++-- msd/help-msd.pd | 18 +-- msd/main.cpp | 344 +++++++++++++++++++++++++++++------------------------- 3 files changed, 206 insertions(+), 178 deletions(-) (limited to 'msd') diff --git a/msd/03_msdwave.pd b/msd/03_msdwave.pd index e69ae1b..4ac3ab6 100644 --- a/msd/03_msdwave.pd +++ b/msd/03_msdwave.pd @@ -12,22 +12,22 @@ #N canvas 721 124 605 590 massrender 0; #X obj 127 22 inlet; #X obj 48 203 translateXYZ; -#X obj 64 114 gemhead; #X obj 48 177 separator; #X obj 48 153 any; #X obj 127 136 t b f; #X obj 127 57 unpack f f f; #X obj 48 283 cuboid 0.065 0.065 0.07; -#X connect 0 0 6 0; -#X connect 1 0 7 0; -#X connect 2 0 4 1; -#X connect 3 0 1 0; +#X obj 64 114 gemhead 45; +#X connect 0 0 5 0; +#X connect 1 0 6 0; +#X connect 2 0 1 0; +#X connect 3 0 2 0; #X connect 4 0 3 0; +#X connect 4 1 1 1; #X connect 5 0 4 0; -#X connect 5 1 1 1; -#X connect 6 0 5 0; -#X connect 6 1 1 2; -#X connect 6 2 7 3; +#X connect 5 1 1 2; +#X connect 5 2 6 3; +#X connect 7 0 3 1; #X restore 265 625 pd massrender; #X msg 203 83 symbol reset; #X text 793 205 Select view; @@ -67,7 +67,7 @@ #X msg 63 718 get massesPos \$1; #X obj 602 334 rotateXYZ; #X obj 651 450 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 --1 -1 0 1; +-1 -1 1400 1; #X obj 670 450 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 -1 -1 0 1; #X obj 689 450 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131 @@ -104,7 +104,7 @@ z is asked to the 1D model.; test synchronization between msd objects; #X obj 33 537 unpack f f f; #X obj 443 546 unpack f f; -#X obj 173 598 f; +#X obj 173 597 f; #X obj 33 574 t b f; #X connect 0 0 12 0; #X connect 2 0 1 0; diff --git a/msd/help-msd.pd b/msd/help-msd.pd index 157d95f..22d551f 100644 --- a/msd/help-msd.pd +++ b/msd/help-msd.pd @@ -16,7 +16,6 @@ #X obj 61 403 cnv 15 610 210 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; #X text 350 467 \$2 : New value; -#X text 348 503 \$1 : Id (symbol); #X text 348 521 \$2 : New value; #X msg 87 429 posX \$1 \$2; #X text 350 431 Set position of mass(es); @@ -58,18 +57,19 @@ their; #X text 345 594 \$1 : Creation No of mass; #X text 334 271 \$4 : initial position; #X text 350 449 \$1 : Id (symbol) or No; +#X text 348 503 \$1 : Id (symbol) or No; #X connect 2 0 0 0; #X connect 9 0 0 0; -#X connect 15 0 0 0; -#X connect 18 0 0 0; +#X connect 14 0 0 0; +#X connect 17 0 0 0; +#X connect 19 0 0 0; #X connect 20 0 0 0; -#X connect 21 0 0 0; -#X connect 24 0 0 0; +#X connect 23 0 0 0; +#X connect 27 0 0 0; #X connect 28 0 0 0; -#X connect 29 0 0 0; -#X connect 32 0 0 0; -#X connect 34 0 0 0; -#X connect 43 0 0 0; +#X connect 31 0 0 0; +#X connect 33 0 0 0; +#X connect 42 0 0 0; #X restore 282 323 pd masses; #N canvas 222 83 808 841 links 0; #X obj 33 821 msd; diff --git a/msd/main.cpp b/msd/main.cpp index f74ba3d..28b3276 100755 --- a/msd/main.cpp +++ b/msd/main.cpp @@ -30,7 +30,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Version 0.04 -- 26.04.2005 + Version 0.05 -- 28.04.2005 */ // include flext header @@ -38,7 +38,7 @@ #include // define constants -#define MSD_VERSION 0.04 +#define MSD_VERSION 0.05 #define nb_max_link 4000 #define nb_max_mass 4000 #define Id_length 20 @@ -112,13 +112,14 @@ protected: void m_reset() { t_int i; -// t_atom sortie; + t_mass **mi; + t_link **li; - for (i=0; imass1->posX-link[i]->mass2->posX; // L[n] = x1 - x2 + distance = (*li)->mass1->posX-(*li)->mass2->posX; // L[n] = x1 - x2 if (distance < 0) distance = -distance; // |L[n]| - if (distance < link[i]->long_min || distance > link[i]->long_max) + if (distance < (*li)->long_min || distance > (*li)->long_max) Fx = 0; else { // Lmin < L < Lmax - F = link[i]->K1 * (distance - link[i]->longueur) ; // F[n] = k1 (L[n] - L[0]) - F += link[i]->D1 * (distance - link[i]->distance_old) ; // F[n] = F[n] + D1 (L[n] - L[n-1]) + F = (*li)->K1 * (distance - (*li)->longueur) ; // F[n] = k1 (L[n] - L[0]) + F += (*li)->D1 * (distance - (*li)->distance_old) ; // F[n] = F[n] + D1 (L[n] - L[n-1]) if (distance != 0) - Fx = F * (link[i]->mass1->posX - link[i]->mass2->posX)/distance; // Fx = F * Lx[n]/L[n] + Fx = F * ((*li)->mass1->posX - (*li)->mass2->posX)/distance; // Fx = F * Lx[n]/L[n] } - link[i]->mass1->forceX -= Fx; // Fx1[n] = -Fx - link[i]->mass1->forceX -= link[i]->D2*link[i]->mass1->speedX; // Fx1[n] = Fx1[n] - D2 * vx1[n-1] - link[i]->mass2->forceX += Fx; // Fx2[n] = Fx - link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; // Fx2[n] = Fx2[n] - D2 * vx2[n-1] - link[i]->distance_old = distance; // L[n-1] = L[n] + (*li)->mass1->forceX -= Fx; // Fx1[n] = -Fx + (*li)->mass1->forceX -= (*li)->D2*(*li)->mass1->speedX; // Fx1[n] = Fx1[n] - D2 * vx1[n-1] + (*li)->mass2->forceX += Fx; // Fx2[n] = Fx + (*li)->mass2->forceX -= (*li)->D2*(*li)->mass2->speedX; // Fx2[n] = Fx2[n] - D2 * vx2[n-1] + (*li)->distance_old = distance; // L[n-1] = L[n] } - - - for (i=0; imobile == 1) { - X_new = mass[i]->forceX * mass[i]->invM + 2*mass[i]->posX - mass[i]->posX2; // x[n] =Fx[n]/M+2x[n]-x[n-1] - mass[i]->posX2 = mass[i]->posX; // x[n-2] = x[n-1] - mass[i]->posX = max(min(X_new,Xmax),Xmin); // x[n-1] = x[n] - mass[i]->speedX = mass[i]->posX - mass[i]->posX2; // vx[n] = x[n] - x[n-1] + if ((*mi)->mobile == 1) { + X_new = (*mi)->forceX * (*mi)->invM + 2*(*mi)->posX - (*mi)->posX2; // x[n] =Fx[n]/M+2x[n]-x[n-1] + (*mi)->posX2 = (*mi)->posX; // x[n-2] = x[n-1] + (*mi)->posX = max(min(X_new,Xmax),Xmin); // x[n-1] = x[n] + (*mi)->speedX = (*mi)->posX - (*mi)->posX2; // vx[n] = x[n] - x[n-1] } - for (i=0; iout_forceX = mass[i]->forceX; - mass[i]->forceX = 0; // Fx[n] = 0 + (*mi)->out_forceX = (*mi)->forceX; + (*mi)->forceX = 0; // Fx[n] = 0 } } @@ -213,43 +212,54 @@ protected: void m_forceX(int argc,t_atom *argv) { - // add a force to mass(es) named Id + // add a force to mass(es) named Id or No t_int i; - const t_symbol *sym = GetSymbol(argv[0]); + const t_symbol *sym = GetASymbol(argv[0]); + t_mass **mi; if (argc != 2) error("forceX : Idmass value"); - for (i=0; iId) - mass[i]->forceX += GetFloat(argv[1]); - } + if (sym ==0) + for (i=0, mi=mass; inbr) { + (*mi)->forceX = GetFloat(argv[1]); + break; + } + } + else + for (i=0, mi=mass; iId) + (*mi)->forceX = GetFloat(argv[1]); + } } void m_posX(int argc,t_atom *argv) { - // displace mass(es) named Id to a certain position + // displace mass(es) named Id or No to a certain position t_int i; const t_symbol *sym = GetASymbol(argv[0]); + t_mass **mi; if (argc != 2) error("posX : Id/Nomass value"); if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin) if (sym ==0) - for (i=0; inbr) { - mass[i]->posX = GetFloat(argv[1]); + if (GetInt(argv[0]) == (*mi)->nbr) { + (*mi)->posX = GetFloat(argv[1]); break; } } else - for (i=0; iId) - mass[i]->posX = GetFloat(argv[1]); + if (sym == (*mi)->Id) + (*mi)->posX = GetFloat(argv[1]); } } @@ -257,15 +267,16 @@ protected: { // set mass No to mobile t_int i,aux; + t_mass **mi; if (argc != 1) error("setMobile : Idmass"); aux = GetInt(argv[0]); - for (i=0; inbr == aux) - mass[i]->mobile = 1; + if ((*mi)->nbr == aux) + (*mi)->mobile = 1; } } @@ -274,15 +285,16 @@ protected: { // set mass No to fixed t_int i,aux; + t_mass **mi; if (argc != 1) error("setFixed : Idmass"); aux = GetInt(argv[0]); - for (i=0; inbr == aux) - mass[i]->mobile = 0; + if ((*mi)->nbr == aux) + (*mi)->mobile = 0; } } @@ -293,14 +305,16 @@ protected: t_int i,nb_link_delete=0; t_atom sortie[5]; NEWARR(t_atom,aux,nb_link); - + t_mass **mi; + t_link **li; + if (argc != 1) error("deleteMass : Nomass"); // Delete all associated links - for (i=0; imass1->nbr == GetAInt(argv[0]) || link[i]->mass2->nbr == GetAInt(argv[0])) { - SetFloat((aux[nb_link_delete]),link[i]->nbr); + for (i=0, li=link; imass1->nbr == GetAInt(argv[0]) || (*li)->mass2->nbr == GetAInt(argv[0])) { + SetFloat((aux[nb_link_delete]),(*li)->nbr); nb_link_delete++; } } @@ -309,15 +323,15 @@ protected: m_delete_link(1,&aux[i]); // Delete mass - for (i=0; inbr == GetAInt(argv[0])) { - SetFloat((sortie[0]),mass[i]->nbr); - SetSymbol((sortie[1]),mass[i]->Id); - SetFloat((sortie[2]),mass[i]->mobile); - SetFloat((sortie[3]),1/mass[i]->invM); - SetFloat((sortie[4]),mass[i]->posX); - delete mass[i]; - mass[i] = mass[nb_mass-1]; // copy last mass instead + for (i=0, mi=mass; inbr == GetAInt(argv[0])) { + SetFloat((sortie[0]),(*mi)->nbr); + SetSymbol((sortie[1]),(*mi)->Id); + SetFloat((sortie[2]),(*mi)->mobile); + SetFloat((sortie[3]),1/(*mi)->invM); + SetFloat((sortie[4]),(*mi)->posX); + delete (*mi); + (*mi) = mass[nb_mass-1]; // copy last mass instead nb_mass--; ToOutAnything(1,S_Mass_deleted,5,sortie); break; @@ -354,18 +368,20 @@ protected: t_int i; t_mass *mass1 = NULL; t_mass *mass2 = NULL; - + t_mass **mi; + + if (argc < 6 || argc > 8) error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); // check for existence of link masses: - for (i=0; inbr==GetInt(argv[1])) // pointer to mass1 + for (i=0, mi=mass; inbr==GetInt(argv[1])) // pointer to mass1 // we found mass1 - mass1 = mass[i]; - else if (mass[i]->nbr==GetInt(argv[2])) // pointer to mass2 + mass1 = (*mi); + else if ((*mi)->nbr==GetInt(argv[2])) // pointer to mass2 // ... and mass2 - mass2 = mass[i]; + mass2 = (*mi); if (mass1 and mass2) { @@ -422,6 +438,7 @@ protected: NEWARR(t_int,imass1,nb_mass); NEWARR(t_int,imass2,nb_mass); t_symbol *Id1, *Id2; + t_mass **mi; if (argc < 6 || argc > 8) error("ilink : Id Idmass1 Idmass2 K D1 D2 (Lmin Lmax)"); @@ -430,12 +447,12 @@ protected: Id2 = GetSymbol(argv[2]); ToOutAnything(1,S_iLink,0,aux); - for (i=0;iId) { + for (i=0, mi=mass; iId) { imass1[nbmass1]=i; nbmass1++; } - if (Id2 == mass[i]->Id) { + if (Id2 == (*mi)->Id) { imass2[nbmass2]=i; nbmass2++; } @@ -471,14 +488,15 @@ protected: // set rigidity of link(s) named Id t_int i; const t_symbol *sym = GetSymbol(argv[0]); + t_link **li; if (argc != 2) error("setK : IdLink Value"); - for (i=0; iId) - link[i]->K1 = GetFloat(argv[1]); + if (sym == (*li)->Id) + (*li)->K1 = GetFloat(argv[1]); } } @@ -487,14 +505,15 @@ protected: // set damping of link(s) named Id t_int i; const t_symbol *sym = GetSymbol(argv[0]); + t_link **li; if (argc != 2) error("setD : IdLink Value"); - for (i=0; iId) - link[i]->D1 = GetFloat(argv[1]); + if (sym == (*li)->Id) + (*li)->D1 = GetFloat(argv[1]); } } @@ -503,14 +522,15 @@ protected: // set damping of link(s) named Id t_int i; const t_symbol *sym = GetSymbol(argv[0]); + t_link **li; if (argc != 2) error("setD2 : IdLink Value"); - for (i=0; iId) - link[i]->D2 = GetFloat(argv[1]); + if (sym == (*li)->Id) + (*li)->D2 = GetFloat(argv[1]); } } @@ -519,21 +539,22 @@ protected: // Delete link t_int i; t_atom sortie[7]; + t_link **li; if (argc != 1) error("deleteLink : NoLink"); - for (i=0; inbr == GetInt(argv[0])) { - SetFloat((sortie[0]),link[i]->nbr); - SetSymbol((sortie[1]),link[i]->Id); - SetFloat((sortie[2]),link[i]->mass1->nbr); - SetFloat((sortie[3]),link[i]->mass2->nbr); - SetFloat((sortie[4]),link[i]->K1); - SetFloat((sortie[5]),link[i]->D1); - SetFloat((sortie[6]),link[i]->D2); - delete link[i]; - link[i]=link[nb_link-1]; // copy last link instead + for (i=0, li=link; inbr == GetInt(argv[0])) { + SetFloat((sortie[0]),(*li)->nbr); + SetSymbol((sortie[1]),(*li)->Id); + SetFloat((sortie[2]),(*li)->mass1->nbr); + SetFloat((sortie[3]),(*li)->mass2->nbr); + SetFloat((sortie[4]),(*li)->K1); + SetFloat((sortie[5]),(*li)->D1); + SetFloat((sortie[6]),(*li)->D2); + delete (*li); + (*li)=link[nb_link-1]; // copy last link instead nb_link--; ToOutAnything(1,S_Link_deleted,7,sortie); break; @@ -550,37 +571,40 @@ protected: t_int i,j; t_symbol *auxarg,*auxarg2, *auxtype; t_atom sortie[3]; + t_mass **mi; + t_link **li; + auxtype = GetSymbol(argv[0]); auxarg = GetASymbol(argv[1]); //auxarg : & symbol, 0 else if (argc == 1) { if (auxtype == S_massesPos) // get all masses positions - for (i=0; inbr); - SetFloat(sortie[1],mass[i]->posX); + SetFloat(sortie[0],(*mi)->nbr); + SetFloat(sortie[1],(*mi)->posX); ToOutAnything(0,S_massesPos,2,sortie); } else if (auxtype == S_massesForces) // get all masses forces - for (i=0; inbr); - SetFloat(sortie[1],mass[i]->out_forceX); + SetFloat(sortie[0],(*mi)->nbr); + SetFloat(sortie[1],(*mi)->out_forceX); ToOutAnything(0,S_massesForces,2,sortie); } else if (auxtype == S_linksPos) // get all links positions - for (i=0; inbr); - SetFloat(sortie[1],link[i]->mass1->posX); - SetFloat(sortie[2],link[i]->mass2->posX); + SetFloat(sortie[0],(*li)->nbr); + SetFloat(sortie[1],(*li)->mass1->posX); + SetFloat(sortie[2],(*li)->mass2->posX); ToOutAnything(0,S_linksPos,3,sortie); } else // get all masses speeds - for (i=0; inbr); - SetFloat(sortie[1],mass[i]->speedX); + SetFloat(sortie[0],(*mi)->nbr); + SetFloat(sortie[1],(*mi)->speedX); ToOutAnything(0,S_massesSpeeds,2,sortie); } } @@ -589,11 +613,11 @@ protected: if (auxarg == 0) // No { for (j = 1; jnbr==GetInt(argv[j])) + for (i=0, mi=mass; inbr==GetInt(argv[j])) { - SetFloat(sortie[0],mass[i]->nbr); - SetFloat(sortie[1],mass[i]->posX); + SetFloat(sortie[0],(*mi)->nbr); + SetFloat(sortie[1],(*mi)->posX); ToOutAnything(0,S_massesPosNo,2,sortie); } } @@ -602,12 +626,12 @@ protected: for (j = 1; jId) + if (auxarg2==(*mi)->Id) { - SetSymbol(sortie[0],mass[i]->Id); - SetFloat(sortie[1],mass[i]->posX); + SetSymbol(sortie[0],(*mi)->Id); + SetFloat(sortie[1],(*mi)->posX); ToOutAnything(0,S_massesPosId,2,sortie); } } @@ -619,11 +643,11 @@ protected: if (auxarg == 0) // No { for (j = 1; jnbr==GetInt(argv[j])) + for (i=0, mi=mass; inbr==GetInt(argv[j])) { - SetFloat(sortie[0],mass[i]->nbr); - SetFloat(sortie[1],mass[i]->out_forceX); + SetFloat(sortie[0],(*mi)->nbr); + SetFloat(sortie[1],(*mi)->out_forceX); ToOutAnything(0,S_massesForcesNo,2,sortie); } } @@ -632,12 +656,12 @@ protected: for (j = 1; jId) + if (auxarg2==(*mi)->Id) { - SetSymbol(sortie[0],mass[i]->Id); - SetFloat(sortie[1],mass[i]->out_forceX); + SetSymbol(sortie[0],(*mi)->Id); + SetFloat(sortie[1],(*mi)->out_forceX); ToOutAnything(0,S_massesForcesId,2,sortie); } } @@ -649,12 +673,12 @@ protected: if (auxarg == 0) // No { for (j = 1; jnbr==GetInt(argv[j])) + for (i=0, li=link; inbr==GetInt(argv[j])) { - SetFloat(sortie[0],link[i]->nbr); - SetFloat(sortie[1],link[i]->mass1->posX); - SetFloat(sortie[2],link[i]->mass2->posX); + SetFloat(sortie[0],(*li)->nbr); + SetFloat(sortie[1],(*li)->mass1->posX); + SetFloat(sortie[2],(*li)->mass2->posX); ToOutAnything(0,S_linksPosNo,3,sortie); } } @@ -663,13 +687,13 @@ protected: for (j = 1; jId) + if (auxarg2==(*li)->Id) { - SetSymbol(sortie[0],link[i]->Id); - SetFloat(sortie[1],link[i]->mass1->posX); - SetFloat(sortie[2],link[i]->mass2->posX); + SetSymbol(sortie[0],(*li)->Id); + SetFloat(sortie[1],(*li)->mass1->posX); + SetFloat(sortie[2],(*li)->mass2->posX); ToOutAnything(0,S_linksPosId,3,sortie); } } @@ -681,11 +705,11 @@ protected: if (auxarg == 0) // No { for (j = 1; jnbr==GetInt(argv[j])) + for (i=0, mi=mass; inbr==GetInt(argv[j])) { - SetFloat(sortie[0],mass[i]->nbr); - SetFloat(sortie[1],mass[i]->speedX); + SetFloat(sortie[0],(*mi)->nbr); + SetFloat(sortie[1],(*mi)->speedX); ToOutAnything(0,S_massesSpeedsNo,2,sortie); } } @@ -694,12 +718,12 @@ protected: for (j = 1; jId) + if (auxarg2==(*mi)->Id) { - SetSymbol(sortie[0],mass[i]->Id); - SetFloat(sortie[1],mass[i]->speedX); + SetSymbol(sortie[0],(*mi)->Id); + SetFloat(sortie[1],(*mi)->speedX); ToOutAnything(0,S_massesSpeedsId,2,sortie); } } @@ -715,9 +739,10 @@ protected: { NEWARR(t_atom,sortie,nb_mass); t_int i; + t_mass **mi; - for (i=0; iposX); + for (i=0, mi=mass; iposX); } ToOutAnything(0, S_massesPosL, nb_mass, sortie); DELARR(sortie); @@ -728,9 +753,10 @@ protected: { NEWARR(t_atom,sortie,nb_mass); t_int i; + t_mass **mi; - for (i=0; iout_forceX); + for (i=0, mi=mass; iout_forceX); } ToOutAnything(0, S_massesForcesL, nb_mass, sortie); DELARR(sortie); @@ -741,24 +767,26 @@ protected: { t_atom sortie[7]; t_int i; + t_mass **mi; + t_link **li; - for (i=0; inbr); - SetSymbol((sortie[1]),mass[i]->Id); - SetFloat((sortie[2]),mass[i]->mobile); - SetFloat((sortie[3]),1/mass[i]->invM); - SetFloat((sortie[4]),mass[i]->posX); + for (i=0, mi=mass; inbr); + SetSymbol((sortie[1]),(*mi)->Id); + SetFloat((sortie[2]),(*mi)->mobile); + SetFloat((sortie[3]),1/(*mi)->invM); + SetFloat((sortie[4]),(*mi)->posX); ToOutAnything(1, S_Mass, 5, sortie); } - for (i=0; inbr); - SetSymbol((sortie[1]),link[i]->Id); - SetFloat((sortie[2]),link[i]->mass1->nbr); - SetFloat((sortie[3]),link[i]->mass2->nbr); - SetFloat((sortie[4]),link[i]->K1); - SetFloat((sortie[5]),link[i]->D1); - SetFloat((sortie[6]),link[i]->D2); + for (i=0, li=link; inbr); + SetSymbol((sortie[1]),(*li)->Id); + SetFloat((sortie[2]),(*li)->mass1->nbr); + SetFloat((sortie[3]),(*li)->mass2->nbr); + SetFloat((sortie[4]),(*li)->K1); + SetFloat((sortie[5]),(*li)->D1); + SetFloat((sortie[6]),(*li)->D2); ToOutAnything(1, S_Link, 7, sortie); } -- cgit v1.2.1