Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

externals/nusmuk msd.h,1.8,1.9
by Nicolas Montgermont 17 May '05

17 May '05

Update of /cvsroot/pure-data/externals/nusmuk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10161 Modified Files: msd.h Log Message: MSD Version 0.07 Index: msd.h =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** msd.h 9 May 2005 14:12:19 -0000 1.8 --- msd.h 17 May 2005 15:37:42 -0000 1.9 *************** *** 30,34 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.05 -- 28.04.2005 */ --- 30,34 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.07 -- 17.05.2005 */ *************** *** 41,46 **** // define constants ! #define MSD_VERSION 0.05 ! // check for appropriate flext version --- 41,46 ---- // define constants ! #define MSD_VERSION 0.07 ! #define PI 3.1415926535 // check for appropriate flext version *************** *** 70,74 **** void insert(Link<N> *l) { ! for(typename LinkList::iterator it = begin(); it != end(); ++it) if(*it == l) return; // not found -> add --- 70,74 ---- void insert(Link<N> *l) { ! for(typename LinkList<N>::iterator it = this->begin(); it != this->end(); ++it) if(*it == l) return; // not found -> add *************** *** 78,82 **** void erase(Link<N> *l) { ! for(typename LinkList::iterator it = begin(); it != end(); ++it) if(*it == l) { // found --- 78,82 ---- void erase(Link<N> *l) { ! for(typename LinkList<N>::iterator it = this->begin(); it != this->end(); ++it) if(*it == l) { // found *************** *** 166,178 **** t_float longueur, long_min, long_max; t_float distance_old; ! Link(t_int n,const t_symbol *id,Mass<N> *m1,Mass<N> *m2,t_float k1,t_float d1,t_float d2,t_float lmin,t_float lmax) : nbr(n),Id(id) , mass1(m1),mass2(m2) ! , K1(k1),D1(d1),D2(d2) , long_min(lmin),long_max(lmax) { ! distance_old = longueur = Mass<N>::dist(*mass1,*mass2); // L[n-1] ! mass1->links.insert(this); mass2->links.insert(this); --- 166,227 ---- t_float longueur, long_min, long_max; t_float distance_old; + t_float puissance; + t_int oriented; //0 : no, 1 : tangential, 2 : normal + t_float tdirection1[3], tdirection2[3]; ! Link(t_int n,const t_symbol *id,Mass<N> *m1,Mass<N> *m2,t_float k1,t_float d1, t_int o=0, t_float xa=0, t_float ya=0, t_float za=0,t_float pow=1, t_float lmin = 0,t_float lmax = 1e10) : nbr(n),Id(id) , mass1(m1),mass2(m2) ! , K1(k1),D1(d1),D2(0),oriented(o),puissance(pow) , long_min(lmin),long_max(lmax) { ! for (int i=0; i<3; i++) { ! tdirection1[i] = 0; ! tdirection2[i] = 0; ! } ! if (oriented == 0) ! distance_old = longueur = Mass<N>::dist(*mass1,*mass2); // L[n-1] ! else if (oriented == 1) { // TANGENTIAL LINK ! const t_float norme = sqrt(sqr(xa)+sqr(ya)+sqr(za)); ! tdirection1[0] = xa/norme; ! tdirection1[1] = ya/norme; ! tdirection1[2] = za/norme; ! distance_old = 0; ! for(int i = 0; i < N; ++i) ! distance_old += sqr((m1->pos[i]-m2->pos[i])*tdirection1[i]); ! distance_old = sqrt(distance_old); ! longueur = distance_old; ! } ! else if (oriented == 2) { // NORMAL LINK 2D ! if (N >= 2) { ! const t_float norme = sqrt(sqr(xa)+sqr(ya)); ! tdirection1[0]=ya/norme; ! tdirection1[1]=xa/norme; ! distance_old = 0; ! for(int i = 0; i < N; ++i) ! distance_old += sqr((m1->pos[i]-m2->pos[i])*tdirection1[i]); ! if (N == 3) { // NORMAL LINK 3D ! if (xa == 0 && ya==0 && za!= 0) { // Special case ! tdirection1[0]=1; ! tdirection1[1]=0; ! tdirection1[2]=0; ! tdirection2[0]=0; ! tdirection2[1]=1; ! tdirection2[2]=0; ! } ! else { // Normal case ! const t_float norme2 = sqrt(sqr(xa*ya +za*xa)+sqr(xa*ya+za*ya)+sqr(sqr(xa)+sqr(ya))); ! tdirection2[0] = (xa*za+xa*ya)/norme2; ! tdirection2[1] = (xa*ya+za*ya)/norme2; ! tdirection2[2] = (sqr(xa)+sqr(ya))/norme2; ! } ! distance_old = 0; ! for(int i = 0; i < N; ++i) ! distance_old += sqr((m1->pos[i]-m2->pos[i])*(tdirection1[i]+tdirection2[i])); ! } ! distance_old = sqrt(distance_old); ! longueur = distance_old; ! } ! } mass1->links.insert(this); mass2->links.insert(this); *************** *** 188,206 **** inline void compute() { Mass<N> *m1 = mass1,*m2 = mass2; // cache locally ! t_float distance = Mass<N>::dist(*m1,*m2); if (distance < long_min || distance > long_max || distance == 0) { ! for(int i = 0; i < N; ++i) { ! m1->force[i] -= D2 * m1->speed[i]; // Fx1[n] = -Fx, Fx1[n] = Fx1[n] - D2 * vx1[n-1] ! m2->force[i] += D2 * m2->speed[i]; // Fx2[n] = Fx, Fx2[n] = Fx2[n] - D2 * vx2[n-1] ! } } ! else { // Lmin < L < Lmax ! const t_float F = (K1 * (distance - longueur) + D1 * (distance - distance_old))/distance ; // F[n] = k1 (L[n] - L[0])/L[n] + D1 (L[n] - L[n-1])/L[n] ! for(int i = 0; i < N; ++i) { ! const t_float Fn = F * (m1->pos[i] - m2->pos[i]); // Fx = F * Lx[n]/L[n] ! m1->force[i] -= Fn + D2 * m1->speed[i]; // Fx1[n] = -Fx, Fx1[n] = Fx1[n] - D2 * vx1[n-1] ! m2->force[i] += Fn - D2 * m2->speed[i]; // Fx2[n] = Fx, Fx2[n] = Fx2[n] - D2 * vx2[n-1] ! } } --- 237,286 ---- inline void compute() { + t_float distance=0; + t_float F; Mass<N> *m1 = mass1,*m2 = mass2; // cache locally ! if (oriented == 0) ! distance = Mass<N>::dist(*m1,*m2); ! else if (oriented == 1) { ! for(int i = 0; i < N; ++i) ! distance += sqr((m1->pos[i]-m2->pos[i])*tdirection1[i]); ! distance = sqrt(distance); ! } ! else if (oriented == 2) { ! for(int i = 0; i < N; ++i) ! distance += sqr((m1->pos[i]-m2->pos[i])*(tdirection1[i] +tdirection2[i])); ! distance = sqrt(distance); ! } ! if (distance < long_min || distance > long_max || distance == 0) { ! // for(int i = 0; i < N; ++i) { ! // m1->force[i] -= D2 * m1->speed[i]; // Fx1[n] = -Fx, Fx1[n] = Fx1[n] - D2 * vx1[n-1] ! // m2->force[i] += D2 * m2->speed[i]; // Fx2[n] = Fx, Fx2[n] = Fx2[n] - D2 * vx2[n-1] ! // } } ! else { // Lmin < L < Lmax ! // F[n] = k1 (L[n] - L[0])/L[n] + D1 (L[n] - L[n-1])/L[n] ! if ((distance - longueur)>0) ! F = (K1 * pow(distance - longueur,puissance) + D1 * (distance - distance_old))/distance ; ! else ! F = (-K1 * pow(longueur - distance,puissance) + D1 * (distance - distance_old))/distance ; ! if (oriented == 0) ! for(int i = 0; i < N; ++i) { ! const t_float Fn = F * (m1->pos[i] - m2->pos[i]); // Fx = F * Lx[n]/L[n] ! m1->force[i] -= Fn + D2 * m1->speed[i]; // Fx1[n] = -Fx, Fx1[n] = Fx1[n] - D2 * vx1[n-1] ! m2->force[i] += Fn - D2 * m2->speed[i]; // Fx2[n] = Fx, Fx2[n] = Fx2[n] - D2 * vx2[n-1] ! } ! else if (oriented == 1 || (oriented == 2 && N == 2)) ! for(int i = 0; i < N; ++i) { ! const t_float Fn = F * (m1->pos[i] - m2->pos[i])*tdirection1[i]; // Fx = F * Lx[n]/L[n] ! m1->force[i] -= Fn + D2 * m1->speed[i]; // Fx1[n] = -Fx, Fx1[n] = Fx1[n] - D2 * vx1[n-1] ! m2->force[i] += Fn - D2 * m2->speed[i]; // Fx2[n] = Fx, Fx2[n] = Fx2[n] - D2 * vx2[n-1] ! } ! else if (oriented == 2 && N == 3) ! for(int i = 0; i < N; ++i) { ! const t_float Fn = F * (m1->pos[i] - m2->pos[i])*(tdirection1[i] +tdirection2[i]); // Fx = F * Lx[n]/L[n] ! m1->force[i] -= Fn + D2 * m1->speed[i]; // Fx1[n] = -Fx, Fx1[n] = Fx1[n] - D2 * vx1[n-1] ! m2->force[i] += Fn - D2 * m2->speed[i]; // Fx2[n] = Fx, Fx2[n] = Fx2[n] - D2 * vx2[n-1] ! } } *************** *** 450,463 **** { if (argc != 1) { ! error("%s - %s Syntax : Idmass",thisName(),GetString(thisTag())); return; } ! ! t_mass *m = mass.find(GetAInt(argv[0])); ! if(m) ! if(mob) m->setMobile(); ! else m->setFixed(); ! else ! error("%s - %s : Index not found",thisName(),GetString(thisTag())); } --- 530,553 ---- { if (argc != 1) { ! error("%s - %s Syntax : Id/Nomass",thisName(),GetString(thisTag())); return; } ! if(IsSymbol(argv[0])) { ! typename IDMap<t_mass *>::iterator it; ! if(mob) ! for(it = massids.find(GetSymbol(argv[0])); it; ++it) ! it.data()->setMobile(); ! else ! for(it = massids.find(GetSymbol(argv[0])); it; ++it) ! it.data()->setFixed(); ! } ! else { ! t_mass *m = mass.find(GetAInt(argv[0])); ! if(m) ! if(mob) m->setMobile(); ! else m->setFixed(); ! else ! error("%s - %s : Index not found",thisName(),GetString(thisTag())); ! } } *************** *** 531,540 **** } } - - } // Set fixed if mobile ! mobil = mass.find(nearest_mass)->M; SetInt(aux2[0],nearest_mass); if (mobil != 0) --- 621,628 ---- } } } // Set fixed if mobile ! mobil = mass.find(nearest_mass)->invM; SetInt(aux2[0],nearest_mass); if (mobil != 0) *************** *** 566,598 **** void m_link(int argc,t_atom *argv) { ! if (argc < 6 || argc > 8) { ! error("%s - %s Syntax : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)",thisName(),GetString(thisTag())); return; } ! ! t_mass *mass1 = mass.find(GetAInt(argv[1])); ! t_mass *mass2 = mass.find(GetAInt(argv[2])); ! ! if(!mass1 || !mass2) { ! error("%s - %s : Index not found",thisName(),GetString(thisTag())); ! return; } ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! mass1,mass2, // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! GetAFloat(argv[5]), // D2 ! argc >= 7?GetFloat(argv[6]):0, ! argc >= 8?GetFloat(argv[7]):32768 ! ); ! ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_Link,l); } - // add interactor link // Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax) --- 654,752 ---- void m_link(int argc,t_atom *argv) { ! if (argc < 5 || argc > 8) { ! error("%s - %s Syntax : Id No/Idmass1 No/Idmass2 K D1 (pow Lmin Lmax)",thisName(),GetString(thisTag())); return; } ! if (IsSymbol(argv[1]) && IsSymbol(argv[2])) { // ID & ID ! typename IDMap<t_mass *>::iterator it1,it2,it; ! it1 = massids.find(GetSymbol(argv[1])); ! it2 = massids.find(GetSymbol(argv[2])); ! for(; it1; ++it1) { ! for(it = it2; it; ++it) { ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! it1.data(),it.data(), // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! 0,0,0,0, ! argc >= 6?GetFloat(argv[5]):1, // power ! argc >= 7?GetFloat(argv[6]):0, ! argc >= 8?GetFloat(argv[7]):1e10 ! ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_iLink,l); ! } ! } } + else if (IsSymbol(argv[1])==0 && IsSymbol(argv[2])) { // No & ID + typename IDMap<t_mass *>::iterator it2,it; + t_mass *mass1 = mass.find(GetAInt(argv[1])); + it2 = massids.find(GetSymbol(argv[2])); + for(it = it2; it; ++it) { + t_link *l = new t_link( + id_link, + GetSymbol(argv[0]), // ID + mass1,it.data(), // pointer to mass1, mass2 + GetAFloat(argv[3]), // K1 + GetAFloat(argv[4]), // D1 + 0,0,0,0, + argc >= 6?GetFloat(argv[5]):1, // power + argc >= 7?GetFloat(argv[6]):0, + argc >= 8?GetFloat(argv[7]):1e10 + ); + linkids.insert(l); + link.insert(id_link++,l); + outlink(S_iLink,l); + } + } + else if (IsSymbol(argv[1]) && IsSymbol(argv[2])==0) { // ID & No + typename IDMap<t_mass *>::iterator it1,it; + it1 = massids.find(GetSymbol(argv[1])); + t_mass *mass2 = mass.find(GetAInt(argv[2])); + for(it = it1; it; ++it) { + t_link *l = new t_link( + id_link, + GetSymbol(argv[0]), // ID + it.data(),mass2, // pointer to mass1, mass2 + GetAFloat(argv[3]), // K1 + GetAFloat(argv[4]), // D1 + 0,0,0,0, + argc >= 6?GetFloat(argv[5]):1, // power + argc >= 7?GetFloat(argv[6]):0, + argc >= 8?GetFloat(argv[7]):1e10 + ); + linkids.insert(l); + link.insert(id_link++,l); + outlink(S_iLink,l); + } + } + else { // No & No + t_mass *mass1 = mass.find(GetAInt(argv[1])); + t_mass *mass2 = mass.find(GetAInt(argv[2])); + + if(!mass1 || !mass2) { + error("%s - %s : Index not found",thisName(),GetString(thisTag())); + return; + } + + t_link *l = new t_link( + id_link, + GetSymbol(argv[0]), // ID + mass1,mass2, // pointer to mass1, mass2 + GetAFloat(argv[3]), // K1 + GetAFloat(argv[4]), // D1 + 0,0,0,0, + argc >= 6?GetFloat(argv[5]):1, // power + argc >= 7?GetFloat(argv[6]):0, // Lmin + argc >= 8?GetFloat(argv[7]):1e10// Lmax + ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_Link,l); ! } } // add interactor link // Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax) *************** *** 600,604 **** { if (argc < 6 || argc > 8) { ! error("%s - %s Syntax : Id Idmass1 Idmass2 K D1 D2 (Lmin Lmax)",thisName(),GetString(thisTag())); return; } --- 754,758 ---- { if (argc < 6 || argc > 8) { ! error("%s - %s Syntax : Id Idmass1 Idmass2 K D1 (pow Lmin Lmax)",thisName(),GetString(thisTag())); return; } *************** *** 616,657 **** GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! GetAFloat(argv[5]), // D2 argc >= 7?GetFloat(argv[6]):0, ! argc >= 8?GetFloat(argv[7]):32768 ); linkids.insert(l); link.insert(id_link++,l); ! outlink(S_Link,l); } } } ! // set rigidity of link(s) named Id void m_setK(int argc,t_atom *argv) { if (argc != 2) { ! error("%s - %s Syntax : IdLink Value",thisName(),GetString(thisTag())); return; } ! t_float k1 = GetAFloat(argv[1]); ! typename IDMap<t_link *>::iterator it; ! for(it = linkids.find(GetSymbol(argv[0])); it; ++it) ! it.data()->K1 = k1; } ! // set damping of link(s) named Id void m_setD(int argc,t_atom *argv) { if (argc != 2) { ! error("%s - %s Syntax : IdLink Value",thisName(),GetString(thisTag())); return; } ! t_float d1 = GetAFloat(argv[1]); ! typename IDMap<t_link *>::iterator it; ! for(it = linkids.find(GetSymbol(argv[0])); it; ++it) ! it.data()->D1 = d1; } --- 770,1072 ---- GetAFloat(argv[3]), // K1 GetAFloat(argv[4]), // D1 ! 0,0,0,0, ! argc >= 6?GetFloat(argv[5]):1, // power argc >= 7?GetFloat(argv[6]):0, ! argc >= 8?GetFloat(argv[7]):1e10 ); linkids.insert(l); link.insert(id_link++,l); ! outlink(S_iLink,l); } } } ! // add a tangential link ! // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) ! void m_tlink(int argc,t_atom *argv) ! { ! if (argc < 5+N || argc > 8+N) { ! error("%s - %s Syntax : Id Nomass1 Nomass2 K D1 xa%s%s (pow Lmin Lmax)",thisName(),GetString(thisTag()),N >= 2?" ya":"",N >= 3?" za":""); ! return; ! } ! ! if (IsSymbol(argv[1]) && IsSymbol(argv[2])) { // ID & ID ! typename IDMap<t_mass *>::iterator it1,it2,it; ! it1 = massids.find(GetSymbol(argv[1])); ! it2 = massids.find(GetSymbol(argv[2])); ! for(; it1; ++it1) { ! for(it = it2; it; ++it) { ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! it1.data(),it.data(), // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! 1, // tangential ! GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! (N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! (N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! (N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ! ! ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_iLink,l); ! } ! } ! } ! else if (IsSymbol(argv[1])==0 && IsSymbol(argv[2])) { // No & ID ! typename IDMap<t_mass *>::iterator it2,it; ! t_mass *mass1 = mass.find(GetAInt(argv[1])); ! it2 = massids.find(GetSymbol(argv[2])); ! for(it = it2; it; ++it) { ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! mass1,it.data(), // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! 1, // tangential ! GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! (N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! (N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! (N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ! ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_iLink,l); ! } ! } ! else if (IsSymbol(argv[1]) && IsSymbol(argv[2])==0) { // ID & No ! typename IDMap<t_mass *>::iterator it1,it; ! it1 = massids.find(GetSymbol(argv[1])); ! t_mass *mass2 = mass.find(GetAInt(argv[2])); ! for(it = it1; it; ++it) { ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! it.data(),mass2, // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! 1, // tangential ! GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! (N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! (N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! (N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ! ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_iLink,l); ! } ! } ! else { // No & No ! t_mass *mass1 = mass.find(GetAInt(argv[1])); ! t_mass *mass2 = mass.find(GetAInt(argv[2])); ! ! if(!mass1 || !mass2) { ! error("%s - %s : Index not found",thisName(),GetString(thisTag())); ! return; ! } ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! mass1,mass2, // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! 1, // tangential ! GetAFloat(argv[5]),N >= 2?GetAFloat(argv[6]):0,N >= 3?GetAFloat(argv[7]):0, // vector ! (N==1 && argc >= 7)?GetFloat(argv[6]):((N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1)), // power ! (N==1 && argc >= 8)?GetFloat(argv[7]):((N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0)), // Lmin ! (N==1 && argc >= 9)?GetFloat(argv[8]):((N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10))// Lmax ! ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_tLink,l); ! } ! } ! ! // add a normal link ! // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) ! void m_nlink(int argc,t_atom *argv) ! { ! if (argc < 5+N || argc > 8+N) { ! error("%s - %s Syntax : Id No/Idmass1 No/Idmass2 K D1 xa%s%s (pow Lmin Lmax)",thisName(),GetString(thisTag()),N >= 2?" ya":"",N >= 3?" za":""); ! return; ! } ! ! if (N==1) { ! error("%s - %s : No normal Link in 1D",thisName(),GetString(thisTag())); ! return; ! } ! if (IsSymbol(argv[1]) && IsSymbol(argv[2])) { // ID & ID ! typename IDMap<t_mass *>::iterator it1,it2,it; ! it1 = massids.find(GetSymbol(argv[1])); ! it2 = massids.find(GetSymbol(argv[2])); ! for(; it1; ++it1) { ! for(it = it2; it; ++it) { ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! it1.data(),it.data(), // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! 2, // normal ! GetAFloat(argv[5]),GetAFloat(argv[6]),N >= 3?GetAFloat(argv[7]):0, // vector ! (N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1), // pow ! (N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0), // Lmin ! (N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10)// Lmax ! ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_nLink,l); ! } ! } ! } ! else if (IsSymbol(argv[1])==0 && IsSymbol(argv[2])) { // No & ID ! typename IDMap<t_mass *>::iterator it2,it; ! t_mass *mass1 = mass.find(GetAInt(argv[1])); ! it2 = massids.find(GetSymbol(argv[2])); ! for(it = it2; it; ++it) { ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! mass1,it.data(), // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! 2, // normal ! GetAFloat(argv[5]),GetAFloat(argv[6]),N >= 3?GetAFloat(argv[7]):0, // vector ! (N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1), // pow ! (N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0), // Lmin ! (N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10)// Lmax ! ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_nLink,l); ! } ! } ! else if (IsSymbol(argv[1]) && IsSymbol(argv[2])==0) { // ID & No ! typename IDMap<t_mass *>::iterator it1,it; ! it1 = massids.find(GetSymbol(argv[1])); ! t_mass *mass2 = mass.find(GetAInt(argv[2])); ! for(it = it1; it; ++it) { ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! it.data(),mass2, // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! 2, // normal ! GetAFloat(argv[5]),GetAFloat(argv[6]),N >= 3?GetAFloat(argv[7]):0, // vector ! (N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1), // pow ! (N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0), // Lmin ! (N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10)// Lmax ! ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_nLink,l); ! } ! } ! else { // No & No ! t_mass *mass1 = mass.find(GetAInt(argv[1])); ! t_mass *mass2 = mass.find(GetAInt(argv[2])); ! ! if(!mass1 || !mass2) { ! error("%s - %s : Index not found",thisName(),GetString(thisTag())); ! return; ! } ! ! t_link *l = new t_link( ! id_link, ! GetSymbol(argv[0]), // ID ! mass1,mass2, // pointer to mass1, mass2 ! GetAFloat(argv[3]), // K1 ! GetAFloat(argv[4]), // D1 ! 2, // normal ! GetAFloat(argv[5]),GetAFloat(argv[6]),N >= 3?GetAFloat(argv[7]):0, // vector ! (N==2 && argc >= 8)?GetFloat(argv[7]):((N==3 && argc >= 9)?GetFloat(argv[8]):1), // pow ! (N==2 && argc >= 9)?GetFloat(argv[8]):((N==3 && argc >= 10)?GetFloat(argv[9]):0), // Lmin ! (N==2 && argc >= 10)?GetFloat(argv[9]):((N==3 && argc >= 11)?GetFloat(argv[10]):1e10)// Lmax ! ); ! linkids.insert(l); ! link.insert(id_link++,l); ! outlink(S_nLink,l); ! } ! } ! ! // set rigidity of link(s) named Id or number No void m_setK(int argc,t_atom *argv) { if (argc != 2) { ! error("%s - %s Syntax : Id/NoLink Value",thisName(),GetString(thisTag())); return; } ! const t_float k1 = GetAFloat(argv[1]); ! ! if(IsSymbol(argv[0])) { ! typename IDMap<t_link *>::iterator it; ! for(it = linkids.find(GetSymbol(argv[0])); it; ++it) ! it.data()->K1 = k1; ! } ! else { ! t_link *l = link.find(GetAInt(argv[0])); ! if(l) ! l->K1 = k1; ! else ! error("%s - %s : Index not found",thisName(),GetString(thisTag())); ! } } ! // set damping of link(s) named Id or number No void m_setD(int argc,t_atom *argv) { if (argc != 2) { ! error("%s - %s Syntax : Id/NoLink Value",thisName(),GetString(thisTag())); return; } ! const t_float d1 = GetAFloat(argv[1]); ! ! if(IsSymbol(argv[0])) { ! typename IDMap<t_link *>::iterator it; ! for(it = linkids.find(GetSymbol(argv[0])); it; ++it) ! it.data()->D1 = d1; ! } ! else { ! t_link *l = link.find(GetAInt(argv[0])); ! if(l) ! l->D1 = d1; ! else ! error("%s - %s : Index not found",thisName(),GetString(thisTag())); ! } ! } ! ! // set initial lenght of link(s) named Id or number No ! void m_setL(int argc,t_atom *argv) ! { ! if (argc != 2) { ! error("%s - %s Syntax : Id/NoLink Value",thisName(),GetString(thisTag())); ! return; ! } ! ! const t_float lon = GetAFloat(argv[1]); ! ! if(IsSymbol(argv[0])) { ! typename IDMap<t_link *>::iterator it; ! for(it = linkids.find(GetSymbol(argv[0])); it; ++it) { ! it.data()->longueur = lon; ! it.data()->distance_old = lon; ! } ! } ! else { ! t_link *l = link.find(GetAInt(argv[0])); ! if(l) { ! l->longueur = lon; ! l->distance_old = lon; ! } ! else ! error("%s - %s : Index not found",thisName(),GetString(thisTag())); ! } } *************** *** 674,678 **** { if (argc != 1) { ! error("%s - %s Syntax : NoLink",thisName(),GetString(thisTag())); return; } --- 1089,1093 ---- { if (argc != 1) { ! error("%s - %s Syntax : NtLink",thisName(),GetString(thisTag())); return; } *************** *** 942,946 **** massids.reset(); mass.reset(); ! id_mass = id_link = mouse_grab = mass_deleted = link_deleted = 0; } --- 1357,1361 ---- massids.reset(); mass.reset(); ! // Reset state variables id_mass = id_link = mouse_grab = mass_deleted = link_deleted = 0; } *************** *** 967,971 **** void outlink(const t_symbol *s,const t_link *l) { ! t_atom sortie[7]; SetInt((sortie[0]),l->nbr); SetSymbol((sortie[1]),l->Id); --- 1382,1387 ---- void outlink(const t_symbol *s,const t_link *l) { ! t_atom sortie[15]; ! int size=6; SetInt((sortie[0]),l->nbr); SetSymbol((sortie[1]),l->Id); *************** *** 974,979 **** SetFloat((sortie[4]),l->K1); SetFloat((sortie[5]),l->D1); ! SetFloat((sortie[6]),l->D2); ! ToOutAnything(1,s,7,sortie); } --- 1390,1428 ---- SetFloat((sortie[4]),l->K1); SetFloat((sortie[5]),l->D1); ! ! if (l->oriented == 1 ||(l->oriented == 2 && N ==2)) { ! for (int i=0; i<N; i++) ! SetFloat((sortie[6+i]),l->tdirection1[i]); ! // ToOutAnything(1,s,6+N,sortie); ! size = 6+N; ! } ! else if (l->oriented == 2 && N==3) { ! for (int i=0; i<N; i++) { ! SetFloat((sortie[6+i]),l->tdirection1[i]); ! SetFloat((sortie[6+i+N]),l->tdirection2[i]); ! } ! // ToOutAnything(1,s,6+2*N,sortie); ! size = 6+2*N; ! } ! ! if(l->long_max != 1e10) { ! SetFloat((sortie[size]),l->puissance); ! size++; ! SetFloat((sortie[size]),l->long_min); ! size++; ! SetFloat((sortie[size]),l->long_max); ! size++; ! } ! else if(l->long_min != 0) { ! SetFloat((sortie[size]),l->puissance); ! size++; ! SetFloat((sortie[size]),l->long_min); ! size++; ! } ! else if(l->puissance != 1) { ! SetFloat((sortie[size]),l->puissance); ! size++; ! } ! ToOutAnything(1,s,size,sortie); } *************** *** 984,987 **** --- 1433,1438 ---- const static t_symbol *S_Link; const static t_symbol *S_iLink; + const static t_symbol *S_tLink; + const static t_symbol *S_nLink; const static t_symbol *S_Mass_deleted; const static t_symbol *S_Link_deleted; *************** *** 1010,1013 **** --- 1461,1466 ---- S_Link = MakeSymbol("Link"); S_iLink = MakeSymbol("iLink"); + S_tLink = MakeSymbol("tLink"); + S_nLink = MakeSymbol("nLink"); S_Mass_deleted = MakeSymbol("Mass deleted"); S_Link_deleted = MakeSymbol("Link deleted"); *************** *** 1066,1073 **** --- 1519,1529 ---- FLEXT_CADDMETHOD_(c,0,"setK",m_setK); FLEXT_CADDMETHOD_(c,0,"setD",m_setD); + FLEXT_CADDMETHOD_(c,0,"setL",m_setL); FLEXT_CADDMETHOD_(c,0,"setD2",m_setD2); FLEXT_CADDMETHOD_(c,0,"mass",m_mass); FLEXT_CADDMETHOD_(c,0,"link",m_link); FLEXT_CADDMETHOD_(c,0,"iLink",m_ilink); + FLEXT_CADDMETHOD_(c,0,"tLink",m_tlink); + FLEXT_CADDMETHOD_(c,0,"nLink",m_nlink); FLEXT_CADDMETHOD_(c,0,"get",m_get); FLEXT_CADDMETHOD_(c,0,"deleteLink",m_delete_link); *************** *** 1091,1094 **** --- 1547,1552 ---- FLEXT_CALLBACK_V(m_link) FLEXT_CALLBACK_V(m_ilink) + FLEXT_CALLBACK_V(m_tlink) + FLEXT_CALLBACK_V(m_nlink) FLEXT_CALLBACK_V(m_Xmax) FLEXT_CALLBACK_V(m_Xmin) *************** *** 1105,1108 **** --- 1563,1567 ---- FLEXT_CALLBACK_V(m_setK) FLEXT_CALLBACK_V(m_setD) + FLEXT_CALLBACK_V(m_setL) FLEXT_CALLBACK_V(m_setD2) FLEXT_CALLBACK_V(m_get) *************** *** 1117,1121 **** const t_symbol \ *msdN<N>::S_Reset,*msdN<N>::S_Mass, \ ! *msdN<N>::S_Link,*msdN<N>::S_iLink, \ *msdN<N>::S_Mass_deleted,*msdN<N>::S_Link_deleted, \ *msdN<N>::S_massesPos,*msdN<N>::S_massesPosNo,*msdN<N>::S_massesPosId, \ --- 1576,1580 ---- const t_symbol \ *msdN<N>::S_Reset,*msdN<N>::S_Mass, \ ! *msdN<N>::S_Link,*msdN<N>::S_iLink,*msdN<N>::S_tLink,*msdN<N>::S_nLink, \ *msdN<N>::S_Mass_deleted,*msdN<N>::S_Link_deleted, \ *msdN<N>::S_massesPos,*msdN<N>::S_massesPosNo,*msdN<N>::S_massesPosId, \

1 0

externals/zexy/src multiplex.c,1.1,1.2
by IOhannes m zmölnig 17 May '05

17 May '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3754 Modified Files: multiplex.c Log Message: fixed line endings (dos2unix) Index: multiplex.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/multiplex.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** multiplex.c 22 Mar 2005 20:58:22 -0000 1.1 --- multiplex.c 17 May 2005 15:07:37 -0000 1.2 *************** *** 62,66 **** static void *mux_new(t_symbol *s, int argc, t_atom *argv) { ! int n = (argc < 2)?2:argc; t_mux *x = (t_mux *)pd_new(mux_class); // t_muxproxy *y=(t_muxproxy*)pd_new(muxproxy_class); --- 62,66 ---- static void *mux_new(t_symbol *s, int argc, t_atom *argv) { ! int n = (argc < 2)?2:argc; t_mux *x = (t_mux *)pd_new(mux_class); // t_muxproxy *y=(t_muxproxy*)pd_new(muxproxy_class);

1 0

externals/zexy/src configure.ac,NONE,1.1
by IOhannes m zmölnig 17 May '05

17 May '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3297 Added Files: configure.ac Log Message: added configure.ac configure.in is no deprecated! --- NEW FILE: configure.ac --- dnl Process this file with autoconf to produce a configure script. AC_INIT(zexy.c) dnl for now i can test ICC only on linux dnl LATER we might want to use it for other platforms (namely:windoze) too if test `uname -s` = Linux; then AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) if test "$enable_icc" = "yes"; then CC=icc LD=icc fi fi dnl Checks for programs. AC_PROG_CC AC_SUBST(STK) AC_SUBST(CFLAGS) AC_SUBST(DFLAGS) AC_SUBST(LFLAGS) AC_SUBST(EXT) AC_SUBST(LD) AC_SUBST(STRIPFLAGS) AC_SUBST(ZEXY_VERSION) AC_SUBST(REFERENCEPATH) AC_SUBST(PDLIBDIR) AC_SUBST(INCLUDES) AC_SUBST(SOURCES) AC_ARG_WITH(pdversion, [ --with-pdversion=<ver> enforce a certain pd-version (e.g. 0.37)]) AC_ARG_ENABLE(lpt, [ --enable-lpt enable parallelport-support]) #AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) if test $includedir then for id in $includedir do if test -d $id then INCLUDES="-I$id $INCLUDES" fi done fi dnl Checks for libraries. dnl Replace `main' with a function in -lc: AC_CHECK_LIB(c, main) dnl Replace `main' with a function in -lm: AC_CHECK_LIB(m, main) dnl Replace `main' with a function in -lpthread: dnl AC_CHECK_LIB(pthread, main) dnl Replace `main' with a function in -lstk: dnl AC_CHECK_LIB(stk, main, STK=yes) dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS(stdlib.h stdio.h string.h math.h time.h sys/time.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_HEADER_TIME dnl Checks for library functions. AC_FUNC_MMAP AC_CHECK_FUNCS(select socket strerror) dnl ifwe don't have $LD set, we set it to "ld" LD=${LD:-ld} DFLAGS="-DZEXY_LIBRARY" dnl dnl OK, checks for machines are here now dnl if test `uname -s` = Linux; then LFLAGS="-export_dynamic -shared" EXT=pd_linux STRIPFLAGS="--strip-unneeded" if test "$enable_icc" = "yes"; then CC=icc fi if test $CC = "icc" then LD=$CC LFLAGS="-ip -ipo_obj "$LFLAGS CFLAGS="-ip -ipo_obj "$CFLAGS else : fi fi dnl This should use '-bundle_loader /path/to/pd/bin/pd' instead of'-undefined suppress' dnl then strip might do something if test `uname -s` = Darwin; then LD=cc LFLAGS="-bundle -undefined suppress -flat_namespace" EXT=pd_darwin STRIPFLAGS= if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); fi if test "$enable_lpt" = ""; then AC_MSG_WARN("lpt not supported on this platform - disabling"); enable_lpt="no"; fi fi if test `uname | sed -e 's/^MINGW.*/NT/'` = NT; then LD=gcc INCLUDES="-I@prefix@/src" DFLAGS="-DMSW -DNT" LFLAGS="-shared @prefix@/bin/pd.dll" EXT=dll else PDLIBDIR="/lib/pd" LIBS="-lc -lm" fi if test `uname -s` = IRIX64; then LFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ -shared -rdata_shared" EXT=pd_irix6 dnl DFLAGS="-DUNIX -DIRIX6" STRIPFLAGS="--strip-unneeded" if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); fi if test "$enable_lpt" = ""; then AC_MSG_WARN("lpt not supported on this platform - disabling"); enable_lpt="no"; fi fi if test `uname -s` = IRIX32; then LFLAGS="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared" EXT=pd_irix5 dnl DFLAGS="-DUNIX -DIRIX5" STRIPFLAGS="--strip-unneeded" if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); fi if test "$enable_lpt" = ""; then AC_MSG_WARN("lpt not supported on this platform - disabling"); enable_lpt="no"; fi fi dnl Checks for pd-version, to set the correct help-path AC_MSG_CHECKING("pd\>=0.37") if test "$with_pdversion" != "" then echo -n "($with_pdversion)... " PD_VERSION="$with_pdversion" else cat > conftest.c << EOF #include <stdio.h> #include "m_pd.h" int main(){ printf("%d.%d\n", PD_MAJOR_VERSION, PD_MINOR_VERSION); return 0; } EOF if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 then PD_VERSION=`./conftest.o` else PD_VERSION="" fi fi let PD_MAJORVERSION=`echo $PD_VERSION | cut -d"." -f1`+0 let PD_MINORVERSION=`echo $PD_VERSION | cut -d"." -f2`+0 if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 37 then REFERENCEPATH=extra/help- echo "yes" else REFERENCEPATH=doc/5.reference/ echo "no" fi dnl check for zexy-version (but why...) AC_MSG_CHECKING("zexy-version") cat > conftest.c << EOF #include <stdio.h> #include "zexy.h" int main(){ printf("%s\n", VERSION); return 0; } EOF if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1 then ZEXY_VERSION=`./conftest.o` echo "$ZEXY_VERSION" else ZEXY_VERSION="X" echo "(unknown)" fi dnl check for LPT AC_MSG_CHECKING("parallel-port") if test "$enable_lpt" != "no" then if test "$enable_lpt" = "yes" then DFLAGS="$DFLAGS -DZ_WANT_LPT" echo "yes (forced)" else cat > conftest.c << EOF # include <sys/io.h> int main(){ ioperm(0x3bc, 8, 1); outb(0, 0x3bc); ioperm(0x3bc, 8, 0); return 0; } EOF if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 then DFLAGS="$DFLAGS -DZ_WANT_LPT" echo "yes" else echo "no" fi fi else echo "no (ignored)" fi AC_OUTPUT(Makefile) rm -f conftest.* ./makesource.sh

1 0

externals/iem/iemxmlrpc main.cpp,1.2,1.3
by Winfried Ritsch 17 May '05

17 May '05

Update of /cvsroot/pure-data/externals/iem/iemxmlrpc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10747 Modified Files: main.cpp Log Message: version number changed for release Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemxmlrpc/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.cpp 17 May 2005 10:12:12 -0000 1.2 --- main.cpp 17 May 2005 10:19:05 -0000 1.3 *************** *** 8,11 **** --- 8,12 ---- * * Author: Thomas Grill t.grill [at] gmx.net + * Winfried Ritsch some changes * # License LGPL see LICENSE.txt *************** *** 16,24 **** # CHANGES: # V 0.1.3b, LICENSES added, post error removed. ! # #************************************************************/ //! Version number of this external ! #define __XMLRPC_VERSION "0.1.3b" // prevent MSVC "extern" warning --- 17,25 ---- # CHANGES: # V 0.1.3b, LICENSES added, post error removed. ! # V 0.2 setup routine doubled for use as xmlrpc and iemxmlrpc #************************************************************/ //! Version number of this external ! #define __IEMXMLRPC_VERSION "0.2" // prevent MSVC "extern" warning *************** *** 142,146 **** if(!Atom2Val(argv[i],obj->value[i+hdr])) #ifdef _DEBUG ! error("XMLRPC: Internal error - version %s, file %s, line %i",__XMLRPC_VERSION,__FILE__,__LINE__); #else {} --- 143,147 ---- if(!Atom2Val(argv[i],obj->value[i+hdr])) #ifdef _DEBUG ! error("XMLRPC: Internal error - version %s, file %s, line %i",__IEMXMLRPC_VERSION,__FILE__,__LINE__); #else {} *************** *** 717,721 **** if(!xmlrpc_server) ! error("XMLRPC: Internal error - version %s, file %s, line %i",__XMLRPC_VERSION,__FILE__,__LINE__); else #endif --- 718,722 ---- if(!xmlrpc_server) ! error("XMLRPC: Internal error - version %s, file %s, line %i",__IEMXMLRPC_VERSION,__FILE__,__LINE__); else #endif *************** *** 793,797 **** { // post some message to the console ! post("IEMXMLRPC, version " __XMLRPC_VERSION ", (C)2003 IEM Graz"); post(""); --- 794,798 ---- { // post some message to the console ! post("IEMXMLRPC, version " __IEMXMLRPC_VERSION ", (C)2003 IEM Graz"); post("");

1 0

[PD-cvs] abstractions/La-kitchen median_3.pd, NONE, 1.1 median_5.pd, NONE, 1.1 median_7.pd, NONE, 1.1
by cyrille 17 May '05

17 May '05

Update of /cvsroot/pure-data/abstractions/La-kitchen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10497 Added Files: median_3.pd median_5.pd median_7.pd Log Message: add median filter from interfaceZ patch --- NEW FILE: median_3.pd --- #N canvas 28 3 711 500 12; #X obj 88 113 t f b b; #X obj 74 53 inlet; #X obj 111 295 outlet; #X obj 140 174 max; #X obj 114 174 min; #X obj 95 201 max; #X obj 111 228 min; #X text 177 174 on classe les 2 plus vieux nombres; #X text 175 191 du plus petit au plus grand; #X obj 85 141 f; #X obj 112 141 f; #X obj 139 141 f; #X text 197 43 principe du median 3 : classer les 3 dernieres mesures de la plus petite valeur a la plus grande valeur et renvoyer la 2 ieme valeur (appelee mediane) de la liste (dans cette liste classee de 3 elements \, 1 est plus petit que la mediane et 1 est plus grand); #X text 332 300 Francis Bras; #X text 334 329 interface-z.com; #X connect 0 0 9 0; #X connect 0 1 10 0; #X connect 0 2 11 0; #X connect 1 0 0 0; #X connect 3 0 6 1; #X connect 4 0 5 1; #X connect 5 0 6 0; #X connect 6 0 2 0; #X connect 9 0 5 0; #X connect 9 0 10 1; #X connect 10 0 4 0; #X connect 10 0 3 0; #X connect 10 0 11 1; #X connect 11 0 4 1; #X connect 11 0 3 1; --- NEW FILE: median_5.pd --- #N canvas 0 0 711 500 12; #X obj 47 19 inlet; #X obj 133 172 max; #X obj 107 172 min; #X obj 81 312 min; #X obj 34 100 t f b b b b; #X obj 116 208 max; #X obj 78 236 min; #X obj 92 279 max; #X obj 134 236 max; #X obj 106 236 min; #X obj 120 279 max; #X obj 109 312 min; #X obj 96 379 min; #X obj 76 345 max; #X obj 95 422 outlet; #X text 137 312 max; #X text 54 312 min; #X text 175 315 les 2 extremes n ont plus d influence; #X obj 24 138 f; #X obj 51 138 f; #X obj 77 138 f; #X obj 103 138 f; #X obj 130 138 f; #X text 474 315 donc on ne les calcule pas; #X text 138 300 les 4 plus anciens classes; #X text 165 236 les 3 plus anciens classes du petit au grand; #X text 170 172 les deux plus anciens classes; #X text 145 351 il reste a tester la mesure la plus recente pour garder au final la valeur du milieu.; #X text 221 42 principe du median 5 : classer les 5 dernieres mesures de la plus petite valeur a la plus grande valeur et renvoyer la 3 ieme valeur (appelee mediane) de la liste (dans cette liste classee de 5 elements \, 2 sont plus petits que la mediane et 2 sont plus grands) ; #X text 470 426 Francis Bras; #X text 472 455 interface-z.com; #X connect 0 0 4 0; #X connect 1 0 9 1; #X connect 1 0 8 1; #X connect 2 0 6 1; #X connect 2 0 5 1; #X connect 3 0 13 1; #X connect 4 0 18 0; #X connect 4 1 19 0; #X connect 4 2 20 0; #X connect 4 3 21 0; #X connect 4 4 22 0; #X connect 5 0 9 0; #X connect 5 0 8 0; #X connect 6 0 7 1; #X connect 7 0 3 0; #X connect 7 0 10 0; #X connect 8 0 11 1; #X connect 9 0 3 1; #X connect 9 0 10 1; #X connect 10 0 11 0; #X connect 11 0 12 1; #X connect 12 0 14 0; #X connect 13 0 12 0; #X connect 18 0 13 0; #X connect 18 0 19 1; #X connect 19 0 7 0; #X connect 19 0 20 1; #X connect 20 0 5 0; #X connect 20 0 6 0; #X connect 20 0 21 1; #X connect 21 0 2 0; #X connect 21 0 1 0; #X connect 21 0 22 1; #X connect 22 0 2 1; #X connect 22 0 1 1; --- NEW FILE: median_7.pd --- #N canvas 0 0 784 546 12; #X obj 36 18 inlet; #X obj 166 178 max; #X obj 139 178 min; #X obj 113 289 min; #X obj 125 205 max; #X obj 113 235 min; #X obj 97 263 max; #X obj 168 235 max; #X obj 140 235 min; #X obj 152 263 max; #X obj 141 289 min; #X obj 74 319 max; #X obj 103 471 outlet; #X obj 14 98 t f b b b b b b; #X obj 85 289 min; #X obj 169 289 max; #X obj 86 351 min; #X obj 128 319 max; #X obj 114 351 min; #X obj 157 319 max; #X obj 142 351 min; #X text 55 351 min; #X text 173 351 max; #X obj 103 381 max; #X obj 85 410 min; #X obj 132 381 max; #X obj 113 410 min; #X obj 73 446 max; #X obj 101 446 min; #X obj 0 132 f; #X obj 27 132 f; #X obj 54 132 f; #X obj 81 132 f; #X obj 108 132 f; #X obj 135 132 f; #X obj 162 132 f; #X text 197 177 les deux plus anciens classes; #X text 200 234 les 3 plus anciens classes du petit au grand; #X text 202 289 les 4 plus anciens classes du petit au grand; #X text 142 410 max1; #X text 178 410 max2; #X text 18 410 min1; #X text 53 410 min2; #X text 211 351 les 5 plus anciens classes du petit au grand; #X text 217 411 les 6 plus anciens classes du petit au grand; #X text 184 372 les 2 extremes n ont plus d influence donc on ne cherche pas a les identifier; #X text 184 426 les 4 extremes n ont plus d influence donc on ne calcule pas leur position relative et on ne les identifie pas; #X text 264 33 principe du median 7 : classer les 7 dernieres mesures de la plus petite valeur a la plus grande valeur et renvoyer la 4 ieme valeur (appelee mediane) de la liste (dans cette liste classee de 7 elements \, 3 sont plus petits que la mediane et 3 sont plus grands) ; #X text 535 463 Francis Bras; #X text 537 492 interface-z.com; #X connect 0 0 13 0; #X connect 1 0 8 1; #X connect 1 0 7 1; #X connect 2 0 5 1; #X connect 2 0 4 1; #X connect 3 0 16 1; #X connect 3 0 17 1; #X connect 4 0 8 0; #X connect 4 0 7 0; #X connect 5 0 6 1; #X connect 5 0 14 1; #X connect 6 0 3 0; #X connect 6 0 9 0; #X connect 7 0 10 1; #X connect 7 0 15 1; #X connect 8 0 3 1; #X connect 8 0 9 1; #X connect 9 0 10 0; #X connect 9 0 15 0; #X connect 10 0 18 1; #X connect 10 0 19 1; #X connect 11 0 16 0; #X connect 11 0 17 0; #X connect 13 0 29 0; #X connect 13 1 30 0; #X connect 13 2 31 0; #X connect 13 3 32 0; #X connect 13 4 33 0; #X connect 13 5 34 0; #X connect 13 6 35 0; #X connect 14 0 11 1; #X connect 15 0 20 1; #X connect 16 0 23 1; #X connect 17 0 18 0; #X connect 17 0 19 0; #X connect 18 0 24 1; #X connect 18 0 25 1; #X connect 19 0 20 0; #X connect 20 0 26 1; #X connect 23 0 24 0; #X connect 23 0 25 0; #X connect 24 0 27 1; #X connect 25 0 26 0; #X connect 26 0 28 1; #X connect 27 0 28 0; #X connect 28 0 12 0; #X connect 29 0 27 0; #X connect 29 0 30 1; #X connect 30 0 23 0; #X connect 30 0 31 1; #X connect 31 0 11 0; #X connect 31 0 32 1; #X connect 32 0 6 0; #X connect 32 0 14 0; #X connect 32 0 33 1; #X connect 33 0 4 0; #X connect 33 0 5 0; #X connect 33 0 34 1; #X connect 34 0 2 0; #X connect 34 0 1 0; #X connect 34 0 35 1; #X connect 35 0 2 1; #X connect 35 0 1 1;

1 0

externals/iem/iemxmlrpc main.cpp,1.1.1.1,1.2
by Winfried Ritsch 17 May '05

17 May '05

Update of /cvsroot/pure-data/externals/iem/iemxmlrpc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9523 Modified Files: main.cpp Log Message: setup name corrected Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemxmlrpc/main.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** main.cpp 8 Mar 2005 10:23:42 -0000 1.1.1.1 --- main.cpp 17 May 2005 10:12:12 -0000 1.2 *************** *** 785,792 **** \note Must be exported from shared library */ ! extern "C" #ifdef NT __declspec(dllexport) #endif void xmlrpc_setup() { --- 785,793 ---- \note Must be exported from shared library */ ! extern "C" { #ifdef NT __declspec(dllexport) #endif + void xmlrpc_setup() { *************** *** 804,805 **** --- 805,809 ---- } + void iemxmlrpc_setup() { xmlrpc_setup(); } + + }

1 0

extensions/gui/ix mat-demo.pd,1.2,1.3
by carmen rocco 17 May '05

17 May '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9406 Modified Files: mat-demo.pd Log Message: ... Index: mat-demo.pd =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat-demo.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mat-demo.pd 16 May 2005 18:31:19 -0000 1.2 --- mat-demo.pd 17 May 2005 07:47:15 -0000 1.3 *************** *** 1,63 **** ! #N canvas 75 119 920 1023 12; ! #X obj 30 0 widget mat n1 #w 881 #bg white #divX 8 #divY 5 #h 740 #Yb ! 63; #X msg 1080 -23 -height 26 -width 26 -bg gray95; ! #X msg 32 -22 redefine; ! #X msg 242 -21 #w \$1; ! #X msg 206 -22 #h \$1; ! #X floatatom 172 -23 5 0 0 0 - - -; ! #X floatatom 140 -21 5 0 0 0 - - -; ! #X msg 329 -20 #Yb \$1; ! #X msg 378 -20 63; #X obj 84 767 widget kbd k1 #octaves 7 -width 483 -height 76; ! #X obj 85 847 unpack 0 0; ! #X obj 129 866 * 127; ! #X obj 86 911 pack 0 0; ! #X obj 197 927 + 3; ! #X obj 248 927 + 5; ! #X obj 264 913 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 ! -262144 -1 -1 0 256; ! #X obj 210 913 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 ! -262144 -1 -1 0 256; ! #X obj 169 893 spigot; ! #X obj 231 889 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X obj 97 960 noteout; ! #X obj 309 990 makenote 40 250; ! #X obj 330 899 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X obj 370 894 metro 250; ! #X obj 411 887 hsl 128 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; ! #X obj 307 938 random 128; ! #X obj 359 933 t b b b; ! #X obj 362 946 random 128; ! #X obj 424 965 random 2000; ! #X obj 431 932 hsl 128 15 10 5000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; #X msg 447 679 #w \$1 \, #h \$1; #X floatatom 453 662 5 0 0 0 - - -; - #X msg 403 873 9999; - #X msg 441 875 444; #X obj 85 867 + 36; - #X msg 174 855 36; - #X msg 207 854 12; - #X msg 374 869 128; - #X msg 351 864 0; - #X obj 343 970 + 0; - #X msg 369 966 127; - #X msg 390 968 0; - #X obj 307 966 + 0; - #X floatatom 327 957 5 0 0 0 - - -; - #X obj 371 914 pl; - #X obj 428 913 hsl 60 8 0 1 0 0 empty empty empty -2 -6 0 8 -262144 - -1 -1 0 1; #X obj 574 858 rp ss s1; #X obj 632 787 rr ss; #X obj 632 768 rg; ! #X obj 35 931 print yo; ! #X obj 17 767 route note; ! #X obj 24 809 print note; ! #X connect 0 0 49 0; #X connect 2 0 0 0; #X connect 3 0 0 0; --- 1,31 ---- ! #N canvas 25 146 920 1008 12; ! #X obj 17 12 widget mat n1 #w 881 #bg white #divX 8 #divY 5 #h 740 ! #Yb 1 #Ya 88 #qYv 2 #qYa 8; #X msg 1080 -23 -height 26 -width 26 -bg gray95; ! #X msg 19 -10 redefine; ! #X msg 229 -9 #w \$1; ! #X msg 193 -10 #h \$1; ! #X floatatom 159 -11 5 0 0 0 - - -; ! #X floatatom 127 -9 5 0 0 0 - - -; #X obj 84 767 widget kbd k1 #octaves 7 -width 483 -height 76; ! #X obj 85 846 unpack 0 0; ! #X obj 134 868 * 127; ! #X obj 85 892 pack 0 0; #X msg 447 679 #w \$1 \, #h \$1; #X floatatom 453 662 5 0 0 0 - - -; #X obj 85 867 + 36; #X obj 574 858 rp ss s1; #X obj 632 787 rr ss; #X obj 632 768 rg; ! #X obj 17 761 route note; ! #X msg 317 -8 #Ya 1 \, #Yb 128 \, #qYv 8; ! #X msg 460 -9 #Ya 88 \, Yb 24 \, #qYv 2; ! #X obj 9 826 unpack f f f; ! #X obj 37 861 * 127; ! #X obj 16 891 pack f f f; ! #X obj 18 948 print note; ! #X obj 73 917 makenote 99 250; ! #X obj 88 948 noteout; ! #X connect 0 0 17 0; #X connect 2 0 0 0; #X connect 3 0 0 0; *************** *** 65,116 **** #X connect 5 0 3 0; #X connect 6 0 4 0; ! #X connect 7 0 0 0; ! #X connect 8 0 7 0; ! #X connect 9 0 10 0; ! #X connect 9 0 45 0; ! #X connect 10 0 33 0; ! #X connect 10 1 11 0; ! #X connect 11 0 12 1; ! #X connect 12 0 19 0; ! #X connect 12 0 48 0; ! #X connect 13 0 12 0; ! #X connect 14 0 12 0; ! #X connect 15 0 14 1; ! #X connect 16 0 13 1; ! #X connect 17 0 14 0; ! #X connect 17 0 13 0; ! #X connect 18 0 17 1; ! #X connect 20 0 19 0; ! #X connect 20 1 19 1; ! #X connect 21 0 22 0; ! #X connect 22 0 43 0; ! #X connect 23 0 22 1; ! #X connect 24 0 41 0; ! #X connect 25 0 24 0; ! #X connect 25 1 26 0; ! #X connect 25 2 27 0; ! #X connect 26 0 38 0; ! #X connect 27 0 20 2; ! #X connect 28 0 27 1; ! #X connect 30 0 29 0; ! #X connect 31 0 20 2; ! #X connect 32 0 20 2; ! #X connect 33 0 12 0; ! #X connect 33 0 17 0; ! #X connect 34 0 33 1; ! #X connect 35 0 33 1; ! #X connect 36 0 26 1; ! #X connect 36 0 24 1; ! #X connect 37 0 26 1; ! #X connect 37 0 24 1; ! #X connect 38 0 20 1; ! #X connect 39 0 38 1; ! #X connect 40 0 38 1; ! #X connect 41 0 20 0; ! #X connect 42 0 41 1; ! #X connect 43 0 25 0; ! #X connect 44 0 43 1; ! #X connect 45 0 9 0; ! #X connect 47 0 46 0; ! #X connect 49 0 20 0; ! #X connect 49 0 50 0; --- 33,55 ---- #X connect 5 0 3 0; #X connect 6 0 4 0; ! #X connect 7 0 8 0; ! #X connect 7 0 14 0; ! #X connect 8 0 13 0; ! #X connect 8 1 9 0; ! #X connect 9 0 10 1; ! #X connect 10 0 25 0; ! #X connect 12 0 11 0; ! #X connect 13 0 10 0; ! #X connect 14 0 7 0; ! #X connect 16 0 15 0; ! #X connect 17 0 20 0; ! #X connect 18 0 0 0; ! #X connect 19 0 0 0; ! #X connect 20 0 22 0; ! #X connect 20 1 21 0; ! #X connect 20 2 22 2; ! #X connect 21 0 22 1; ! #X connect 22 0 23 0; ! #X connect 22 0 24 0; ! #X connect 24 0 25 0; ! #X connect 24 1 25 1;

1 0

extensions/gui/ix mat.wid,1.4,1.5
by carmen rocco 17 May '05

17 May '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9328 Modified Files: mat.wid Log Message: http://www.drudge.com/weblog/3353/dj_injures_anus_firing_bottle_rockets.html Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mat.wid 16 May 2005 18:31:18 -0000 1.4 --- mat.wid 17 May 2005 07:46:57 -0000 1.5 *************** *** 6,14 **** } variable _ ! proc mat_click {button action p t x y} { variable _ set clicked [$p.m find overlapping $x $y $x $y] switch $action { first { # if {$clicked ne ""} { --- 6,26 ---- } variable _ ! proc mat_note {p t item} { ! set id [lindex [$p.m itemcget $item -tags] 1] ! set len [expr [lindex $_($t:items:$id) 2] - [lindex $_($t:items:$id) 0]] ! set vel [$p.m itemcget $item -fillopacity] ! pd [concat $t.rp _cb note [lindex $_($t:items:$id) 1] $vel $len \;] ! } proc mat_click {button action p t x y} { variable _ set clicked [$p.m find overlapping $x $y $x $y] switch $action { + hover { + foreach item $clicked { + if {[lindex [$p.m itemcget $item -tags] 0] eq "item"} { + mat_note $p $t $item + } + } + } first { # if {$clicked ne ""} { *************** *** 61,65 **** } 3 { ! set velo [expr ($x - $_($t:fx)) / 100.0] foreach item $_($t:cl) { set vel [expr $velo + [$p.m itemcget $item -fillopacity]] --- 73,77 ---- } 3 { ! set velo [expr ($x - $_($t:cx)) / 100.0] foreach item $_($t:cl) { set vel [expr $velo + [$p.m itemcget $item -fillopacity]] *************** *** 88,93 **** $p.m coords drawing [::tkpath::coords rect $xa $y [expr $xb - $xa] [mat_tr $p $t y id 1] -rx 3 -ry 3] set yi [mat_tr $p $t y i $y] ! set _($t:items:$_($t:i)) [list [mat_tr $p $t x i $xa] $yi [mat_tr $p $t x i $xb] $yi 0 0 0] ! pd [concat $t.rp _cb note $yi \;] } first { --- 100,105 ---- $p.m coords drawing [::tkpath::coords rect $xa $y [expr $xb - $xa] [mat_tr $p $t y id 1] -rx 3 -ry 3] set yi [mat_tr $p $t y i $y] ! set _($t:items:$_($t:i)) [list [mat_tr $p $t x i $xa] $yi [mat_tr $p $t x i $xb] $yi] ! # pd [concat $t.rp _cb note $yi \;] } first { *************** *** 109,113 **** i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} ! id {return [expr $v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} } } --- 121,126 ---- i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} ! # id {return [expr $v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} ! id {return [expr abs($v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m])]} } } *************** *** 137,140 **** --- 150,154 ---- canvas $path.m -bg $bg -width $w -height $h pack $path.m -side left + bind $path.m <Motion> "::ix::mat_click 0 hover $path $target %x %y" bind $path.m <1> "::ix::mat_click 1 first $path $target %x %y" bind $path.m <B1-Motion> "::ix::mat_click 1 motion $path $target %x %y" *************** *** 169,173 **** array set tj {x center y left} array set igx {y width x height} ! for {set x [expr int($_($target:${xy}a) / ($_($target:q${xy}v) + 0.0) + 1)*($_($target:q${xy}v) + 0.0)]} {$x <= $_($target:${xy}b)} {set x [expr $x + $_($target:q${xy}v)]} { set og [mat_tr $path $target $xy t $x] set invgeo [winfo $igx($xy) $path.m] --- 183,188 ---- array set tj {x center y left} array set igx {y width x height} ! if {$_($target:${xy}a) > $_($target:${xy}b)} {set oa ">=";set ob "-"} {set oa "<=";set ob "+"} ! for {set x [expr int($_($target:${xy}a) / ($_($target:q${xy}v) + 0.0) + 1)*($_($target:q${xy}v) + 0.0)]} {[expr $x $oa $_($target:${xy}b)]} {set x [expr $x $ob $_($target:q${xy}v)]} { set og [mat_tr $path $target $xy t $x] set invgeo [winfo $igx($xy) $path.m]

1 0

extensions/gui/ix mat.wid,1.3,1.4 mat-demo.pd,1.1,1.2
by carmen rocco 16 May '05

16 May '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3355 Modified Files: mat.wid mat-demo.pd Log Message: piano roll (has some bugs) Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mat.wid 16 May 2005 16:30:20 -0000 1.3 --- mat.wid 16 May 2005 18:31:18 -0000 1.4 *************** *** 9,13 **** --- 9,20 ---- proc mat_click {button action p t x y} { variable _ + set clicked [$p.m find overlapping $x $y $x $y] switch $action { + first { + # if {$clicked ne ""} { + set _($t:cl) $clicked + # } + foreach xy {x y} {set _($t:f$xy) [set $xy]} + } motion { set mx [expr $x - $_($t:cx)] *************** *** 29,33 **** switch $button { 1 { ! foreach item [$p.m find withtag item] { set m [$p.m itemcget $item -matrix] set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mx] [expr [lindex [lindex $m 2] 1] + $my]]] --- 36,46 ---- switch $button { 1 { ! if {$clicked ne ""} { ! set items $clicked ! } else { ! set items [$p.m find withtag item] ! mat_gridlines $p $t ! } ! foreach item $items { set m [$p.m itemcget $item -matrix] set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mx] [expr [lindex [lindex $m 2] 1] + $my]]] *************** *** 41,50 **** set py [mat_tr $p $t y t [lindex $_($t:items:$id) 1]] set sx [mat_tr $p $t x id [expr [lindex $_($t:items:$id) 2] - [lindex $_($t:items:$id) 0]]] ! set sy [mat_tr $p $t y id [expr [lindex $_($t:items:$id) 3] - [lindex $_($t:items:$id) 1]]] $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3] } } ! } ! mat_gridlines $p $t } } --- 54,73 ---- set py [mat_tr $p $t y t [lindex $_($t:items:$id) 1]] set sx [mat_tr $p $t x id [expr [lindex $_($t:items:$id) 2] - [lindex $_($t:items:$id) 0]]] ! # set sy [mat_tr $p $t y id [expr [lindex $_($t:items:$id) 3] - [lindex $_($t:items:$id) 1]]] ! set sy [mat_tr $p $t y id 1] $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3] } + mat_gridlines $p $t } ! 3 { ! set velo [expr ($x - $_($t:fx)) / 100.0] ! foreach item $_($t:cl) { ! set vel [expr $velo + [$p.m itemcget $item -fillopacity]] ! if {$vel > 1} {set vel 1} ! if {$vel < 0} {set vel 0} ! $p.m itemconfigure $item -fillopacity $vel ! } ! } ! } } } *************** *** 56,70 **** switch $action { motion { ! $p.m coords drawing [::tkpath::coords rect $_($t:cx) $_($t:cy) [expr $x - $_($t:cx)] [expr $y - $_($t:cy)] -rx 3 -ry 3] } first { foreach xy {x y} {set _($t:c$xy) [set $xy]} $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 3 -ry 3] -tags drawing -fill green -fillopacity 0.8 - $p.m bind drawing <1> } release { $p.m itemconfigure drawing -tags [list item $_($t:i)] -matrix {{1.0 0.0} {0.0 1.0} {0.0 0.0}} ! set _($t:items:$_($t:i)) [list [mat_tr $p $t x i $_($t:cx)] [mat_tr $p $t y i $_($t:cy)] [mat_tr $p $t x i $x] [mat_tr $p $t y i $y]] ! incr _($t:i) } } --- 79,101 ---- switch $action { motion { ! if {$x >= $_($t:cx)} { ! set xa $_($t:cx) ! set xb $x ! } else { ! set xa $x ! set xb $_($t:cx) ! } ! $p.m coords drawing [::tkpath::coords rect $xa $y [expr $xb - $xa] [mat_tr $p $t y id 1] -rx 3 -ry 3] ! set yi [mat_tr $p $t y i $y] ! set _($t:items:$_($t:i)) [list [mat_tr $p $t x i $xa] $yi [mat_tr $p $t x i $xb] $yi 0 0 0] ! pd [concat $t.rp _cb note $yi \;] } first { foreach xy {x y} {set _($t:c$xy) [set $xy]} $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 3 -ry 3] -tags drawing -fill green -fillopacity 0.8 } release { $p.m itemconfigure drawing -tags [list item $_($t:i)] -matrix {{1.0 0.0} {0.0 1.0} {0.0 0.0}} ! incr _($t:i) 2 } } *************** *** 113,116 **** --- 144,150 ---- bind $path.m <B2-Motion> "::ix::mat_click 2 motion $path $target %x %y" bind $path.m <ButtonRelease-2> "::ix::mat_click 2 release $path $target %x %y" + bind $path.m <3> "::ix::mat_click 3 first $path $target %x %y" + bind $path.m <B3-Motion> "::ix::mat_click 3 motion $path $target %x %y" + bind $path.m <ButtonRelease-3> "::ix::mat_click 3 release $path $target %x %y" bind $path.m <Control-1> "::ix::mat_draw first $path $target %x %y" bind $path.m <Control-B1-Motion> "::ix::mat_draw motion $path $target %x %y" Index: mat-demo.pd =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat-demo.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mat-demo.pd 16 May 2005 12:23:49 -0000 1.1 --- mat-demo.pd 16 May 2005 18:31:19 -0000 1.2 *************** *** 1,5 **** ! #N canvas 25 203 920 777 12; #X obj 30 0 widget mat n1 #w 881 #bg white #divX 8 #divY 5 #h 740 #Yb ! 7; #X msg 1080 -23 -height 26 -width 26 -bg gray95; #X msg 32 -22 redefine; --- 1,5 ---- ! #N canvas 75 119 920 1023 12; #X obj 30 0 widget mat n1 #w 881 #bg white #divX 8 #divY 5 #h 740 #Yb ! 63; #X msg 1080 -23 -height 26 -width 26 -bg gray95; #X msg 32 -22 redefine; *************** *** 9,13 **** #X floatatom 140 -21 5 0 0 0 - - -; #X msg 329 -20 #Yb \$1; ! #X floatatom 380 -18 5 0 0 0 - - -; #X connect 2 0 0 0; #X connect 3 0 0 0; --- 9,63 ---- #X floatatom 140 -21 5 0 0 0 - - -; #X msg 329 -20 #Yb \$1; ! #X msg 378 -20 63; ! #X obj 84 767 widget kbd k1 #octaves 7 -width 483 -height 76; ! #X obj 85 847 unpack 0 0; ! #X obj 129 866 * 127; ! #X obj 86 911 pack 0 0; ! #X obj 197 927 + 3; ! #X obj 248 927 + 5; ! #X obj 264 913 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 ! -262144 -1 -1 0 256; ! #X obj 210 913 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 ! -262144 -1 -1 0 256; ! #X obj 169 893 spigot; ! #X obj 231 889 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X obj 97 960 noteout; ! #X obj 309 990 makenote 40 250; ! #X obj 330 899 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X obj 370 894 metro 250; ! #X obj 411 887 hsl 128 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; ! #X obj 307 938 random 128; ! #X obj 359 933 t b b b; ! #X obj 362 946 random 128; ! #X obj 424 965 random 2000; ! #X obj 431 932 hsl 128 15 10 5000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; ! #X msg 447 679 #w \$1 \, #h \$1; ! #X floatatom 453 662 5 0 0 0 - - -; ! #X msg 403 873 9999; ! #X msg 441 875 444; ! #X obj 85 867 + 36; ! #X msg 174 855 36; ! #X msg 207 854 12; ! #X msg 374 869 128; ! #X msg 351 864 0; ! #X obj 343 970 + 0; ! #X msg 369 966 127; ! #X msg 390 968 0; ! #X obj 307 966 + 0; ! #X floatatom 327 957 5 0 0 0 - - -; ! #X obj 371 914 pl; ! #X obj 428 913 hsl 60 8 0 1 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; ! #X obj 574 858 rp ss s1; ! #X obj 632 787 rr ss; ! #X obj 632 768 rg; ! #X obj 35 931 print yo; ! #X obj 17 767 route note; ! #X obj 24 809 print note; ! #X connect 0 0 49 0; #X connect 2 0 0 0; #X connect 3 0 0 0; *************** *** 17,18 **** --- 67,116 ---- #X connect 7 0 0 0; #X connect 8 0 7 0; + #X connect 9 0 10 0; + #X connect 9 0 45 0; + #X connect 10 0 33 0; + #X connect 10 1 11 0; + #X connect 11 0 12 1; + #X connect 12 0 19 0; + #X connect 12 0 48 0; + #X connect 13 0 12 0; + #X connect 14 0 12 0; + #X connect 15 0 14 1; + #X connect 16 0 13 1; + #X connect 17 0 14 0; + #X connect 17 0 13 0; + #X connect 18 0 17 1; + #X connect 20 0 19 0; + #X connect 20 1 19 1; + #X connect 21 0 22 0; + #X connect 22 0 43 0; + #X connect 23 0 22 1; + #X connect 24 0 41 0; + #X connect 25 0 24 0; + #X connect 25 1 26 0; + #X connect 25 2 27 0; + #X connect 26 0 38 0; + #X connect 27 0 20 2; + #X connect 28 0 27 1; + #X connect 30 0 29 0; + #X connect 31 0 20 2; + #X connect 32 0 20 2; + #X connect 33 0 12 0; + #X connect 33 0 17 0; + #X connect 34 0 33 1; + #X connect 35 0 33 1; + #X connect 36 0 26 1; + #X connect 36 0 24 1; + #X connect 37 0 26 1; + #X connect 37 0 24 1; + #X connect 38 0 20 1; + #X connect 39 0 38 1; + #X connect 40 0 38 1; + #X connect 41 0 20 0; + #X connect 42 0 41 1; + #X connect 43 0 25 0; + #X connect 44 0 43 1; + #X connect 45 0 9 0; + #X connect 47 0 46 0; + #X connect 49 0 20 0; + #X connect 49 0 50 0;

1 0

extensions/gui/ix mat.wid,1.2,1.3
by carmen rocco 16 May '05

16 May '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1059 Modified Files: mat.wid Log Message: scream Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mat.wid 16 May 2005 14:15:02 -0000 1.2 --- mat.wid 16 May 2005 16:30:20 -0000 1.3 *************** *** 11,45 **** switch $action { motion { foreach xy {x y} { ! set mv [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] switch $button { 1 { foreach ab {a b} { ! set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mv] ! } ! foreach item [$p.m find withtag item] { ! set m [$p.m itemcget $item -matrix] ! switch $xy { ! y { ! set m [list [lindex $m 0] [lindex $m 1] [list [lindex [lindex $m 2] 0] [expr [lindex [lindex $m 2] 1] + $mv]]] ! } ! x { ! set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mv] [expr [lindex [lindex $m 2] 1]]]] ! } ! } ! $p.m itemconfigure $item -matrix $m } } 2 { ! set _($t:${xy}a) [expr $_($t:${xy}a) - $mv] ! set _($t:${xy}b) [expr $_($t:${xy}b) + $mv] } } - mat_gridlines $p $t } } } foreach xy {x y} {set _($t:c$xy) [set $xy]} } proc mat_draw {action p t x y} { variable _ --- 11,55 ---- switch $action { motion { + set mx [expr $x - $_($t:cx)] + set my [expr $y - $_($t:cy)] foreach xy {x y} { ! set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] switch $button { 1 { foreach ab {a b} { ! set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mvt] } } 2 { ! set _($t:${xy}a) [expr $_($t:${xy}a) - $mvt] ! set _($t:${xy}b) [expr $_($t:${xy}b) + $mvt] } } } + switch $button { + 1 { + foreach item [$p.m find withtag item] { + set m [$p.m itemcget $item -matrix] + set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mx] [expr [lindex [lindex $m 2] 1] + $my]]] + $p.m itemconfigure $item -matrix $m + } + } + 2 { + foreach item [$p.m find withtag item] { + set id [lindex [$p.m itemcget $item -tags] 1] + set px [mat_tr $p $t x t [lindex $_($t:items:$id) 0]] + set py [mat_tr $p $t y t [lindex $_($t:items:$id) 1]] + set sx [mat_tr $p $t x id [expr [lindex $_($t:items:$id) 2] - [lindex $_($t:items:$id) 0]]] + set sy [mat_tr $p $t y id [expr [lindex $_($t:items:$id) 3] - [lindex $_($t:items:$id) 1]]] + $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3] + } + } + } + mat_gridlines $p $t } } foreach xy {x y} {set _($t:c$xy) [set $xy]} } + proc mat_draw {action p t x y} { variable _ *************** *** 50,58 **** first { foreach xy {x y} {set _($t:c$xy) [set $xy]} ! $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 3 -ry 3] -tags drawing -fill green $p.m bind drawing <1> } release { ! $p.m itemconfigure drawing -tags [list item item$_($t:i)] -matrix {{1.0 0.0} {0.0 1.0} {0.0 0.0}} incr _($t:i) } --- 60,69 ---- first { foreach xy {x y} {set _($t:c$xy) [set $xy]} ! $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 3 -ry 3] -tags drawing -fill green -fillopacity 0.8 $p.m bind drawing <1> } release { ! $p.m itemconfigure drawing -tags [list item $_($t:i)] -matrix {{1.0 0.0} {0.0 1.0} {0.0 0.0}} ! set _($t:items:$_($t:i)) [list [mat_tr $p $t x i $_($t:cx)] [mat_tr $p $t y i $_($t:cy)] [mat_tr $p $t x i $x] [mat_tr $p $t y i $y]] incr _($t:i) } *************** *** 67,75 **** i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} } } proc mat_zoomReset {p t} { variable _ - puts "resetting zoom" set _($t:ya) $_($t:yao) set _($t:yb) $_($t:ybo) --- 78,86 ---- i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} + id {return [expr $v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} } } proc mat_zoomReset {p t} { variable _ set _($t:ya) $_($t:yao) set _($t:yb) $_($t:ybo) *************** *** 105,113 **** bind $path.m <Control-B1-Motion> "::ix::mat_draw motion $path $target %x %y" bind $path.m <Control-ButtonRelease-1> "::ix::mat_draw release $path $target %x %y" - - mat_gridlines $path $target set bd [expr {[$path cget -bd] * 2}] $path configure -bg gray -width [expr [winfo width $path.m] + $bd] \ ! -height [expr [winfo height $path.m] + $bd]}} proc mat_gridlines {path target} { --- 116,125 ---- bind $path.m <Control-B1-Motion> "::ix::mat_draw motion $path $target %x %y" bind $path.m <Control-ButtonRelease-1> "::ix::mat_draw release $path $target %x %y" set bd [expr {[$path cget -bd] * 2}] $path configure -bg gray -width [expr [winfo width $path.m] + $bd] \ ! -height [expr [winfo height $path.m] + $bd] ! update ! mat_gridlines $path $target ! }} proc mat_gridlines {path target} { *************** *** 128,134 **** switch $xy {y {set coords [concat M 0 $og L $invgeo $og]} x {set coords [concat M $og 0 L $og $invgeo]}} ! $w create path $coords -stroke $_($target:ln) -strokedasharray 2 -tags gridline -strokewidth 1 ! $w create text [lrange $coords 1 2] -font {{Bitstream Vera Sans} 8} \ ! -fill green -anchor $ta($xy) -text $x -justify $tj($xy) -tags gridline}} } } --- 140,146 ---- switch $xy {y {set coords [concat M 0 $og L $invgeo $og]} x {set coords [concat M $og 0 L $og $invgeo]}} ! $w lower [$w create path $coords -stroke $_($target:ln) -strokedasharray 2 -tags gridline -strokewidth 1] ! $w lower [$w create text [lrange $coords 1 2] -font {{Bitstream Vera Sans} 8} \ ! -fill green -anchor $ta($xy) -text $x -justify $tj($xy) -tags gridline]}} } }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2005