Pd-cvs April 2005

pd-cvs@lists.iem.at

13 participants
303 discussions

externals/nusmuk/msd2D 01_msd2Dtest.pd, 1.2, 1.3 main.cpp, 1.4, 1.5
by Nicolas Montgermont 22 Apr '05

22 Apr '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3327/msd2D Modified Files: 01_msd2Dtest.pd main.cpp Log Message: MSD Version 0.03 Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/main.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** main.cpp 21 Apr 2005 14:28:54 -0000 1.4 --- main.cpp 22 Apr 2005 09:33:31 -0000 1.5 *************** *** 414,421 **** link[nb_link]->D2 = GetFloat(argv[5]); // D2 link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! if (link[nb_link]->longx < 0) ! link[nb_link]->longueur = -link[nb_link]->longx; ! else ! link[nb_link]->longueur = link[nb_link]->longx ;// L[0] link[nb_link]->nbr = id_link; // id number link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] --- 414,419 ---- link[nb_link]->D2 = GetFloat(argv[5]); // D2 link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! link[nb_link]->longy = link[nb_link]->mass1->posY - link[nb_link]->mass2->posY; // Ly[0] ! link[nb_link]->longueur = sqrt(pow(link[nb_link]->longx,2)+pow(link[nb_link]->longy,2)); // L[0] link[nb_link]->nbr = id_link; // id number link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] Index: 01_msd2Dtest.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/01_msd2Dtest.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 01_msd2Dtest.pd 15 Apr 2005 18:13:57 -0000 1.2 --- 01_msd2Dtest.pd 22 Apr 2005 09:33:29 -0000 1.3 *************** *** 8,12 **** #X msg 633 562 reset \, create \, lighting 1 \, 1; #X obj 53 499 msd2D --------------------------------; ! #X obj 122 15 cnv 15 500 270 empty empty empty 20 12 0 14 -262131 -66577 0; #X obj 135 261 t a; --- 8,22 ---- #X msg 633 562 reset \, create \, lighting 1 \, 1; #X obj 53 499 msd2D --------------------------------; ! #X text 309 594 WITH GEM; ! #X text 465 563 1 CREATE WINDOW -->; ! #X text 464 626 3 AND DESTROY IT! -->; ! #X text 464 594 2 DRAG THE STRUCTURE WITH THE MOUSE; ! #X obj 118 11 cnv 15 520 275 empty empty empty 20 12 0 14 -262131 -66577 ! 0; ! #X obj 43 291 cnv 15 595 80 empty empty empty 20 12 0 14 -261689 -66577 ! 0; ! #X obj 44 374 cnv 15 595 120 empty empty empty 20 12 0 14 -262131 -66577 ! 0; ! #X obj 47 556 cnv 15 400 200 empty empty empty 20 12 0 14 -261689 -66577 0; #X obj 135 261 t a; *************** *** 16,44 **** #X text 173 21 reset; #X obj 135 42 t b b b b b; ! #X msg 153 160 50 50; ! #X msg 135 235 link souple \$1 \$2 \$3 \$4 \$5; ! #X msg 170 140 mass mob 1 \$1 \$2 \$3; ! #X msg 189 91 mass fix 0 100 50 50; ! #X msg 171 116 100 20 10 \, 200 20 25; #X msg 153 181 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; ! #X obj 50 292 cnv 15 572 80 empty empty empty 20 12 0 14 -261689 -66577 ! 0; #X obj 53 300 gemhead; #X obj 53 323 t b; #X msg 53 345 bang \, get massesPos \, get linksPos; - #X text 413 87 CREATION : 3 MASSES \, 2 LINKS; #X text 292 313 COMPUTE AND GET ALL MASSES AND LINKS POSITIONS; - #X obj 50 376 cnv 15 572 110 empty empty empty 20 12 0 14 -262131 -66577 - 0; - #X msg 82 442 forceX mob 100; #X msg 85 383 setD souple 0.01; #X msg 216 384 setK souple 1; #X msg 85 403 setD souple 1; #X msg 216 404 setK souple 2; - #X msg 208 443 forceY mob 100; - #X text 351 396 SET RIGIDITY AND VISCOSITY OF LINKS; #X text 367 442 ADD FORCE ON ALL MOBILE MASSES; ! #X obj 47 547 cnv 15 400 200 empty empty empty 20 12 0 14 -261689 -66577 ! 0; #N canvas 643 123 605 590 massrender 0; #X obj 127 22 inlet; --- 26,45 ---- #X text 173 21 reset; #X obj 135 42 t b b b b b; ! #X msg 135 226 link souple \$1 \$2 \$3 \$4 \$5; #X msg 153 181 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0; ! #X text 413 87 CREATION : 3 MASSES \, 2 LINKS; ! #X msg 135 205 0 1 10 2.5 0.5 \, 1 2 5 0.5 0.9; #X obj 53 300 gemhead; #X obj 53 323 t b; #X msg 53 345 bang \, get massesPos \, get linksPos; #X text 292 313 COMPUTE AND GET ALL MASSES AND LINKS POSITIONS; #X msg 85 383 setD souple 0.01; #X msg 216 384 setK souple 1; #X msg 85 403 setD souple 1; #X msg 216 404 setK souple 2; #X text 367 442 ADD FORCE ON ALL MOBILE MASSES; ! #X text 351 396 SET RIGIDITY AND VISCOSITY OF LINKS; ! #X msg 82 442 forceX mob 100; ! #X msg 208 443 forceY mob 100; #N canvas 643 123 605 590 massrender 0; #X obj 127 22 inlet; *************** *** 68,121 **** #X connect 11 1 1 1; #X restore 134 591 pd massrender; - #N canvas 284 227 587 558 linkrender 0; - #X obj 93 25 inlet; - #X obj 93 117 / 12.5; - #X obj 93 140 - 4; - #X obj 147 118 / 12.5; - #X obj 147 141 - 4; - #X obj 35 134 gemhead; - #X obj 44 222 separator; - #X obj 44 192 any; - #X obj 93 164 t b f; - #X obj 93 69 unpack f f f f; - #X obj 44 265 curve 2; - #X obj 207 121 / 12.5; - #X obj 207 144 - 4; - #X obj 261 122 / 12.5; - #X obj 261 145 - 4; - #X obj 123 194 pack f f; - #X msg 123 217 \$1 \$2 0; - #X obj 207 193 pack f f; - #X msg 207 216 \$1 \$2 0; - #X connect 0 0 9 0; - #X connect 1 0 2 0; - #X connect 2 0 8 0; - #X connect 3 0 4 0; - #X connect 4 0 15 1; - #X connect 5 0 7 1; - #X connect 6 0 10 0; - #X connect 7 0 6 0; - #X connect 8 0 7 0; - #X connect 8 1 15 0; - #X connect 9 0 1 0; - #X connect 9 1 3 0; - #X connect 9 2 11 0; - #X connect 9 3 13 0; - #X connect 11 0 12 0; - #X connect 12 0 17 0; - #X connect 13 0 14 0; - #X connect 14 0 17 1; - #X connect 15 0 16 0; - #X connect 16 0 10 1; - #X connect 17 0 18 0; - #X connect 18 0 10 2; - #X restore 53 612 pd linkrender; #X obj 53 562 route linksPos massesPos; #X text 261 572 DISPLAY MASSES AND LINKS; - #X text 309 594 WITH GEM; - #X text 465 563 1 CREATE WINDOW -->; - #X text 464 626 3 AND DESTROY IT! -->; - #X text 464 594 2 DRAG THE STRUCTURE WITH THE MOUSE; - #X msg 135 213 0 1 5 0.5 0.5 \, 1 2 1 0.5 0; #N canvas 731 296 450 300 gemmouse 0; #X obj 189 77 gemmouse; --- 69,74 ---- *************** *** 149,153 **** #X msg 53 716 posY fix \$2; #X text 204 677 SET FIXED MASS TO MOUSE POSITION; ! #X connect 0 0 13 0; #X connect 3 0 2 0; #X connect 4 0 5 0; --- 102,149 ---- #X msg 53 716 posY fix \$2; #X text 204 677 SET FIXED MASS TO MOUSE POSITION; ! #X msg 171 134 mass mob 1 \$1 \$2 \$3; ! #X msg 171 113 100 50 90 \, 100 40 10; ! #N canvas 0 0 450 300 linkrender 0; ! #X obj 127 22 inlet; ! #X obj 127 86 / 12.5; ! #X obj 127 109 - 4; ! #X obj 187 87 / 12.5; ! #X obj 187 110 - 4; ! #X obj 64 114 gemhead; ! #X obj 48 177 separator; ! #X obj 48 153 any; ! #X obj 125 136 t b f; ! #X obj 127 57 unpack f f f f; ! #X obj 241 86 / 12.5; ! #X obj 241 109 - 4; ! #X obj 308 87 / 12.5; ! #X obj 308 110 - 4; ! #X obj 48 222 curve 2; ! #X obj 155 189 pack f f 0; ! #X obj 241 190 pack f f 0; ! #X connect 0 0 9 0; ! #X connect 1 0 2 0; ! #X connect 2 0 8 0; ! #X connect 3 0 4 0; ! #X connect 4 0 15 1; ! #X connect 5 0 7 1; ! #X connect 6 0 14 0; ! #X connect 7 0 6 0; ! #X connect 8 0 7 0; ! #X connect 8 1 15 0; ! #X connect 9 0 1 0; ! #X connect 9 1 3 0; ! #X connect 9 2 10 0; ! #X connect 9 3 12 0; ! #X connect 10 0 11 0; ! #X connect 11 0 16 0; ! #X connect 12 0 13 0; ! #X connect 13 0 16 1; ! #X connect 15 0 14 1; ! #X connect 16 0 14 2; ! #X restore 53 613 pd linkrender; ! #X msg 153 160 50 50; ! #X msg 189 91 mass fix 0 100 50 50; ! #X connect 0 0 20 0; #X connect 3 0 2 0; #X connect 4 0 5 0; *************** *** 155,189 **** #X connect 7 0 38 0; #X connect 7 1 1 0; ! #X connect 9 0 7 0; ! #X connect 10 0 13 0; ! #X connect 11 0 9 0; ! #X connect 13 0 44 0; ! #X connect 13 1 14 0; ! #X connect 13 1 19 0; ! #X connect 13 2 18 0; ! #X connect 13 3 17 0; ! #X connect 13 4 11 0; ! #X connect 14 0 45 1; ! #X connect 15 0 9 0; ! #X connect 16 0 9 0; ! #X connect 17 0 9 0; #X connect 18 0 16 0; ! #X connect 19 0 9 0; ! #X connect 21 0 22 0; ! #X connect 22 0 23 0; ! #X connect 23 0 7 0; #X connect 27 0 7 0; - #X connect 28 0 7 0; #X connect 29 0 7 0; #X connect 30 0 7 0; #X connect 31 0 7 0; #X connect 32 0 7 0; ! #X connect 38 0 37 0; ! #X connect 38 1 36 0; #X connect 38 2 1 0; ! #X connect 44 0 15 0; ! #X connect 45 0 47 0; ! #X connect 45 0 48 0; #X connect 46 0 45 0; ! #X connect 47 0 7 0; ! #X connect 48 0 7 0; --- 151,185 ---- #X connect 7 0 38 0; #X connect 7 1 1 0; ! #X connect 16 0 7 0; ! #X connect 17 0 20 0; #X connect 18 0 16 0; ! #X connect 20 0 24 0; ! #X connect 20 1 48 0; ! #X connect 20 1 22 0; ! #X connect 20 2 46 0; ! #X connect 20 3 49 0; ! #X connect 20 4 18 0; ! #X connect 21 0 16 0; ! #X connect 22 0 16 0; ! #X connect 24 0 21 0; ! #X connect 25 0 26 0; ! #X connect 26 0 27 0; #X connect 27 0 7 0; #X connect 29 0 7 0; #X connect 30 0 7 0; #X connect 31 0 7 0; #X connect 32 0 7 0; ! #X connect 35 0 7 0; ! #X connect 36 0 7 0; ! #X connect 38 0 47 0; ! #X connect 38 1 37 0; #X connect 38 2 1 0; ! #X connect 40 0 42 0; ! #X connect 40 0 43 0; ! #X connect 41 0 40 0; ! #X connect 42 0 7 0; ! #X connect 43 0 7 0; ! #X connect 45 0 16 0; #X connect 46 0 45 0; ! #X connect 48 0 40 1; ! #X connect 49 0 16 0;

1 0

externals/grill/py/py.xcode project.pbxproj,1.1,NONE
by Thomas Grill 22 Apr '05

22 Apr '05

Update of /cvsroot/pure-data/externals/grill/py/py.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31147/py.xcode Removed Files: project.pbxproj Log Message: remove deleted files --- project.pbxproj DELETED ---

1 0

externals/grill/flext/source flmap.cpp,1.1,NONE
by Thomas Grill 22 Apr '05

22 Apr '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30616/source Removed Files: flmap.cpp Log Message: --- flmap.cpp DELETED ---

1 0

externals/grill/flext/buildsys version.inc,1.1,NONE
by Thomas Grill 22 Apr '05

22 Apr '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30616/buildsys Removed Files: version.inc Log Message: --- version.inc DELETED ---

1 0

externals/nusmuk/msd2D 03_imsd2Dtest.pd, 1.1, 1.2 help-msd2D.pd, 1.2, 1.3 main.cpp, 1.3, 1.4
by Nicolas Montgermont 21 Apr '05

21 Apr '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7646/msd2D Modified Files: 03_imsd2Dtest.pd help-msd2D.pd main.cpp Log Message: MSD Version 0.03 Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/main.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.cpp 20 Apr 2005 15:33:14 -0000 1.3 --- main.cpp 21 Apr 2005 14:28:54 -0000 1.4 *************** *** 31,35 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.02 -- 15.04.2005 */ --- 31,35 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.03 -- 21.04.2005 */ *************** *** 39,43 **** // define constants ! #define MSD2D_VERSION 0.02 #define nb_max_link 4000 #define nb_max_mass 4000 --- 39,43 ---- // define constants ! #define MSD2D_VERSION 0.03 #define nb_max_link 4000 #define nb_max_mass 4000 *************** *** 75,79 **** t_mass *mass2; t_float K1, D1, D2; ! t_float longx, longy, longueur; t_float distance_old; } t_link; --- 75,79 ---- t_mass *mass2; t_float K1, D1, D2; ! t_float longx, longy, longueur, long_min, long_max; t_float distance_old; } t_link; *************** *** 135,143 **** distance = sqrt(pow(link[i]->mass1->posX-link[i]->mass2->posX,2) + pow(link[i]->mass1->posY-link[i]->mass2->posY,2)); // L[n] = sqrt( (x1-x2)² +(y1-y2)²) ! 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]) ! if (distance != 0) { ! Fx = F * (link[i]->mass1->posX - link[i]->mass2->posX)/distance; // Fx = F * Lx[n]/L[n] ! Fy = F * (link[i]->mass1->posY - link[i]->mass2->posY)/distance; // Fy = F * Ly[n]/L[n] } link[i]->mass1->forceX -= Fx; // Fx1[n] = -Fx --- 135,149 ---- distance = sqrt(pow(link[i]->mass1->posX-link[i]->mass2->posX,2) + pow(link[i]->mass1->posY-link[i]->mass2->posY,2)); // L[n] = sqrt( (x1-x2)² +(y1-y2)²) ! if (distance < link[i]->long_min || distance > link[i]->long_max) { ! Fx = 0; ! Fy = 0; ! } ! else { ! 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]) ! if (distance != 0) { ! Fx = F * (link[i]->mass1->posX - link[i]->mass2->posX)/distance; // Fx = F * Lx[n]/L[n] ! Fy = F * (link[i]->mass1->posY - link[i]->mass2->posY)/distance; // Fy = F * Ly[n]/L[n] ! } } link[i]->mass1->forceX -= Fx; // Fx1[n] = -Fx *************** *** 184,187 **** --- 190,196 ---- t_float M; + if (argc != 5) + error("mass : Id mobile mass X Y"); + mass[nb_mass] = new t_mass; // new mass mass[nb_mass]->Id = GetSymbol(argv[0]); // ID *************** *** 218,221 **** --- 227,233 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("forceX : Idmass value"); + for (i=0; i<nb_mass;i++) { *************** *** 231,234 **** --- 243,249 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("forceY : Idmass value"); + for (i=0; i<nb_mass;i++) { *************** *** 244,247 **** --- 259,265 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("posX : Idmass value"); + if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin) for (i=0; i<nb_mass;i++) *************** *** 258,261 **** --- 276,282 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("posY : Idmass value"); + if (GetFloat(argv[1]) < Ymax && GetFloat(argv[1]) > Ymin) for (i=0; i<nb_mass;i++) *************** *** 271,276 **** // set mass No to mobile t_int i,aux; ! aux = GetAInt(argv[0]); for (i=0; i<nb_mass;i++) { --- 292,300 ---- // set mass No to mobile t_int i,aux; + + if (argc != 1) + error("setMobile : Idmass"); ! aux = GetInt(argv[0]); for (i=0; i<nb_mass;i++) { *************** *** 286,289 **** --- 310,316 ---- t_int i,aux; + if (argc != 1) + error("setFixed : Idmass"); + aux = GetAInt(argv[0]); for (i=0; i<nb_mass;i++) *************** *** 298,330 **** { // Delete mass ! t_int i,nb_link_delete=0; ! t_atom sortie[6], aux[nb_link]; ! // Delete associated links ! for (i=0; i<nb_link;i++) { ! if (link[i]->mass1->nbr == GetInt(argv[0]) || link[i]->mass2->nbr == GetInt(argv[0])) { ! SetFloat((aux[nb_link_delete]),link[i]->nbr); ! nb_link_delete++; } - } ! for (i=0; i<nb_link_delete;i++) ! m_delete_link(1,&aux[i]); ! // delete mass ! for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr == 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); ! SetFloat((sortie[5]),mass[i]->posY); ! delete mass[i]; ! mass[i] = mass[nb_mass-1]; ! nb_mass--; ! ToOutAnything(1,S_Mass_deleted,6,sortie); ! break; ! } } --- 325,360 ---- { // Delete mass ! t_int i,nb_link_delete=0; ! t_atom sortie[6], aux[nb_link]; ! ! if (argc != 1) ! error("deleteMass : Nomass"); ! // Delete associated links ! for (i=0; i<nb_link;i++) { ! if (link[i]->mass1->nbr == GetInt(argv[0]) || link[i]->mass2->nbr == GetInt(argv[0])) { ! SetFloat((aux[nb_link_delete]),link[i]->nbr); ! nb_link_delete++; ! } } ! for (i=0; i<nb_link_delete;i++) ! m_delete_link(1,&aux[i]); ! // delete mass ! for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr == 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); ! SetFloat((sortie[5]),mass[i]->posY); ! delete mass[i]; ! mass[i] = mass[nb_mass-1]; ! nb_mass--; ! ToOutAnything(1,S_Mass_deleted,6,sortie); ! break; ! } } *************** *** 333,343 **** { // set X max ! Xmax = GetFloat(argv[0]); ! } ! ! void m_Ymax(int argc,t_atom *argv) ! { ! // set Y max ! Ymax = GetFloat(argv[0]); } --- 363,369 ---- { // set X max ! if (argc != 1) ! error("Xmax : Value"); ! Xmax = GetFloat(argv[0]); } *************** *** 345,349 **** { // set X min ! Xmin = GetFloat(argv[0]); } --- 371,384 ---- { // set X min ! if (argc != 1) ! error("Xmin : Value"); ! Xmin = GetFloat(argv[0]); ! } ! void m_Ymax(int argc,t_atom *argv) ! { ! // set Y max ! if (argc != 1) ! error("Ymax : Value"); ! Ymax = GetFloat(argv[0]); } *************** *** 351,355 **** { // set Y min ! Ymin = GetFloat(argv[0]); } --- 386,392 ---- { // set Y min ! if (argc != 1) ! error("Ymin : Value"); ! Ymin = GetFloat(argv[0]); } *************** *** 359,382 **** void m_link(int argc,t_atom *argv) // add a link ! // Id, nbr, *mass1, *mass2, K1, D1 { t_atom sortie[7], aux[2]; t_int i; ! link[nb_link] = new t_link; // new link ! link[nb_link]->Id = GetSymbol(argv[0]); for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr==GetAInt(argv[1])) // pointer on mass 1 link[nb_link]->mass1 = mass[i]; ! else if(mass[i]->nbr==GetAInt(argv[2])) // pointer on mass 2 link[nb_link]->mass2 = mass[i]; link[nb_link]->K1 = GetFloat(argv[3]); // K1 link[nb_link]->D1 = GetFloat(argv[4]); // D1 link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! link[nb_link]->longy = link[nb_link]->mass1->posY - link[nb_link]->mass2->posY; // Ly[0] ! link[nb_link]->longueur = sqrt( pow(link[nb_link]->longx,2) + pow(link[nb_link]->longy,2)); // L[0] = sq( Lx[0]²+Ly[0]²) link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur;// L[n-1] nb_link++; id_link++; --- 396,437 ---- void m_link(int argc,t_atom *argv) // add a link ! // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) { t_atom sortie[7], aux[2]; t_int i; ! if (argc < 6 || argc > 8) ! error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); ! link[nb_link] = new t_link; // New pointer ! link[nb_link]->Id = GetSymbol(argv[0]); // ID for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr==GetAInt(argv[1])) // pointer to mass1 link[nb_link]->mass1 = mass[i]; ! else if(mass[i]->nbr==GetAInt(argv[2])) // pointer to mass2 link[nb_link]->mass2 = mass[i]; link[nb_link]->K1 = GetFloat(argv[3]); // K1 link[nb_link]->D1 = GetFloat(argv[4]); // D1 link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! if (link[nb_link]->longx < 0) ! link[nb_link]->longueur = -link[nb_link]->longx; ! else ! link[nb_link]->longueur = link[nb_link]->longx ;// L[0] link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] ! switch (argc) { ! case 6 : ! link[nb_link]->long_max = 32768; ! link[nb_link]->long_min = 0; ! break; ! case 7 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = 32768; ! break; ! case 8 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = GetFloat(argv[7]); ! break; ! } nb_link++; id_link++; *************** *** 384,389 **** SetFloat((sortie[0]),id_link-1); SetSymbol((sortie[1]),link[nb_link-1]->Id); ! SetFloat((sortie[2]),GetAInt(argv[1])); ! SetFloat((sortie[3]),GetAInt(argv[2])); SetFloat((sortie[4]),link[nb_link-1]->K1); SetFloat((sortie[5]),link[nb_link-1]->D1); --- 439,444 ---- SetFloat((sortie[0]),id_link-1); SetSymbol((sortie[1]),link[nb_link-1]->Id); ! SetFloat((sortie[2]),GetInt(argv[1])); ! SetFloat((sortie[3]),GetInt(argv[2])); SetFloat((sortie[4]),link[nb_link-1]->K1); SetFloat((sortie[5]),link[nb_link-1]->D1); *************** *** 394,403 **** void m_ilink(int argc,t_atom *argv) // add interactor link ! // Id, nbr, Id masses1, Id masses2, K1, D1 { ! t_atom aux[2], arglist[6]; t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0; t_symbol *Id1, *Id2; Id1 = GetSymbol(argv[1]); Id2 = GetSymbol(argv[2]); --- 449,461 ---- void m_ilink(int argc,t_atom *argv) // add interactor link ! // Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax) { ! t_atom aux[2], arglist[8]; t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0; t_symbol *Id1, *Id2; + if (argc < 6 || argc > 8) + error("ilink : Id Idmass1 Idmass2 K D1 D2 (Lmin Lmax)"); + Id1 = GetSymbol(argv[1]); Id2 = GetSymbol(argv[2]); *************** *** 424,428 **** SetFloat((arglist[4]),GetFloat(argv[4])); SetFloat((arglist[5]),GetFloat(argv[5])); ! m_link(6,arglist); } } --- 482,495 ---- SetFloat((arglist[4]),GetFloat(argv[4])); SetFloat((arglist[5]),GetFloat(argv[5])); ! switch (argc) { ! case 7 : ! SetFloat(arglist[6],GetFloat(argv[6])); ! break; ! case 8 : ! SetFloat(arglist[6],GetFloat(argv[6])); ! SetFloat(arglist[7],GetFloat(argv[7])); ! break; ! } ! m_link(argc,arglist); } } *************** *** 434,437 **** --- 501,507 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("setK : IdLink Value"); + for (i=0; i<nb_link;i++) { *************** *** 443,450 **** void m_setD(int argc,t_atom *argv) { ! // set viscosity of link(s) named Id t_int i; const t_symbol *sym = GetSymbol(argv[0]); for (i=0; i<nb_link;i++) { --- 513,523 ---- void m_setD(int argc,t_atom *argv) { ! // set damping of link(s) named Id t_int i; const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("setD : IdLink Value"); + for (i=0; i<nb_link;i++) { *************** *** 460,463 **** --- 533,539 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("setD2 : IdLink Value"); + for (i=0; i<nb_link;i++) { *************** *** 470,490 **** { // Delete link ! t_int i; ! t_atom sortie[7]; ! for (i=0; i<nb_link;i++) ! if (link[i]->nbr == 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 ! nb_link--; ! ToOutAnything(1,S_Link_deleted,7,sortie); ! break; } } --- 546,569 ---- { // Delete link ! t_int i; ! t_atom sortie[7]; ! if (argc != 1) ! error("deleteLink : NoLink"); ! ! for (i=0; i<nb_link;i++) ! if (link[i]->nbr == 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 ! nb_link--; ! ToOutAnything(1,S_Link_deleted,7,sortie); ! break; } } Index: help-msd2D.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/help-msd2D.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-msd2D.pd 20 Apr 2005 15:33:14 -0000 1.2 --- help-msd2D.pd 21 Apr 2005 14:28:54 -0000 1.3 *************** *** 1,4 **** #N canvas 0 0 478 397 10; ! #N canvas 271 52 742 843 masses 1; #X obj 62 154 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131 -66577 0; --- 1,4 ---- #N canvas 0 0 478 397 10; ! #N canvas 271 52 742 843 masses 0; #X obj 62 154 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131 -66577 0; *************** *** 74,89 **** #X connect 48 0 46 0; #X restore 221 312 pd masses; #N canvas 222 83 808 841 links 0; ! #X obj 62 250 cnv 15 610 305 empty empty CREATION 20 12 0 14 -262131 -66577 0; ! #X msg 79 279 reset; ! #X text 338 308 \$1 : Id (symbol); ! #X text 250 308 Add a link; ! #X text 337 328 \$2 : creation No of mass1; ! #X text 337 346 \$3 : creation No of mass2; ! #X text 336 364 \$4 : rigidity; ! #X text 251 280 Delete all masses and links; ! #X text 336 382 \$5 : viscosity; ! #X text 336 399 \$6 : damping; #X obj 61 561 cnv 15 610 82 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; --- 74,112 ---- #X connect 48 0 46 0; #X restore 221 312 pd masses; + #X text 75 312 HELP on masses --->; + #X text 74 343 HELP on links --->; + #X text 13 117 There are 4 types of messages for msd :; + #X text 14 81 It is designed to implement particules physical model + in PD.The model is based on two elements type : mass and link.; + #X obj 13 132 cnv 15 420 30 empty empty empty 20 12 0 14 -262131 -66577 + 0; + #X obj 13 165 cnv 15 420 30 empty empty empty 20 12 0 14 -261689 -66577 + 0; + #X obj 13 198 cnv 15 420 30 empty empty empty 20 12 0 14 -262131 -66577 + 0; + #X obj 13 231 cnv 15 420 30 empty empty empty 20 12 0 14 -261689 -66577 + 0; + #X text 16 139 CREATION : To create the model masses and links.; + #X text 16 204 DYNAMIC SETTING : To set the model parameters dynamically. + ; + #X text 16 237 ATTRIBUTES : To get the model parameters.; + #X text 16 166 COMPUTATION : To compute the new model state based on + previous instant.; + #X text 94 23 MSD2D : mass - spring - damper model; + #X text 15 68 MSD2D is the 2D object of the msd objects collection. + ; #N canvas 222 83 808 841 links 0; ! #X obj 33 821 msd; ! #X obj 62 192 cnv 15 610 360 empty empty CREATION 20 12 0 14 -262131 -66577 0; ! #X msg 79 221 reset; ! #X text 402 247 \$1 : Id (symbol); ! #X text 314 247 Add a link; ! #X text 401 267 \$2 : creation No of mass1; ! #X text 401 285 \$3 : creation No of mass2; ! #X text 400 303 \$4 : rigidity; ! #X text 251 222 Delete all masses and links; ! #X text 400 321 \$5 : viscosity; ! #X text 400 338 \$6 : damping; #X obj 61 561 cnv 15 610 82 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; *************** *** 101,127 **** / linksPos ); #X text 237 742 \$2 : Id (symbol or creations numbers); ! #X msg 78 308 link \$1 \$2 \$3 \$4 \$5 \$6; ! #X msg 74 532 deleteLink \$1; ! #X text 239 534 Delete a link; ! #X text 340 534 \$1 : Creation No of link; #X msg 73 762 infosL; #X text 236 762 Get infos on all masses and links on outlet No 2; ! #X msg 73 423 iLink \$1 \$2 \$3 \$4 \$5 \$6; ! #X text 338 308 \$1 : Id (symbol); ! #X text 250 308 Add a link; ! #X text 337 328 \$2 : creation No of mass1; ! #X text 337 346 \$3 : creation No of mass2; ! #X text 336 364 \$4 : rigidity; ! #X text 336 382 \$5 : viscosity; ! #X text 336 399 \$6 : damping; ! #X text 410 422 \$1 : Id (symbol); ! #X text 409 478 \$4 : rigidity; ! #X text 409 496 \$5 : viscosity; ! #X text 409 513 \$6 : damping; ! #X text 410 422 \$1 : Id (symbol); ! #X text 409 478 \$4 : rigidity; ! #X text 409 496 \$5 : viscosity; ! #X text 409 513 \$6 : damping; ! #X text 248 423 Add an interactor link; #X text 94 52 LINKS :; #X text 71 91 parameters : length \, rigidity \, viscosity and damping. --- 124,148 ---- / linksPos ); #X text 237 742 \$2 : Id (symbol or creations numbers); ! #X msg 74 533 deleteLink \$1; ! #X text 239 535 Delete a link; ! #X text 340 535 \$1 : Creation No of link; #X msg 73 762 infosL; #X text 236 762 Get infos on all masses and links on outlet No 2; ! #X text 402 247 \$1 : Id (symbol); ! #X text 314 247 Add a link; ! #X text 401 267 \$2 : creation No of mass1; ! #X text 401 285 \$3 : creation No of mass2; ! #X text 400 303 \$4 : rigidity; ! #X text 400 321 \$5 : viscosity; ! #X text 400 338 \$6 : damping; ! #X text 463 392 \$1 : Id (symbol); ! #X text 462 448 \$4 : rigidity; ! #X text 462 466 \$5 : viscosity; ! #X text 462 483 \$6 : damping; ! #X text 463 392 \$1 : Id (symbol); ! #X text 462 448 \$4 : rigidity; ! #X text 462 466 \$5 : viscosity; ! #X text 462 483 \$6 : damping; ! #X text 301 393 Add an interactor link; #X text 94 52 LINKS :; #X text 71 91 parameters : length \, rigidity \, viscosity and damping. *************** *** 132,139 **** #X text 71 120 message. The lenght is initialised to the distance between ; ! #X text 71 106 Rigidity \, viscosity and damping are defined by the creation; - #X text 409 442 \$2 : Id (symbol) of masses type 1; - #X text 409 460 \$3 : Id (symbol) of masses type 2; #X text 70 148 Interactor links are links between mutiples masses \, instead; --- 153,158 ---- #X text 71 120 message. The lenght is initialised to the distance between ; ! #X text 71 107 Rigidity \, viscosity and damping are defined by the creation; #X text 70 148 Interactor links are links between mutiples masses \, instead; *************** *** 141,173 **** with; #X text 69 175 their Id.; ! #X obj 33 821 msd2D; ! #X connect 1 0 56 0; ! #X connect 14 0 56 0; ! #X connect 18 0 56 0; ! #X connect 22 0 56 0; ! #X connect 23 0 56 0; ! #X connect 26 0 56 0; ! #X connect 28 0 56 0; ! #X restore 223 342 pd links; ! #X text 75 312 HELP on masses --->; ! #X text 74 343 HELP on links --->; ! #X text 13 117 There are 4 types of messages for msd :; ! #X text 14 81 It is designed to implement particules physical model ! in PD.The model is based on two elements type : mass and link.; ! #X obj 13 132 cnv 15 420 30 empty empty empty 20 12 0 14 -262131 -66577 ! 0; ! #X obj 13 165 cnv 15 420 30 empty empty empty 20 12 0 14 -261689 -66577 ! 0; ! #X obj 13 198 cnv 15 420 30 empty empty empty 20 12 0 14 -262131 -66577 ! 0; ! #X obj 13 231 cnv 15 420 30 empty empty empty 20 12 0 14 -261689 -66577 ! 0; ! #X text 16 139 CREATION : To create the model masses and links.; ! #X text 16 204 DYNAMIC SETTING : To set the model parameters dynamically. ! ; ! #X text 16 237 ATTRIBUTES : To get the model parameters.; ! #X text 16 166 COMPUTATION : To compute the new model state based on ! previous instant.; ! #X text 94 23 MSD2D : mass - spring - damper model; ! #X text 15 68 MSD2D is the 2D object of the msd objects collection. ! ; --- 160,177 ---- with; #X text 69 175 their Id.; ! #X text 397 356 ($7) : minimum lenght of link; ! #X text 397 373 ($8) : maximum lenght of link; ! #X msg 78 247 link \$1 \$2 \$3 \$4 \$5 \$6 ($7 \$8); ! #X text 462 412 \$2 : Id (symbol) of masses 1; ! #X text 462 430 \$3 : Id (symbol) of masses 2; ! #X msg 73 393 iLink \$1 \$2 \$3 \$4 \$5 \$6 ($7 \$8); ! #X text 458 500 ($7) : minimum lenght of links; ! #X text 458 517 ($8) : maximum lenght of links; ! #X connect 2 0 0 0; ! #X connect 15 0 0 0; ! #X connect 19 0 0 0; ! #X connect 23 0 0 0; ! #X connect 26 0 0 0; ! #X connect 55 0 0 0; ! #X connect 58 0 0 0; ! #X restore 224 340 pd links; Index: 03_imsd2Dtest.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/03_imsd2Dtest.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 03_imsd2Dtest.pd 12 Apr 2005 16:34:04 -0000 1.1 --- 03_imsd2Dtest.pd 21 Apr 2005 14:28:54 -0000 1.2 *************** *** 25,32 **** 0; #X msg 82 442 forceX mob 100; - #X msg 85 383 setD souple 0.01; - #X msg 216 384 setK souple 1; - #X msg 85 403 setD souple 1; - #X msg 216 404 setK souple 2; #X msg 208 443 forceY mob 100; #X text 351 396 SET RIGIDITY AND VISCOSITY OF LINKS; --- 25,28 ---- *************** *** 151,191 **** #X text 292 313 COMPUTE AND GET ALL LINKS POSITIONS; #X text 260 572 DISPLAY LINKS WITH GEM; ! #X connect 0 0 40 0; #X connect 3 0 2 0; #X connect 4 0 5 0; #X connect 6 0 2 0; ! #X connect 7 0 46 0; #X connect 7 1 1 0; #X connect 9 0 7 0; ! #X connect 10 0 40 0; #X connect 11 0 9 0; ! #X connect 13 0 34 1; #X connect 14 0 9 0; #X connect 15 0 9 0; #X connect 17 0 18 0; ! #X connect 18 0 47 0; #X connect 20 0 7 0; #X connect 21 0 7 0; ! #X connect 22 0 7 0; ! #X connect 23 0 7 0; ! #X connect 24 0 7 0; ! #X connect 25 0 7 0; ! #X connect 34 0 36 0; ! #X connect 34 0 37 0; ! #X connect 35 0 34 0; ! #X connect 36 0 7 0; ! #X connect 37 0 7 0; ! #X connect 39 0 9 0; ! #X connect 40 0 41 0; ! #X connect 40 1 44 0; ! #X connect 40 2 13 0; ! #X connect 40 2 15 0; ! #X connect 40 3 42 0; ! #X connect 40 4 14 0; ! #X connect 40 5 11 0; ! #X connect 41 0 9 0; ! #X connect 42 0 39 0; ! #X connect 44 0 9 0; ! #X connect 45 0 5 1; ! #X connect 46 0 30 0; #X connect 47 0 7 0; --- 147,191 ---- #X text 292 313 COMPUTE AND GET ALL LINKS POSITIONS; #X text 260 572 DISPLAY LINKS WITH GEM; ! #X msg 85 383 setD inter 0; ! #X msg 84 403 setD2 inter 0; ! #X msg 216 384 setK inter 1; ! #X msg 216 404 setK inter 2; ! #X connect 0 0 36 0; #X connect 3 0 2 0; #X connect 4 0 5 0; #X connect 6 0 2 0; ! #X connect 7 0 42 0; #X connect 7 1 1 0; #X connect 9 0 7 0; ! #X connect 10 0 36 0; #X connect 11 0 9 0; ! #X connect 13 0 30 1; #X connect 14 0 9 0; #X connect 15 0 9 0; #X connect 17 0 18 0; ! #X connect 18 0 43 0; #X connect 20 0 7 0; #X connect 21 0 7 0; ! #X connect 30 0 32 0; ! #X connect 30 0 33 0; ! #X connect 31 0 30 0; ! #X connect 32 0 7 0; ! #X connect 33 0 7 0; ! #X connect 35 0 9 0; ! #X connect 36 0 37 0; ! #X connect 36 1 40 0; ! #X connect 36 2 13 0; ! #X connect 36 2 15 0; ! #X connect 36 3 38 0; ! #X connect 36 4 14 0; ! #X connect 36 5 11 0; ! #X connect 37 0 9 0; ! #X connect 38 0 35 0; ! #X connect 40 0 9 0; ! #X connect 41 0 5 1; ! #X connect 42 0 26 0; ! #X connect 43 0 7 0; ! #X connect 46 0 7 0; #X connect 47 0 7 0; + #X connect 48 0 7 0; + #X connect 49 0 7 0;

1 0

externals/nusmuk/msd 02_imsdtest.pd, 1.1, 1.2 help-msd.pd, 1.2, 1.3 main.cpp, 1.3, 1.4
by Nicolas Montgermont 21 Apr '05

21 Apr '05

Update of /cvsroot/pure-data/externals/nusmuk/msd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7646/msd Modified Files: 02_imsdtest.pd help-msd.pd main.cpp Log Message: MSD Version 0.03 Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd/main.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.cpp 20 Apr 2005 15:33:14 -0000 1.3 --- main.cpp 21 Apr 2005 14:28:53 -0000 1.4 *************** *** 31,35 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.02 -- 15.04.2005 */ --- 31,35 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.03 -- 21.04.2005 */ *************** *** 39,43 **** // define constants ! #define MSD_VERSION 0.02 #define nb_max_link 4000 #define nb_max_mass 4000 --- 39,43 ---- // define constants ! #define MSD_VERSION 0.03 #define nb_max_link 4000 #define nb_max_mass 4000 *************** *** 70,74 **** t_mass *mass2; t_float K1, D1, D2; ! t_float longx, longueur; t_float distance_old; } t_link; --- 70,74 ---- t_mass *mass2; t_float K1, D1, D2; ! t_float longx, longueur, long_min, long_max; t_float distance_old; } t_link; *************** *** 133,146 **** // compute link forces distance = link[i]->mass1->posX-link[i]->mass2->posX; // L[n] = x1 - x2 ! 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]) ! if (distance != 0) { ! Fx = F * (link[i]->mass1->posX - link[i]->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] } --- 133,153 ---- // compute link forces distance = link[i]->mass1->posX-link[i]->mass2->posX; // L[n] = x1 - x2 ! if (distance < 0) ! distance = -distance; // |L[n]| ! if (distance < link[i]->long_min || distance > link[i]->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]) ! if (distance != 0) ! Fx = F * (link[i]->mass1->posX - link[i]->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] ! ! } *************** *** 170,173 **** --- 177,183 ---- t_float M; + if (argc != 4) + error("mass : Id mobile mass X"); + mass[nb_mass] = new t_mass; // new mass mass[nb_mass]->Id = GetSymbol(argv[0]); // ID *************** *** 199,202 **** --- 209,215 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("forceX : Idmass value"); + for (i=0; i<nb_mass;i++) { *************** *** 212,215 **** --- 225,231 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("posX : Idmass value"); + if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin) for (i=0; i<nb_mass;i++) *************** *** 224,228 **** // set mass No to mobile t_int i,aux; ! aux = GetInt(argv[0]); for (i=0; i<nb_mass;i++) --- 240,247 ---- // set mass No to mobile t_int i,aux; ! ! if (argc != 1) ! error("setMobile : Idmass"); ! aux = GetInt(argv[0]); for (i=0; i<nb_mass;i++) *************** *** 239,242 **** --- 258,264 ---- t_int i,aux; + if (argc != 1) + error("setFixed : Idmass"); + aux = GetInt(argv[0]); for (i=0; i<nb_mass;i++) *************** *** 251,284 **** { // Delete mass ! t_int i,nb_link_delete=0; ! t_atom sortie[5], aux[nb_link]; ! // Delete all associated links ! for (i=0; i<nb_link;i++) { ! if (link[i]->mass1->nbr == GetAInt(argv[0]) || link[i]->mass2->nbr == GetAInt(argv[0])) { ! SetFloat((aux[nb_link_delete]),link[i]->nbr); ! nb_link_delete++; } - } ! for (i=0; i<nb_link_delete;i++) ! m_delete_link(1,&aux[i]); ! // Delete mass ! for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr == 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 ! nb_mass--; ! ToOutAnything(1,S_Mass_deleted,5,sortie); ! break; } - } --- 273,307 ---- { // Delete mass ! t_int i,nb_link_delete=0; ! t_atom sortie[5], aux[nb_link]; + if (argc != 1) + error("deleteMass : Nomass"); ! // Delete all associated links ! for (i=0; i<nb_link;i++) { ! if (link[i]->mass1->nbr == GetAInt(argv[0]) || link[i]->mass2->nbr == GetAInt(argv[0])) { ! SetFloat((aux[nb_link_delete]),link[i]->nbr); ! nb_link_delete++; ! } } ! for (i=0; i<nb_link_delete;i++) ! m_delete_link(1,&aux[i]); ! // Delete mass ! for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr == 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 ! nb_mass--; ! ToOutAnything(1,S_Mass_deleted,5,sortie); ! break; } } *************** *** 287,291 **** { // set X max ! Xmax = GetFloat(argv[0]); } --- 310,316 ---- { // set X max ! if (argc != 1) ! error("Xmax : Value"); ! Xmax = GetFloat(argv[0]); } *************** *** 293,297 **** { // set X min ! Xmin = GetFloat(argv[0]); } --- 318,324 ---- { // set X min ! if (argc != 1) ! error("Xmin : Value"); ! Xmin = GetFloat(argv[0]); } *************** *** 301,309 **** void m_link(int argc,t_atom *argv) // add a link ! // Id, nbr, *mass1, *mass2, K1, D1 { t_atom sortie[7], aux[2]; t_int i; link[nb_link] = new t_link; // New pointer link[nb_link]->Id = GetSymbol(argv[0]); // ID --- 328,338 ---- void m_link(int argc,t_atom *argv) // add a link ! // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) { t_atom sortie[7], aux[2]; t_int i; + if (argc < 6 || argc > 8) + error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); link[nb_link] = new t_link; // New pointer link[nb_link]->Id = GetSymbol(argv[0]); // ID *************** *** 317,323 **** link[nb_link]->D2 = GetFloat(argv[5]); // D2 link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! link[nb_link]->longueur = link[nb_link]->longx ;// L[0] link[nb_link]->nbr = id_link; // id number link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] nb_link++; id_link++; --- 346,369 ---- link[nb_link]->D2 = GetFloat(argv[5]); // D2 link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! if (link[nb_link]->longx < 0) ! link[nb_link]->longueur = -link[nb_link]->longx; ! else ! link[nb_link]->longueur = link[nb_link]->longx ;// L[0] link[nb_link]->nbr = id_link; // id number link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] + switch (argc) { + case 6 : + link[nb_link]->long_max = 32768; + link[nb_link]->long_min = 0; + break; + case 7 : + link[nb_link]->long_min = GetFloat(argv[6]); + link[nb_link]->long_max = 32768; + break; + case 8 : + link[nb_link]->long_min = GetFloat(argv[6]); + link[nb_link]->long_max = GetFloat(argv[7]); + break; + } nb_link++; id_link++; *************** *** 335,344 **** void m_ilink(int argc,t_atom *argv) // add interactor link ! // Id, nbr, Id masses1, Id masses2, K1, D1 { ! t_atom aux[2], arglist[6]; t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0; t_symbol *Id1, *Id2; Id1 = GetSymbol(argv[1]); Id2 = GetSymbol(argv[2]); --- 381,393 ---- void m_ilink(int argc,t_atom *argv) // add interactor link ! // Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax) { ! t_atom aux[2], arglist[8]; t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0; t_symbol *Id1, *Id2; + if (argc < 6 || argc > 8) + error("ilink : Id Idmass1 Idmass2 K D1 D2 (Lmin Lmax)"); + Id1 = GetSymbol(argv[1]); Id2 = GetSymbol(argv[2]); *************** *** 365,369 **** SetFloat((arglist[4]),GetFloat(argv[4])); SetFloat((arglist[5]),GetFloat(argv[5])); ! m_link(6,arglist); } } --- 414,427 ---- SetFloat((arglist[4]),GetFloat(argv[4])); SetFloat((arglist[5]),GetFloat(argv[5])); ! switch (argc) { ! case 7 : ! SetFloat(arglist[6],GetFloat(argv[6])); ! break; ! case 8 : ! SetFloat(arglist[6],GetFloat(argv[6])); ! SetFloat(arglist[7],GetFloat(argv[7])); ! break; ! } ! m_link(argc,arglist); } } *************** *** 375,378 **** --- 433,439 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("setK : IdLink Value"); + for (i=0; i<nb_link;i++) { *************** *** 388,391 **** --- 449,455 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("setD : IdLink Value"); + for (i=0; i<nb_link;i++) { *************** *** 401,404 **** --- 465,471 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("setD2 : IdLink Value"); + for (i=0; i<nb_link;i++) { *************** *** 411,431 **** { // Delete link ! t_int i; ! t_atom sortie[7]; ! for (i=0; i<nb_link;i++) ! if (link[i]->nbr == 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 ! nb_link--; ! ToOutAnything(1,S_Link_deleted,7,sortie); ! break; } } --- 478,501 ---- { // Delete link ! t_int i; ! t_atom sortie[7]; ! if (argc != 1) ! error("deleteLink : NoLink"); ! ! for (i=0; i<nb_link;i++) ! if (link[i]->nbr == 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 ! nb_link--; ! ToOutAnything(1,S_Link_deleted,7,sortie); ! break; } } *************** *** 442,449 **** t_atom sortie[4]; 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; i<nb_mass; i++) { --- 512,519 ---- t_atom sortie[4]; 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; i<nb_mass; i++) { *************** *** 451,455 **** ToOutAnything(0,S_massesPos,1,sortie); } ! else if (auxtype == S_massesForces)// get all masses forces for (i=0; i<nb_mass; i++) { --- 521,525 ---- ToOutAnything(0,S_massesPos,1,sortie); } ! else if (auxtype == S_massesForces) // get all masses forces for (i=0; i<nb_mass; i++) { *************** *** 457,461 **** ToOutAnything(0,S_massesForces,1,sortie); } ! else if (auxtype == S_linksPos)// get all links positions for (i=0; i<nb_link; i++) { --- 527,531 ---- ToOutAnything(0,S_massesForces,1,sortie); } ! else if (auxtype == S_linksPos) // get all links positions for (i=0; i<nb_link; i++) { *************** *** 464,468 **** ToOutAnything(0,S_linksPos,2,sortie); } ! else // get all masses speeds for (i=0; i<nb_mass; i++) { --- 534,538 ---- ToOutAnything(0,S_linksPos,2,sortie); } ! else // get all masses speeds for (i=0; i<nb_mass; i++) { *************** *** 471,475 **** } } ! else if (auxtype == S_massesPos) // get mass positions { if (auxarg == 0) // No --- 541,545 ---- } } ! else if (auxtype == S_massesPos) // get mass positions { if (auxarg == 0) // No *************** *** 499,503 **** } } ! else if (auxtype == S_massesForces) // get mass forces { if (auxarg == 0) // No --- 569,573 ---- } } ! else if (auxtype == S_massesForces) // get mass forces { if (auxarg == 0) // No *************** *** 527,531 **** } } ! else if (auxtype == S_linksPos) // get links positions { if (auxarg == 0) // No --- 597,601 ---- } } ! else if (auxtype == S_linksPos) // get links positions { if (auxarg == 0) // No *************** *** 557,561 **** } } ! else // get mass speeds { if (auxarg == 0) // No --- 627,631 ---- } } ! else // get mass speeds { if (auxarg == 0) // No *************** *** 614,618 **** void m_info_dumpl() ! // List of masses and links infos on first outlet { t_atom sortie[7]; --- 684,688 ---- void m_info_dumpl() ! // List of masses and links infos on second outlet { t_atom sortie[7]; Index: help-msd.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd/help-msd.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-msd.pd 20 Apr 2005 15:33:14 -0000 1.2 --- help-msd.pd 21 Apr 2005 14:28:53 -0000 1.3 *************** *** 1,4 **** #N canvas 367 274 570 449 10; ! #N canvas 271 52 742 843 masses 1; #X obj 33 821 msd; #X obj 62 154 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131 --- 1,4 ---- #N canvas 367 274 570 449 10; ! #N canvas 271 52 742 843 masses 0; #X obj 33 821 msd; #X obj 62 154 cnv 15 610 180 empty empty CREATION 20 12 0 14 -262131 *************** *** 74,88 **** #N canvas 222 83 808 841 links 0; #X obj 33 821 msd; ! #X obj 62 250 cnv 15 610 305 empty empty CREATION 20 12 0 14 -262131 -66577 0; ! #X msg 79 279 reset; ! #X text 338 308 \$1 : Id (symbol); ! #X text 250 308 Add a link; ! #X text 337 328 \$2 : creation No of mass1; ! #X text 337 346 \$3 : creation No of mass2; ! #X text 336 364 \$4 : rigidity; ! #X text 251 280 Delete all masses and links; ! #X text 336 382 \$5 : viscosity; ! #X text 336 399 \$6 : damping; #X obj 61 561 cnv 15 610 82 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; --- 74,88 ---- #N canvas 222 83 808 841 links 0; #X obj 33 821 msd; ! #X obj 62 192 cnv 15 610 360 empty empty CREATION 20 12 0 14 -262131 -66577 0; ! #X msg 79 221 reset; ! #X text 402 247 \$1 : Id (symbol); ! #X text 314 247 Add a link; ! #X text 401 267 \$2 : creation No of mass1; ! #X text 401 285 \$3 : creation No of mass2; ! #X text 400 303 \$4 : rigidity; ! #X text 251 222 Delete all masses and links; ! #X text 400 321 \$5 : viscosity; ! #X text 400 338 \$6 : damping; #X obj 61 561 cnv 15 610 82 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; *************** *** 100,126 **** / linksPos ); #X text 237 742 \$2 : Id (symbol or creations numbers); ! #X msg 78 308 link \$1 \$2 \$3 \$4 \$5 \$6; ! #X msg 74 532 deleteLink \$1; ! #X text 239 534 Delete a link; ! #X text 340 534 \$1 : Creation No of link; #X msg 73 762 infosL; #X text 236 762 Get infos on all masses and links on outlet No 2; ! #X msg 73 423 iLink \$1 \$2 \$3 \$4 \$5 \$6; ! #X text 338 308 \$1 : Id (symbol); ! #X text 250 308 Add a link; ! #X text 337 328 \$2 : creation No of mass1; ! #X text 337 346 \$3 : creation No of mass2; ! #X text 336 364 \$4 : rigidity; ! #X text 336 382 \$5 : viscosity; ! #X text 336 399 \$6 : damping; ! #X text 410 422 \$1 : Id (symbol); ! #X text 409 478 \$4 : rigidity; ! #X text 409 496 \$5 : viscosity; ! #X text 409 513 \$6 : damping; ! #X text 410 422 \$1 : Id (symbol); ! #X text 409 478 \$4 : rigidity; ! #X text 409 496 \$5 : viscosity; ! #X text 409 513 \$6 : damping; ! #X text 248 423 Add an interactor link; #X text 94 52 LINKS :; #X text 71 91 parameters : length \, rigidity \, viscosity and damping. --- 100,124 ---- / linksPos ); #X text 237 742 \$2 : Id (symbol or creations numbers); ! #X msg 74 533 deleteLink \$1; ! #X text 239 535 Delete a link; ! #X text 340 535 \$1 : Creation No of link; #X msg 73 762 infosL; #X text 236 762 Get infos on all masses and links on outlet No 2; ! #X text 402 247 \$1 : Id (symbol); ! #X text 314 247 Add a link; ! #X text 401 267 \$2 : creation No of mass1; ! #X text 401 285 \$3 : creation No of mass2; ! #X text 400 303 \$4 : rigidity; ! #X text 400 321 \$5 : viscosity; ! #X text 400 338 \$6 : damping; ! #X text 463 392 \$1 : Id (symbol); ! #X text 462 448 \$4 : rigidity; ! #X text 462 466 \$5 : viscosity; ! #X text 462 483 \$6 : damping; ! #X text 463 392 \$1 : Id (symbol); ! #X text 462 448 \$4 : rigidity; ! #X text 462 466 \$5 : viscosity; ! #X text 462 483 \$6 : damping; ! #X text 301 393 Add an interactor link; #X text 94 52 LINKS :; #X text 71 91 parameters : length \, rigidity \, viscosity and damping. *************** *** 131,138 **** #X text 71 120 message. The lenght is initialised to the distance between ; ! #X text 71 106 Rigidity \, viscosity and damping are defined by the creation; - #X text 409 442 \$2 : Id (symbol) of masses type 1; - #X text 409 460 \$3 : Id (symbol) of masses type 2; #X text 70 148 Interactor links are links between mutiples masses \, instead; --- 129,134 ---- #X text 71 120 message. The lenght is initialised to the distance between ; ! #X text 71 107 Rigidity \, viscosity and damping are defined by the creation; #X text 70 148 Interactor links are links between mutiples masses \, instead; *************** *** 140,151 **** with; #X text 69 175 their Id.; #X connect 2 0 0 0; #X connect 15 0 0 0; #X connect 19 0 0 0; #X connect 23 0 0 0; ! #X connect 24 0 0 0; ! #X connect 27 0 0 0; ! #X connect 29 0 0 0; ! #X restore 283 353 pd links; #X text 135 323 HELP on masses --->; #X text 134 354 HELP on links --->; --- 136,155 ---- with; #X text 69 175 their Id.; + #X text 397 356 ($7) : minimum lenght of link; + #X text 397 373 ($8) : maximum lenght of link; + #X msg 78 247 link \$1 \$2 \$3 \$4 \$5 \$6 ($7 \$8); + #X text 462 412 \$2 : Id (symbol) of masses 1; + #X text 462 430 \$3 : Id (symbol) of masses 2; + #X msg 73 393 iLink \$1 \$2 \$3 \$4 \$5 \$6 ($7 \$8); + #X text 458 500 ($7) : minimum lenght of links; + #X text 458 517 ($8) : maximum lenght of links; #X connect 2 0 0 0; #X connect 15 0 0 0; #X connect 19 0 0 0; #X connect 23 0 0 0; ! #X connect 26 0 0 0; ! #X connect 55 0 0 0; ! #X connect 58 0 0 0; ! #X restore 284 353 pd links; #X text 135 323 HELP on masses --->; #X text 134 354 HELP on links --->; Index: 02_imsdtest.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd/02_imsdtest.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 02_imsdtest.pd 12 Apr 2005 18:09:20 -0000 1.1 --- 02_imsdtest.pd 21 Apr 2005 14:28:53 -0000 1.2 *************** *** 32,45 **** 0; #X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 8228 1; #X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 6323 1; #X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 10160 1; #X msg 52 736 posX fix \$1; #X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 2513 1; #X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 4418 1; #X text 199 638 MOVE FIRST SLIDER; #X text 182 662 TO MOVE THE FIXED MASS; --- 32,45 ---- 0; #X obj 88 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 6249 1; #X obj 111 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 0 1; #X obj 66 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 6860 1; #X msg 52 736 posX fix \$1; #X obj 156 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 0 1; #X obj 134 590 vsl 15 128 0 100 0 0 empty empty empty 0 -8 0 8 -261689 ! -1 -1 0 1; #X text 199 638 MOVE FIRST SLIDER; #X text 182 662 TO MOVE THE FIXED MASS; *************** *** 51,56 **** #X msg 52 335 bang \, massesPosL; #X obj 52 545 unpack f f f f f; - #X msg 184 223 iLink inter fix mob 10 2.5 0.5; #X text 490 126 CREATION : 5 MASSES \, 1 iLINK; #X connect 0 0 35 0; #X connect 2 0 37 0; --- 51,56 ---- #X msg 52 335 bang \, massesPosL; #X obj 52 545 unpack f f f f f; #X text 490 126 CREATION : 5 MASSES \, 1 iLINK; + #X msg 184 223 iLink inter fix mob 10 2.5 0.5 5 20; #X connect 0 0 35 0; #X connect 2 0 37 0; *************** *** 77,81 **** #X connect 35 0 3 0; #X connect 35 1 23 0; ! #X connect 35 1 40 0; #X connect 35 2 13 0; #X connect 35 3 15 0; --- 77,81 ---- #X connect 35 0 3 0; #X connect 35 1 23 0; ! #X connect 35 1 41 0; #X connect 35 2 13 0; #X connect 35 3 15 0; *************** *** 90,92 **** #X connect 39 3 30 0; #X connect 39 4 29 0; ! #X connect 40 0 9 0; --- 90,92 ---- #X connect 39 3 30 0; #X connect 39 4 29 0; ! #X connect 41 0 9 0;

1 0

externals/nusmuk/msd3D curve16.pd, NONE, 1.1 05_msd3Dvline.pd, 1.1, 1.2 curve2.pd, 1.1, 1.2 help-msd3D.pd, 1.2, 1.3 main.cpp, 1.3, 1.4 partiel.pd, 1.1, 1.2
by Nicolas Montgermont 21 Apr '05

21 Apr '05

Update of /cvsroot/pure-data/externals/nusmuk/msd3D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7646/msd3D Modified Files: 05_msd3Dvline.pd curve2.pd help-msd3D.pd main.cpp partiel.pd Added Files: curve16.pd Log Message: MSD Version 0.03 Index: curve2.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/curve2.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** curve2.pd 20 Apr 2005 15:38:20 -0000 1.1 --- curve2.pd 21 Apr 2005 14:28:54 -0000 1.2 *************** *** 1,3 **** ! #N canvas 8 35 1142 910 10; #X obj 31 123 GEMglBegin; #X obj 86 100 GLdefine GL_LINE_STRIP; --- 1,3 ---- ! #N canvas 0 25 1255 894 10; #X obj 31 123 GEMglBegin; #X obj 86 100 GLdefine GL_LINE_STRIP; *************** *** 6,70 **** #X obj 159 13 inlet; #X obj 200 13 inlet; ! #X obj 25 865 GEMglEnd; #X obj 31 151 GEMglVertex3fv; #X obj 31 175 GEMglVertex3fv; - #X obj 241 13 inlet; - #X obj 280 12 inlet; - #X obj 29 202 GEMglVertex3fv; - #X obj 29 226 GEMglVertex3fv; - #X obj 319 12 inlet; - #X obj 359 12 inlet; #X obj 161 76 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; - #X obj 29 252 GEMglVertex3fv; - #X obj 29 276 GEMglVertex3fv; - #X obj 29 300 GEMglVertex3fv; - #X obj 29 324 GEMglVertex3fv; - #X obj 28 346 GEMglVertex3fv; - #X obj 28 370 GEMglVertex3fv; - #X obj 28 394 GEMglVertex3fv; - #X obj 28 418 GEMglVertex3fv; - #X obj 403 12 inlet; - #X obj 444 12 inlet; - #X obj 485 12 inlet; - #X obj 524 11 inlet; - #X obj 563 11 inlet; - #X obj 603 11 inlet; - #X obj 28 441 GEMglVertex3fv; - #X obj 28 465 GEMglVertex3fv; - #X obj 28 489 GEMglVertex3fv; - #X obj 27 511 GEMglVertex3fv; - #X obj 27 535 GEMglVertex3fv; - #X obj 27 559 GEMglVertex3fv; - #X obj 27 583 GEMglVertex3fv; - #X obj 643 13 inlet; - #X obj 683 13 inlet; - #X obj 727 13 inlet; - #X obj 768 13 inlet; - #X obj 809 13 inlet; - #X obj 848 12 inlet; - #X obj 887 12 inlet; - #X obj 927 12 inlet; - #X obj 27 605 GEMglVertex3fv; - #X obj 26 625 GEMglVertex3fv; - #X obj 26 649 GEMglVertex3fv; - #X obj 26 672 GEMglVertex3fv; - #X obj 26 696 GEMglVertex3fv; - #X obj 26 720 GEMglVertex3fv; - #X obj 25 742 GEMglVertex3fv; - #X obj 25 766 GEMglVertex3fv; - #X obj 25 790 GEMglVertex3fv; - #X obj 25 814 GEMglVertex3fv; - #X obj 25 836 GEMglVertex3fv; - #X obj 970 13 inlet; - #X obj 1010 13 inlet; - #X obj 1050 15 inlet; - #X obj 1090 15 inlet; - #X obj 1134 15 inlet; - #X obj 1175 15 inlet; - #X obj 1216 15 inlet; - #X obj 1255 14 inlet; - #X obj 1294 14 inlet; - #X obj 1334 14 inlet; #X connect 0 0 7 0; #X connect 1 0 0 1; --- 6,14 ---- #X obj 159 13 inlet; #X obj 200 13 inlet; ! #X obj 28 204 GEMglEnd; #X obj 31 151 GEMglVertex3fv; #X obj 31 175 GEMglVertex3fv; #X obj 161 76 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X connect 0 0 7 0; #X connect 1 0 0 1; *************** *** 74,133 **** #X connect 5 0 8 1; #X connect 7 0 8 0; ! #X connect 8 0 11 0; ! #X connect 9 0 11 1; ! #X connect 10 0 12 1; ! #X connect 11 0 12 0; ! #X connect 12 0 16 0; ! #X connect 13 0 16 1; ! #X connect 14 0 17 1; ! #X connect 15 0 1 0; ! #X connect 16 0 17 0; ! #X connect 17 0 18 0; ! #X connect 18 0 19 0; ! #X connect 19 0 20 0; ! #X connect 20 0 21 0; ! #X connect 21 0 22 0; ! #X connect 22 0 23 0; ! #X connect 23 0 30 0; ! #X connect 24 0 18 1; ! #X connect 25 0 19 1; ! #X connect 26 0 20 1; ! #X connect 27 0 21 1; ! #X connect 28 0 22 1; ! #X connect 29 0 23 1; ! #X connect 30 0 31 0; ! #X connect 31 0 32 0; ! #X connect 32 0 33 0; ! #X connect 33 0 34 0; ! #X connect 34 0 35 0; ! #X connect 35 0 36 0; ! #X connect 36 0 45 0; ! #X connect 37 0 30 1; ! #X connect 38 0 31 1; ! #X connect 39 0 32 1; ! #X connect 40 0 33 1; ! #X connect 41 0 34 1; ! #X connect 42 0 35 1; ! #X connect 43 0 36 1; ! #X connect 44 0 45 1; ! #X connect 45 0 46 0; ! #X connect 46 0 47 0; ! #X connect 47 0 48 0; ! #X connect 48 0 49 0; ! #X connect 49 0 50 0; ! #X connect 50 0 51 0; ! #X connect 51 0 52 0; ! #X connect 52 0 53 0; ! #X connect 53 0 54 0; ! #X connect 54 0 55 0; ! #X connect 55 0 6 0; ! #X connect 56 0 46 1; ! #X connect 57 0 47 1; ! #X connect 58 0 48 1; ! #X connect 59 0 49 1; ! #X connect 60 0 50 1; ! #X connect 61 0 51 1; ! #X connect 62 0 52 1; ! #X connect 63 0 53 1; ! #X connect 64 0 54 1; ! #X connect 65 0 55 1; --- 18,21 ---- #X connect 5 0 8 1; #X connect 7 0 8 0; ! #X connect 8 0 6 0; ! #X connect 9 0 1 0; Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/main.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.cpp 20 Apr 2005 15:33:15 -0000 1.3 --- main.cpp 21 Apr 2005 14:28:54 -0000 1.4 *************** *** 31,35 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.02 -- 15.04.2005 */ --- 31,35 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Version 0.03 -- 21.04.2005 */ *************** *** 39,43 **** // define constants ! #define MSD3D_VERSION 0.02 #define nb_max_link 4000 #define nb_max_mass 4000 --- 39,43 ---- // define constants ! #define MSD3D_VERSION 0.03 #define nb_max_link 4000 #define nb_max_mass 4000 *************** *** 80,84 **** t_mass *mass2; t_float K1, D1, D2; ! t_float longx, longy, longz, longueur; t_float distance_old; } t_link; --- 80,84 ---- t_mass *mass2; t_float K1, D1, D2; ! t_float longx, longy, longz, longueur, long_min, long_max; t_float distance_old; } t_link; *************** *** 138,147 **** distance = sqrt(pow(link[i]->mass1->posX-link[i]->mass2->posX,2) + pow(link[i]->mass1->posY -link[i]->mass2->posY,2) + pow(link[i]->mass1->posZ-link[i]->mass2->posZ,2)); // L[n] ! F = link[i]->K1 * (distance - link[i]->longueur) ; // F = K1(L[n] - L[0]) ! F += link[i]->D1 * (distance - link[i]->distance_old) ; // F = F + D1(L[n] - L[n-1]) ! if (distance != 0) { ! Fx = F * (link[i]->mass1->posX - link[i]->mass2->posX)/distance; // Fx[n] = F * Lx[n]/L[n] ! Fy = F * (link[i]->mass1->posY - link[i]->mass2->posY)/distance; // Fy[n] = F * Ly[n]/L[n] ! Fz = F * (link[i]->mass1->posZ - link[i]->mass2->posZ)/distance; // Fy[n] = F * Lz[n]/L[n] } link[i]->mass1->forceX -= Fx; // Fx1[n] = -Fx --- 138,154 ---- distance = sqrt(pow(link[i]->mass1->posX-link[i]->mass2->posX,2) + pow(link[i]->mass1->posY -link[i]->mass2->posY,2) + pow(link[i]->mass1->posZ-link[i]->mass2->posZ,2)); // L[n] ! if (distance < link[i]->long_min || distance > link[i]->long_max) { ! Fx = 0; ! Fy = 0; ! Fz = 0; ! } ! else { ! F = link[i]->K1 * (distance - link[i]->longueur) ; // F = K1(L[n] - L[0]) ! F += link[i]->D1 * (distance - link[i]->distance_old) ; // F = F + D1(L[n] - L[n-1]) ! if (distance != 0) { ! Fx = F * (link[i]->mass1->posX - link[i]->mass2->posX)/distance; // Fx[n] = F * Lx[n]/L[n] ! Fy = F * (link[i]->mass1->posY - link[i]->mass2->posY)/distance; // Fy[n] = F * Ly[n]/L[n] ! Fz = F * (link[i]->mass1->posZ - link[i]->mass2->posZ)/distance; // Fy[n] = F * Lz[n]/L[n] ! } } link[i]->mass1->forceX -= Fx; // Fx1[n] = -Fx *************** *** 197,200 **** --- 204,210 ---- t_float M; + if (argc != 6) + error("mass : Id mobile mass X Y Z"); + mass[nb_mass] = new t_mass; // new mass mass[nb_mass]->Id = GetSymbol(argv[0]); // Id *************** *** 236,239 **** --- 246,252 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("forceX : Idmass value"); + for (i=0; i<nb_mass;i++) { *************** *** 249,252 **** --- 262,268 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("forceY : Idmass value"); + for (i=0; i<nb_mass;i++) { *************** *** 262,265 **** --- 278,284 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("forceZ : Idmass value"); + for (i=0; i<nb_mass;i++) { *************** *** 275,283 **** const t_symbol *sym = GetSymbol(argv[0]); if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin) for (i=0; i<nb_mass;i++) { if (sym == mass[i]->Id) ! mass[i]->posX = GetFloat(argv[1]); } } --- 294,305 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("posX : Idmass value"); + if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin) for (i=0; i<nb_mass;i++) { if (sym == mass[i]->Id) ! mass[i]->posX = GetAFloat(argv[1]); } } *************** *** 289,292 **** --- 311,317 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("posY : Idmass value"); + if (GetFloat(argv[1]) < Ymax && GetFloat(argv[1]) > Ymin) for (i=0; i<nb_mass;i++) *************** *** 304,307 **** --- 329,335 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("posZ : Idmass value"); + if (GetFloat(argv[1]) < Zmax && GetFloat(argv[1]) > Zmin) for (i=0; i<nb_mass;i++) *************** *** 317,320 **** --- 345,351 ---- // set mass No to mobile t_int i,aux; + + if (argc != 1) + error("setMobile : Idmass"); aux = GetInt(argv[0]); *************** *** 332,336 **** t_int i,aux; ! aux = GetInt(argv[0]); for (i=0; i<nb_mass;i++) { --- 363,370 ---- t_int i,aux; ! if (argc != 1) ! error("setFixed : Idmass"); ! ! aux = GetAInt(argv[0]); for (i=0; i<nb_mass;i++) { *************** *** 344,377 **** { // Delete mass ! t_int i,nb_link_delete=0; ! t_atom sortie[7], aux[nb_link]; ! // Delete associated links ! for (i=0; i<nb_link;i++) { ! if (link[i]->mass1->nbr == GetInt(argv[0]) || link[i]->mass2->nbr == GetInt(argv[0])) { ! SetFloat((aux[nb_link_delete]),link[i]->nbr); ! nb_link_delete++; } - } ! for (i=0; i<nb_link_delete;i++) ! m_delete_link(1,&aux[i]); ! // Delete mass ! for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr == GetInt(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); ! SetFloat((sortie[5]),mass[i]->posY); ! SetFloat((sortie[6]),mass[i]->posZ); ! delete mass[i]; ! mass[i] = mass[nb_mass-1]; // copy last mass indeed ! nb_mass--; ! ToOutAnything(1,S_Mass_deleted,7,sortie); ! break; ! } } --- 378,414 ---- { // Delete mass ! t_int i,nb_link_delete=0; ! t_atom sortie[7], aux[nb_link]; ! ! if (argc != 1) ! error("deleteMass : Nomass"); ! // Delete associated links ! for (i=0; i<nb_link;i++) { ! if (link[i]->mass1->nbr == GetInt(argv[0]) || link[i]->mass2->nbr == GetInt(argv[0])) { ! SetFloat((aux[nb_link_delete]),link[i]->nbr); ! nb_link_delete++; ! } } ! for (i=0; i<nb_link_delete;i++) ! m_delete_link(1,&aux[i]); ! // Delete mass ! for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr == GetInt(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); ! SetFloat((sortie[5]),mass[i]->posY); ! SetFloat((sortie[6]),mass[i]->posZ); ! delete mass[i]; ! mass[i] = mass[nb_mass-1]; // copy last mass indeed ! nb_mass--; ! ToOutAnything(1,S_Mass_deleted,7,sortie); ! break; ! } } *************** *** 379,408 **** void m_Xmax(int argc,t_atom *argv) { ! // set maximum X of all masses ! Xmax = GetFloat(argv[0]); } ! void m_Ymax(int argc,t_atom *argv) { ! // set maximum Y of all masses ! Ymax = GetFloat(argv[0]); } ! ! void m_Zmax(int argc,t_atom *argv) { ! // set maximum Z of all masses ! Zmax = GetFloat(argv[0]); } ! void m_Xmin(int argc,t_atom *argv) { ! // set minimum X of all masses ! Xmin = GetFloat(argv[0]); } ! void m_Ymin(int argc,t_atom *argv) { ! // set minimum Y of all masses ! Ymin = GetFloat(argv[0]); } --- 416,454 ---- void m_Xmax(int argc,t_atom *argv) { ! // set X max ! if (argc != 1) ! error("Xmax : Value"); ! Xmax = GetFloat(argv[0]); } ! void m_Xmin(int argc,t_atom *argv) { ! // set X min ! if (argc != 1) ! error("Xmin : Value"); ! Xmin = GetFloat(argv[0]); } ! void m_Ymax(int argc,t_atom *argv) { ! // set Y max ! if (argc != 1) ! error("Ymax : Value"); ! Ymax = GetFloat(argv[0]); } ! void m_Ymin(int argc,t_atom *argv) { ! // set Y min ! if (argc != 1) ! error("Ymin : Value"); ! Ymin = GetFloat(argv[0]); } ! void m_Zmax(int argc,t_atom *argv) { ! // set maximum Z of all masses ! if (argc != 1) ! error("Zmax : Value"); ! Zmax = GetFloat(argv[0]); } *************** *** 410,414 **** { // set minimum Z of all masses ! Zmin = GetFloat(argv[0]); } --- 456,462 ---- { // set minimum Z of all masses ! if (argc != 1) ! error("Zmin : Value"); ! Zmin = GetFloat(argv[0]); } *************** *** 417,441 **** void m_link(int argc,t_atom *argv) // add a link ! // Id, nbr, *mass1, *mass2, K1, D1 { t_atom sortie[7], aux[2]; t_int i; ! link[nb_link] = new t_link; // new link link[nb_link]->Id = GetSymbol(argv[0]); // ID for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr==GetInt(argv[1])) // pointer on mass 1 link[nb_link]->mass1 = mass[i]; ! else if(mass[i]->nbr==GetInt(argv[2])) // pointer on mass 2 link[nb_link]->mass2 = mass[i]; link[nb_link]->K1 = GetFloat(argv[3]); // K1 link[nb_link]->D1 = GetFloat(argv[4]); // D1 link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! link[nb_link]->longy = link[nb_link]->mass1->posY - link[nb_link]->mass2->posY; // Ly[0] ! link[nb_link]->longz = link[nb_link]->mass1->posZ - link[nb_link]->mass2->posZ; // Lz[0] ! link[nb_link]->longueur = sqrt( pow(link[nb_link]->longx,2) + pow(link[nb_link]->longy,2) + pow(link[nb_link]->longz,2)); link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur; nb_link++; id_link++; --- 465,506 ---- void m_link(int argc,t_atom *argv) // add a link ! // Id, *mass1, *mass2, K1, D1, D2, (Lmin,Lmax) { t_atom sortie[7], aux[2]; t_int i; ! if (argc < 6 || argc > 8) ! error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)"); ! link[nb_link] = new t_link; // New pointer link[nb_link]->Id = GetSymbol(argv[0]); // ID for (i=0; i<nb_mass;i++) ! if (mass[i]->nbr==GetAInt(argv[1])) // pointer to mass1 link[nb_link]->mass1 = mass[i]; ! else if(mass[i]->nbr==GetAInt(argv[2])) // pointer to mass2 link[nb_link]->mass2 = mass[i]; link[nb_link]->K1 = GetFloat(argv[3]); // K1 link[nb_link]->D1 = GetFloat(argv[4]); // D1 link[nb_link]->D2 = GetFloat(argv[5]); // D2 ! link[nb_link]->longx = link[nb_link]->mass1->posX - link[nb_link]->mass2->posX; // Lx[0] ! if (link[nb_link]->longx < 0) ! link[nb_link]->longueur = -link[nb_link]->longx; ! else ! link[nb_link]->longueur = link[nb_link]->longx ;// L[0] link[nb_link]->nbr = id_link; // id number ! link[nb_link]->distance_old = link[nb_link]->longueur; // L[n-1] ! switch (argc) { ! case 6 : ! link[nb_link]->long_max = 32768; ! link[nb_link]->long_min = 0; ! break; ! case 7 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = 32768; ! break; ! case 8 : ! link[nb_link]->long_min = GetFloat(argv[6]); ! link[nb_link]->long_max = GetFloat(argv[7]); ! break; ! } nb_link++; id_link++; *************** *** 448,467 **** SetFloat((sortie[5]),link[nb_link-1]->D1); SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link ,7,sortie); } void m_ilink(int argc,t_atom *argv) // add interactor link ! // Id, nbr, Id masses1, Id masses2, K1, D1 { ! t_atom aux[2], arglist[6]; t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0; t_symbol *Id1, *Id2; Id1 = GetSymbol(argv[1]); Id2 = GetSymbol(argv[2]); ToOutAnything(1,S_iLink,0,aux); - for (i=0;i<nb_mass;i++) { if (Id1 == mass[i]->Id) { --- 513,534 ---- SetFloat((sortie[5]),link[nb_link-1]->D1); SetFloat((sortie[6]),link[nb_link-1]->D2); ! ToOutAnything(1,S_Link,7,sortie); } void m_ilink(int argc,t_atom *argv) // add interactor link ! // Id, Id masses1, Id masses2, K1, D1, D2, (Lmin, Lmax) { ! t_atom aux[2], arglist[8]; t_int i,j, imass1[nb_mass], nbmass1=0, imass2[nb_mass], nbmass2=0; t_symbol *Id1, *Id2; + if (argc < 6 || argc > 8) + error("ilink : Id Idmass1 Idmass2 K D1 D2 (Lmin Lmax)"); + Id1 = GetSymbol(argv[1]); Id2 = GetSymbol(argv[2]); ToOutAnything(1,S_iLink,0,aux); for (i=0;i<nb_mass;i++) { if (Id1 == mass[i]->Id) { *************** *** 484,488 **** SetFloat((arglist[4]),GetFloat(argv[4])); SetFloat((arglist[5]),GetFloat(argv[5])); ! m_link(6,arglist); } } --- 551,564 ---- SetFloat((arglist[4]),GetFloat(argv[4])); SetFloat((arglist[5]),GetFloat(argv[5])); ! switch (argc) { ! case 7 : ! SetFloat(arglist[6],GetFloat(argv[6])); ! break; ! case 8 : ! SetFloat(arglist[6],GetFloat(argv[6])); ! SetFloat(arglist[7],GetFloat(argv[7])); ! break; ! } ! m_link(argc,arglist); } } *************** *** 494,497 **** --- 570,576 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("setK : IdLink Value"); + for (i=0; i<nb_link;i++) { *************** *** 503,510 **** void m_setD(int argc,t_atom *argv) { ! // set viscosity of link(s) named Id t_int i; const t_symbol *sym = GetSymbol(argv[0]); for (i=0; i<nb_link;i++) { --- 582,592 ---- void m_setD(int argc,t_atom *argv) { ! // set damping of link(s) named Id t_int i; const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("setD : IdLink Value"); + for (i=0; i<nb_link;i++) { *************** *** 520,523 **** --- 602,608 ---- const t_symbol *sym = GetSymbol(argv[0]); + if (argc != 2) + error("setD2 : IdLink Value"); + for (i=0; i<nb_link;i++) { *************** *** 530,553 **** { // Delete link ! t_int i; ! t_atom sortie[7]; ! for (i=0; i<nb_link;i++) ! if (link[i]->nbr == 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 ! nb_link--; ! ToOutAnything(1,S_Link_deleted,7,sortie); ! break; } } // -------------------------------------------------------------- GET // ------------------------------------------------------------------- --- 615,642 ---- { // Delete link ! t_int i; ! t_atom sortie[7]; ! if (argc != 1) ! error("deleteLink : NoLink"); ! ! for (i=0; i<nb_link;i++) ! if (link[i]->nbr == 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 ! nb_link--; ! ToOutAnything(1,S_Link_deleted,7,sortie); ! break; } } + // -------------------------------------------------------------- GET // ------------------------------------------------------------------- Index: 05_msd3Dvline.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/05_msd3Dvline.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 05_msd3Dvline.pd 20 Apr 2005 15:38:16 -0000 1.1 --- 05_msd3Dvline.pd 21 Apr 2005 14:28:54 -0000 1.2 *************** *** 1,3 **** ! #N canvas 422 196 796 654 10; #X obj 32 13 loadbang; #X obj 294 522 print msd; --- 1,3 ---- ! #N canvas 499 155 796 654 10; #X obj 32 13 loadbang; #X obj 294 522 print msd; *************** *** 5,9 **** #X msg 457 408 0 \, destroy; #X obj 288 577 gemhead; ! #X obj 288 600 world_light; #X obj 146 205 t a; #X obj 146 16 bng 20 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 --- 5,9 ---- #X msg 457 408 0 \, destroy; #X obj 288 577 gemhead; ! #X obj 288 599 world_light; #X obj 146 205 t a; #X obj 146 16 bng 20 250 50 0 empty empty empty 0 -6 0 8 -262131 -1 *************** *** 16,20 **** #X obj 146 42 t b b b b; #X msg 296 393 forceZ filet \$1; ! #X obj 444 207 tgl 20 0 empty empty empty 0 -6 0 8 -262131 -1 -1 1 1; #X obj 444 258 f; --- 16,20 ---- #X obj 146 42 t b b b b; #X msg 296 393 forceZ filet \$1; ! #X obj 444 207 tgl 20 0 empty empty empty 0 -6 0 8 -262131 -1 -1 0 1; #X obj 444 258 f; *************** *** 25,33 **** ; #X obj 421 221 vsl 15 128 -1 1 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 9300 1; #X obj 206 315 sin; #X obj 206 335 *; #X obj 206 255 counter 0 360; ! #X obj 206 204 tgl 20 0 empty empty empty 0 -6 0 8 -262131 -1 -1 1 1; #X obj 206 275 / 3.6; --- 25,33 ---- ; #X obj 421 221 vsl 15 128 -1 1 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 0 1; #X obj 206 315 sin; #X obj 206 335 *; #X obj 206 255 counter 0 360; ! #X obj 206 204 tgl 20 0 empty empty empty 0 -6 0 8 -262131 -1 -1 0 1; #X obj 206 275 / 3.6; *************** *** 71,77 **** #X msg 302 166 0.02 5; #X msg 178 72 \$2; ! #X obj 178 117 moses 0.0085; #X connect 0 0 10 0; ! #X connect 2 0 11 0; #X connect 3 0 4 1; #X connect 4 0 1 0; --- 71,80 ---- #X msg 302 166 0.02 5; #X msg 178 72 \$2; ! #X floatatom 257 48 10 0 0 0 - - -; ! #X msg 257 19 \$3; ! #X obj 178 117 moses 0.15; #X connect 0 0 10 0; ! #X connect 0 0 12 0; ! #X connect 2 0 13 0; #X connect 3 0 4 1; #X connect 4 0 1 0; *************** *** 82,87 **** #X connect 9 0 3 0; #X connect 10 0 2 0; ! #X connect 11 0 5 0; ! #X connect 11 1 8 0; #X restore 375 627 pd drone; #X obj 232 154 t f f; --- 85,91 ---- #X connect 9 0 3 0; #X connect 10 0 2 0; ! #X connect 12 0 11 0; ! #X connect 13 0 5 0; ! #X connect 13 1 8 0; #X restore 375 627 pd drone; #X obj 232 154 t f f; *************** *** 144,147 **** --- 148,154 ---- #X obj 401 501 hip~ 20; #X obj 443 563 dac~; + #X obj 232 132 counter 0 29; + #X obj 235 254 route 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 + 19 20 21 22 23 24 25 26 27 28 29; #X obj 288 385 partiel; #X obj 250 339 partiel; *************** *** 163,169 **** #X obj 573 361 partiel; #X obj 592 384 partiel; - #X obj 232 132 counter 0 29; - #X obj 235 254 route 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 - 19 20 21 22 23 24 25 26 27 28 29; #X obj 593 314 partiel; #X obj 612 337 partiel; --- 170,173 ---- *************** *** 180,200 **** #X connect 1 1 2 2; #X connect 1 2 2 3; ! #X connect 2 0 34 0; #X connect 3 0 11 0; #X connect 4 0 12 0; #X connect 4 0 11 0; #X connect 5 0 2 0; ! #X connect 6 0 33 0; #X connect 7 0 6 0; #X connect 8 0 6 0; ! #X connect 9 0 33 0; #X connect 9 1 2 1; #X connect 11 0 13 1; #X connect 12 0 13 0; ! #X connect 14 0 12 0; ! #X connect 15 0 12 0; ! #X connect 16 0 11 0; ! #X connect 17 0 11 0; ! #X connect 18 0 12 0; #X connect 19 0 11 0; #X connect 20 0 12 0; --- 184,233 ---- #X connect 1 1 2 2; #X connect 1 2 2 3; ! #X connect 2 0 15 0; #X connect 3 0 11 0; #X connect 4 0 12 0; #X connect 4 0 11 0; #X connect 5 0 2 0; ! #X connect 6 0 14 0; #X connect 7 0 6 0; #X connect 8 0 6 0; ! #X connect 9 0 14 0; #X connect 9 1 2 1; #X connect 11 0 13 1; #X connect 12 0 13 0; ! #X connect 14 0 5 0; ! #X connect 15 0 3 0; ! #X connect 15 1 17 0; ! #X connect 15 2 18 0; ! #X connect 15 3 16 0; ! #X connect 15 4 19 0; ! #X connect 15 5 20 0; ! #X connect 15 6 21 0; ! #X connect 15 7 22 0; ! #X connect 15 8 23 0; ! #X connect 15 9 24 0; ! #X connect 15 10 25 0; ! #X connect 15 11 26 0; ! #X connect 15 12 27 0; ! #X connect 15 13 28 0; ! #X connect 15 14 29 0; ! #X connect 15 15 30 0; ! #X connect 15 16 31 0; ! #X connect 15 17 32 0; ! #X connect 15 18 33 0; ! #X connect 15 19 34 0; ! #X connect 15 20 35 0; ! #X connect 15 21 36 0; ! #X connect 15 22 37 0; ! #X connect 15 23 38 0; ! #X connect 15 24 39 0; ! #X connect 15 25 40 0; ! #X connect 15 26 41 0; ! #X connect 15 27 42 0; ! #X connect 15 28 43 0; ! #X connect 15 29 44 0; ! #X connect 16 0 12 0; ! #X connect 17 0 12 0; ! #X connect 18 0 11 0; #X connect 19 0 11 0; #X connect 20 0 12 0; *************** *** 211,246 **** #X connect 31 0 11 0; #X connect 32 0 12 0; ! #X connect 33 0 5 0; ! #X connect 34 0 3 0; ! #X connect 34 1 15 0; ! #X connect 34 2 16 0; ! #X connect 34 3 14 0; ! #X connect 34 4 17 0; ! #X connect 34 5 18 0; ! #X connect 34 6 19 0; ! #X connect 34 7 20 0; ! #X connect 34 8 21 0; ! #X connect 34 9 22 0; ! #X connect 34 10 23 0; ! #X connect 34 11 24 0; ! #X connect 34 12 25 0; ! #X connect 34 13 26 0; ! #X connect 34 14 27 0; ! #X connect 34 15 28 0; ! #X connect 34 15 4 0; ! #X connect 34 16 29 0; ! #X connect 34 17 30 0; ! #X connect 34 18 31 0; ! #X connect 34 19 32 0; ! #X connect 34 20 35 0; ! #X connect 34 21 36 0; ! #X connect 34 22 37 0; ! #X connect 34 23 38 0; ! #X connect 34 24 39 0; ! #X connect 34 25 40 0; ! #X connect 34 26 41 0; ! #X connect 34 27 42 0; ! #X connect 34 28 43 0; ! #X connect 34 29 44 0; #X connect 35 0 11 0; #X connect 36 0 12 0; --- 244,249 ---- #X connect 31 0 11 0; #X connect 32 0 12 0; ! #X connect 33 0 11 0; ! #X connect 34 0 12 0; #X connect 35 0 11 0; #X connect 36 0 12 0; *************** *** 254,267 **** #X connect 44 0 12 0; #X restore 33 572 pd synthese; - #X msg 33 379 get massesSpeeds \$1; #X obj 183 219 vsl 15 128 0 30 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 12700 1; ! #X msg 33 443 get massesPos; #N canvas 571 334 938 386 massrender 0; #X obj 286 2 inlet; #X obj 35 134 gemhead; #X obj 44 192 any; - #X obj 44 288 curve2 --------------------------------------------- - ; #X obj 382 3 inlet; #X obj 304 88 f 0; --- 257,266 ---- #X connect 44 0 12 0; #X restore 33 572 pd synthese; #X obj 183 219 vsl 15 128 0 30 0 0 empty empty empty 0 -8 0 8 -262131 ! -1 -1 0 1; #N canvas 571 334 938 386 massrender 0; #X obj 286 2 inlet; #X obj 35 134 gemhead; #X obj 44 192 any; #X obj 382 3 inlet; #X obj 304 88 f 0; *************** *** 276,334 **** 19 20 21 22 23 24 25 26 27 28 29; #X obj 211 189 sel 0; ! #X connect 0 0 9 0; #X connect 1 0 2 1; ! #X connect 2 0 3 0; #X connect 4 0 10 0; #X connect 5 0 11 0; #X connect 6 0 12 0; ! #X connect 7 0 13 0; ! #X connect 8 0 7 1; ! #X connect 8 1 7 2; ! #X connect 8 2 7 3; ! #X connect 9 1 5 0; ! #X connect 9 2 8 0; ! #X connect 10 0 5 1; ! #X connect 11 0 6 0; ! #X connect 11 1 7 0; ! #X connect 12 0 5 1; ! #X connect 12 0 14 0; ! #X connect 13 0 3 1; ! #X connect 13 1 3 2; ! #X connect 13 2 3 3; ! #X connect 13 3 3 4; ! #X connect 13 4 3 5; ! #X connect 13 5 3 6; ! #X connect 13 6 3 7; ! #X connect 13 7 3 8; ! #X connect 13 8 3 9; ! #X connect 13 9 3 10; ! #X connect 13 10 3 11; ! #X connect 13 11 3 12; ! #X connect 13 12 3 13; ! #X connect 13 13 3 14; ! #X connect 13 14 3 15; ! #X connect 13 15 3 16; ! #X connect 13 16 3 17; ! #X connect 13 17 3 18; ! #X connect 13 18 3 19; ! #X connect 13 19 3 20; ! #X connect 13 20 3 21; ! #X connect 13 21 3 22; ! #X connect 13 22 3 23; ! #X connect 13 23 3 24; ! #X connect 13 24 3 25; ! #X connect 13 25 3 26; ! #X connect 13 26 3 27; ! #X connect 13 27 3 28; ! #X connect 13 28 3 29; ! #X connect 13 29 3 30; ! #X connect 14 0 2 0; #X restore 135 573 pd massrender; - #X obj 33 539 route massesSpeedsNo massesPos; #X msg 165 140 setFixed 0 \, setFixed 29 \, setFixed 420 \, setFixed 449; #X text 459 114 Filet abstraction : x0 y0 stepx stepy ny nx; - #X msg 146 173 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4 \, Zmax 7 \, - Zmin -6; #X text 484 206 <-- Add constant force; #X text 240 204 <-- Add sinus force; --- 275,332 ---- 19 20 21 22 23 24 25 26 27 28 29; #X obj 211 189 sel 0; ! #X obj 44 288 curve16 --------------------------------------------- ! ; ! #X connect 0 0 8 0; #X connect 1 0 2 1; ! #X connect 2 0 14 0; ! #X connect 3 0 9 0; #X connect 4 0 10 0; #X connect 5 0 11 0; #X connect 6 0 12 0; ! #X connect 7 0 6 1; ! #X connect 7 1 6 2; ! #X connect 7 2 6 3; ! #X connect 8 1 4 0; ! #X connect 8 2 7 0; ! #X connect 9 0 4 1; ! #X connect 10 0 5 0; ! #X connect 10 1 6 0; ! #X connect 11 0 4 1; ! #X connect 11 0 13 0; ! #X connect 12 0 14 1; ! #X connect 12 1 14 2; ! #X connect 12 2 14 3; ! #X connect 12 3 14 4; ! #X connect 12 4 14 5; ! #X connect 12 5 14 6; ! #X connect 12 6 14 7; ! #X connect 12 7 14 8; ! #X connect 12 8 14 9; ! #X connect 12 9 14 10; ! #X connect 12 10 14 11; ! #X connect 12 11 14 12; ! #X connect 12 12 14 13; ! #X connect 12 13 14 14; ! #X connect 12 14 14 15; ! #X connect 12 15 14 16; ! #X connect 12 16 14 17; ! #X connect 12 17 14 18; ! #X connect 12 18 14 19; ! #X connect 12 19 14 20; ! #X connect 12 20 14 21; ! #X connect 12 21 14 22; ! #X connect 12 22 14 23; ! #X connect 12 23 14 24; ! #X connect 12 24 14 25; ! #X connect 12 25 14 26; ! #X connect 12 26 14 27; ! #X connect 12 27 14 28; ! #X connect 12 28 14 29; ! #X connect 12 29 14 30; ! #X connect 13 0 2 0; #X restore 135 573 pd massrender; #X msg 165 140 setFixed 0 \, setFixed 29 \, setFixed 420 \, setFixed 449; #X text 459 114 Filet abstraction : x0 y0 stepx stepy ny nx; #X text 484 206 <-- Add constant force; #X text 240 204 <-- Add sinus force; *************** *** 338,342 **** #X obj 184 115 filet -3.2 -3.2 0.22068 0.45714 15 30; #X msg 327 449 setK fil 20; - #X msg 457 369 view 0 0 10 0 0 0 1 0 0; #X obj 146 92 s resban; #X msg 425 449 setK fil 10; --- 336,339 ---- *************** *** 346,349 **** --- 343,352 ---- #X text 624 390 <-- Zoom in; #X msg 33 412 forceZ filet 0; + #X msg 33 379 get massesPos \$1; + #X msg 146 173 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4 \, Zmax 9 \, + Zmin -6; + #X msg 457 369 view 0 0 11 0 0 0 1 0 0; + #X msg 33 443 get massesPos; + #X obj 33 539 route massesPosNo massesPos; #X connect 0 0 13 0; #X connect 3 0 2 0; *************** *** 353,363 **** #X connect 8 0 6 0; #X connect 9 0 19 0; ! #X connect 10 0 44 1; ! #X connect 11 0 35 0; #X connect 11 1 1 0; ! #X connect 13 0 38 0; ! #X connect 13 0 47 0; ! #X connect 13 1 36 0; ! #X connect 13 2 44 0; #X connect 13 3 8 0; #X connect 13 3 10 0; --- 356,366 ---- #X connect 8 0 6 0; #X connect 9 0 19 0; ! #X connect 10 0 40 1; ! #X connect 11 0 53 0; #X connect 11 1 1 0; ! #X connect 13 0 50 0; ! #X connect 13 0 42 0; ! #X connect 13 1 33 0; ! #X connect 13 2 40 0; #X connect 13 3 8 0; #X connect 13 3 10 0; *************** *** 369,380 **** #X connect 19 0 11 0; #X connect 19 0 29 0; ! #X connect 19 0 33 0; ! #X connect 19 0 53 0; ! #X connect 19 1 34 1; #X connect 19 2 29 0; ! #X connect 19 2 33 0; ! #X connect 19 3 34 1; #X connect 20 0 2 0; ! #X connect 20 0 42 0; #X connect 21 0 16 1; #X connect 22 0 23 0; --- 372,383 ---- #X connect 19 0 11 0; #X connect 19 0 29 0; ! #X connect 19 0 52 0; ! #X connect 19 0 48 0; ! #X connect 19 1 32 1; #X connect 19 2 29 0; ! #X connect 19 2 52 0; ! #X connect 19 3 32 1; #X connect 20 0 2 0; ! #X connect 20 0 38 0; #X connect 21 0 16 1; #X connect 22 0 23 0; *************** *** 385,402 **** #X connect 27 0 22 0; #X connect 28 0 24 0; ! #X connect 29 0 31 0; ! #X connect 31 0 11 0; ! #X connect 32 0 23 1; ! #X connect 33 0 11 0; ! #X connect 35 0 30 0; ! #X connect 35 1 34 0; ! #X connect 36 0 6 0; ! #X connect 38 0 6 0; ! #X connect 42 0 46 0; ! #X connect 44 0 6 0; ! #X connect 45 0 11 0; #X connect 46 0 2 0; #X connect 48 0 11 0; #X connect 49 0 11 0; #X connect 51 0 2 0; ! #X connect 53 0 11 0; --- 388,405 ---- #X connect 27 0 22 0; #X connect 28 0 24 0; ! #X connect 29 0 49 0; ! #X connect 31 0 23 1; ! #X connect 33 0 6 0; ! #X connect 38 0 51 0; ! #X connect 40 0 6 0; ! #X connect 41 0 11 0; ! #X connect 43 0 11 0; ! #X connect 44 0 11 0; #X connect 46 0 2 0; #X connect 48 0 11 0; #X connect 49 0 11 0; + #X connect 50 0 6 0; #X connect 51 0 2 0; ! #X connect 52 0 11 0; ! #X connect 53 0 30 0; ! #X connect 53 1 32 0; Index: partiel.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/partiel.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** partiel.pd 20 Apr 2005 15:38:20 -0000 1.1 --- partiel.pd 21 Apr 2005 14:28:54 -0000 1.2 *************** *** 8,25 **** #X obj 260 170 mtof; #X msg 174 167 \$1 50; - #X obj 131 83 / 0.2; #X msg 131 60 \$2; ! #X obj 172 104 * 9; ! #X obj 172 83 + 5; ! #X connect 0 0 9 0; #X connect 0 0 5 0; #X connect 2 0 3 1; #X connect 3 0 1 0; #X connect 4 0 3 0; ! #X connect 5 0 11 0; #X connect 6 0 4 0; #X connect 7 0 2 0; ! #X connect 8 0 7 0; ! #X connect 9 0 8 0; ! #X connect 10 0 6 0; ! #X connect 11 0 10 0; --- 8,25 ---- #X obj 260 170 mtof; #X msg 174 167 \$1 50; #X msg 131 60 \$2; ! #X obj 131 83 / 10; ! #X obj 172 84 * -10; ! #X obj 182 112 + 110; ! #X connect 0 0 8 0; #X connect 0 0 5 0; #X connect 2 0 3 1; #X connect 3 0 1 0; #X connect 4 0 3 0; ! #X connect 5 0 10 0; #X connect 6 0 4 0; #X connect 7 0 2 0; ! #X connect 8 0 9 0; ! #X connect 9 0 7 0; ! #X connect 10 0 11 0; ! #X connect 11 0 6 0; --- NEW FILE: curve16.pd --- #N canvas 8 35 1142 910 10; #X obj 31 123 GEMglBegin; #X obj 86 100 GLdefine GL_LINE_STRIP; #X obj 31 13 inlet; #X obj 86 77 loadbang; #X obj 159 13 inlet; #X obj 200 13 inlet; #X obj 25 865 GEMglEnd; #X obj 31 151 GEMglVertex3fv; #X obj 31 175 GEMglVertex3fv; #X obj 241 13 inlet; #X obj 280 12 inlet; #X obj 29 202 GEMglVertex3fv; #X obj 29 226 GEMglVertex3fv; #X obj 319 12 inlet; #X obj 359 12 inlet; #X obj 161 76 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 29 252 GEMglVertex3fv; #X obj 29 276 GEMglVertex3fv; #X obj 29 300 GEMglVertex3fv; #X obj 29 324 GEMglVertex3fv; #X obj 28 346 GEMglVertex3fv; #X obj 28 370 GEMglVertex3fv; #X obj 28 394 GEMglVertex3fv; #X obj 28 418 GEMglVertex3fv; #X obj 403 12 inlet; #X obj 444 12 inlet; #X obj 485 12 inlet; #X obj 524 11 inlet; #X obj 563 11 inlet; #X obj 603 11 inlet; #X obj 28 441 GEMglVertex3fv; #X obj 28 465 GEMglVertex3fv; #X obj 28 489 GEMglVertex3fv; #X obj 27 511 GEMglVertex3fv; #X obj 27 535 GEMglVertex3fv; #X obj 27 559 GEMglVertex3fv; #X obj 27 583 GEMglVertex3fv; #X obj 643 13 inlet; #X obj 683 13 inlet; #X obj 727 13 inlet; #X obj 768 13 inlet; #X obj 809 13 inlet; #X obj 848 12 inlet; #X obj 887 12 inlet; #X obj 927 12 inlet; #X obj 27 605 GEMglVertex3fv; #X obj 26 625 GEMglVertex3fv; #X obj 26 649 GEMglVertex3fv; #X obj 26 672 GEMglVertex3fv; #X obj 26 696 GEMglVertex3fv; #X obj 26 720 GEMglVertex3fv; #X obj 25 742 GEMglVertex3fv; #X obj 25 766 GEMglVertex3fv; #X obj 25 790 GEMglVertex3fv; #X obj 25 814 GEMglVertex3fv; #X obj 25 836 GEMglVertex3fv; #X obj 970 13 inlet; #X obj 1010 13 inlet; #X obj 1050 15 inlet; #X obj 1090 15 inlet; #X obj 1134 15 inlet; #X obj 1175 15 inlet; #X obj 1216 15 inlet; #X obj 1255 14 inlet; #X obj 1294 14 inlet; #X obj 1334 14 inlet; #X connect 0 0 7 0; #X connect 1 0 0 1; #X connect 2 0 0 0; #X connect 3 0 1 0; #X connect 4 0 7 1; #X connect 5 0 8 1; #X connect 7 0 8 0; #X connect 8 0 11 0; #X connect 9 0 11 1; #X connect 10 0 12 1; #X connect 11 0 12 0; #X connect 12 0 16 0; #X connect 13 0 16 1; #X connect 14 0 17 1; #X connect 15 0 1 0; #X connect 16 0 17 0; #X connect 17 0 18 0; #X connect 18 0 19 0; #X connect 19 0 20 0; #X connect 20 0 21 0; #X connect 21 0 22 0; #X connect 22 0 23 0; #X connect 23 0 30 0; #X connect 24 0 18 1; #X connect 25 0 19 1; #X connect 26 0 20 1; #X connect 27 0 21 1; #X connect 28 0 22 1; #X connect 29 0 23 1; #X connect 30 0 31 0; #X connect 31 0 32 0; #X connect 32 0 33 0; #X connect 33 0 34 0; #X connect 34 0 35 0; #X connect 35 0 36 0; #X connect 36 0 45 0; #X connect 37 0 30 1; #X connect 38 0 31 1; #X connect 39 0 32 1; #X connect 40 0 33 1; #X connect 41 0 34 1; #X connect 42 0 35 1; #X connect 43 0 36 1; #X connect 44 0 45 1; #X connect 45 0 46 0; #X connect 46 0 47 0; #X connect 47 0 48 0; #X connect 48 0 49 0; #X connect 49 0 50 0; #X connect 50 0 51 0; #X connect 51 0 52 0; #X connect 52 0 53 0; #X connect 53 0 54 0; #X connect 54 0 55 0; #X connect 55 0 6 0; #X connect 56 0 46 1; #X connect 57 0 47 1; #X connect 58 0 48 1; #X connect 59 0 49 1; #X connect 60 0 50 1; #X connect 61 0 51 1; #X connect 62 0 52 1; #X connect 63 0 53 1; #X connect 64 0 54 1; #X connect 65 0 55 1; Index: help-msd3D.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/help-msd3D.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-msd3D.pd 20 Apr 2005 15:33:15 -0000 1.2 --- help-msd3D.pd 21 Apr 2005 14:28:54 -0000 1.3 *************** *** 77,92 **** #X connect 47 0 52 0; #X restore 158 305 pd masses; #N canvas 222 83 808 841 links 0; ! #X obj 62 250 cnv 15 610 305 empty empty CREATION 20 12 0 14 -262131 -66577 0; ! #X msg 79 279 reset; ! #X text 338 308 \$1 : Id (symbol); ! #X text 250 308 Add a link; ! #X text 337 328 \$2 : creation No of mass1; ! #X text 337 346 \$3 : creation No of mass2; ! #X text 336 364 \$4 : rigidity; ! #X text 251 280 Delete all masses and links; ! #X text 336 382 \$5 : viscosity; ! #X text 336 399 \$6 : damping; #X obj 61 561 cnv 15 610 82 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; --- 77,115 ---- #X connect 47 0 52 0; #X restore 158 305 pd masses; + #X text 12 305 HELP on masses --->; + #X text 11 336 HELP on links --->; + #X text -50 110 There are 4 types of messages for msd :; + #X text -49 74 It is designed to implement particules physical model + in PD.The model is based on two elements type : mass and link.; + #X obj -50 125 cnv 15 420 30 empty empty empty 20 12 0 14 -262131 -66577 + 0; + #X obj -50 158 cnv 15 420 30 empty empty empty 20 12 0 14 -261689 -66577 + 0; + #X obj -50 191 cnv 15 420 30 empty empty empty 20 12 0 14 -262131 -66577 + 0; + #X obj -50 224 cnv 15 420 30 empty empty empty 20 12 0 14 -261689 -66577 + 0; + #X text -47 132 CREATION : To create the model masses and links.; + #X text -47 197 DYNAMIC SETTING : To set the model parameters dynamically. + ; + #X text -47 230 ATTRIBUTES : To get the model parameters.; + #X text -47 159 COMPUTATION : To compute the new model state based + on previous instant.; + #X text 32 16 MSD3D : mass - spring - damper model; + #X text -48 61 MSD3D is the 3D object of the msd objects collection. + ; #N canvas 222 83 808 841 links 0; ! #X obj 33 821 msd; ! #X obj 62 192 cnv 15 610 360 empty empty CREATION 20 12 0 14 -262131 -66577 0; ! #X msg 79 221 reset; ! #X text 402 247 \$1 : Id (symbol); ! #X text 314 247 Add a link; ! #X text 401 267 \$2 : creation No of mass1; ! #X text 401 285 \$3 : creation No of mass2; ! #X text 400 303 \$4 : rigidity; ! #X text 251 222 Delete all masses and links; ! #X text 400 321 \$5 : viscosity; ! #X text 400 338 \$6 : damping; #X obj 61 561 cnv 15 610 82 empty empty DYNAMIC_SETTING 20 12 0 14 -262131 -66577 0; *************** *** 104,130 **** / linksPos ); #X text 237 742 \$2 : Id (symbol or creations numbers); ! #X msg 78 308 link \$1 \$2 \$3 \$4 \$5 \$6; ! #X msg 74 532 deleteLink \$1; ! #X text 239 534 Delete a link; ! #X text 340 534 \$1 : Creation No of link; #X msg 73 762 infosL; #X text 236 762 Get infos on all masses and links on outlet No 2; ! #X msg 73 423 iLink \$1 \$2 \$3 \$4 \$5 \$6; ! #X text 338 308 \$1 : Id (symbol); ! #X text 250 308 Add a link; ! #X text 337 328 \$2 : creation No of mass1; ! #X text 337 346 \$3 : creation No of mass2; ! #X text 336 364 \$4 : rigidity; ! #X text 336 382 \$5 : viscosity; ! #X text 336 399 \$6 : damping; ! #X text 410 422 \$1 : Id (symbol); ! #X text 409 478 \$4 : rigidity; ! #X text 409 496 \$5 : viscosity; ! #X text 409 513 \$6 : damping; ! #X text 410 422 \$1 : Id (symbol); ! #X text 409 478 \$4 : rigidity; ! #X text 409 496 \$5 : viscosity; ! #X text 409 513 \$6 : damping; ! #X text 248 423 Add an interactor link; #X text 94 52 LINKS :; #X text 71 91 parameters : length \, rigidity \, viscosity and damping. --- 127,151 ---- / linksPos ); #X text 237 742 \$2 : Id (symbol or creations numbers); ! #X msg 74 533 deleteLink \$1; ! #X text 239 535 Delete a link; ! #X text 340 535 \$1 : Creation No of link; #X msg 73 762 infosL; #X text 236 762 Get infos on all masses and links on outlet No 2; ! #X text 402 247 \$1 : Id (symbol); ! #X text 314 247 Add a link; ! #X text 401 267 \$2 : creation No of mass1; ! #X text 401 285 \$3 : creation No of mass2; ! #X text 400 303 \$4 : rigidity; ! #X text 400 321 \$5 : viscosity; ! #X text 400 338 \$6 : damping; ! #X text 463 392 \$1 : Id (symbol); ! #X text 462 448 \$4 : rigidity; ! #X text 462 466 \$5 : viscosity; ! #X text 462 483 \$6 : damping; ! #X text 463 392 \$1 : Id (symbol); ! #X text 462 448 \$4 : rigidity; ! #X text 462 466 \$5 : viscosity; ! #X text 462 483 \$6 : damping; ! #X text 301 393 Add an interactor link; #X text 94 52 LINKS :; #X text 71 91 parameters : length \, rigidity \, viscosity and damping. *************** *** 135,142 **** #X text 71 120 message. The lenght is initialised to the distance between ; ! #X text 71 106 Rigidity \, viscosity and damping are defined by the creation; - #X text 409 442 \$2 : Id (symbol) of masses type 1; - #X text 409 460 \$3 : Id (symbol) of masses type 2; #X text 70 148 Interactor links are links between mutiples masses \, instead; --- 156,161 ---- #X text 71 120 message. The lenght is initialised to the distance between ; ! #X text 71 107 Rigidity \, viscosity and damping are defined by the creation; #X text 70 148 Interactor links are links between mutiples masses \, instead; *************** *** 144,176 **** with; #X text 69 175 their Id.; ! #X obj 33 821 msd3D; ! #X connect 1 0 56 0; ! #X connect 14 0 56 0; ! #X connect 18 0 56 0; ! #X connect 22 0 56 0; ! #X connect 23 0 56 0; ! #X connect 26 0 56 0; ! #X connect 28 0 56 0; #X restore 160 335 pd links; - #X text 12 305 HELP on masses --->; - #X text 11 336 HELP on links --->; - #X text -50 110 There are 4 types of messages for msd :; - #X text -49 74 It is designed to implement particules physical model - in PD.The model is based on two elements type : mass and link.; - #X obj -50 125 cnv 15 420 30 empty empty empty 20 12 0 14 -262131 -66577 - 0; - #X obj -50 158 cnv 15 420 30 empty empty empty 20 12 0 14 -261689 -66577 - 0; - #X obj -50 191 cnv 15 420 30 empty empty empty 20 12 0 14 -262131 -66577 - 0; - #X obj -50 224 cnv 15 420 30 empty empty empty 20 12 0 14 -261689 -66577 - 0; - #X text -47 132 CREATION : To create the model masses and links.; - #X text -47 197 DYNAMIC SETTING : To set the model parameters dynamically. - ; - #X text -47 230 ATTRIBUTES : To get the model parameters.; - #X text -47 159 COMPUTATION : To compute the new model state based - on previous instant.; - #X text 32 16 MSD3D : mass - spring - damper model; - #X text -48 61 MSD3D is the 3D object of the msd objects collection. - ; --- 163,180 ---- with; #X text 69 175 their Id.; ! #X text 397 356 ($7) : minimum lenght of link; ! #X text 397 373 ($8) : maximum lenght of link; ! #X msg 78 247 link \$1 \$2 \$3 \$4 \$5 \$6 ($7 \$8); ! #X text 462 412 \$2 : Id (symbol) of masses 1; ! #X text 462 430 \$3 : Id (symbol) of masses 2; ! #X msg 73 393 iLink \$1 \$2 \$3 \$4 \$5 \$6 ($7 \$8); ! #X text 458 500 ($7) : minimum lenght of links; ! #X text 458 517 ($8) : maximum lenght of links; ! #X connect 2 0 0 0; ! #X connect 15 0 0 0; ! #X connect 19 0 0 0; ! #X connect 23 0 0 0; ! #X connect 26 0 0 0; ! #X connect 55 0 0 0; ! #X connect 58 0 0 0; #X restore 160 335 pd links;

1 0

packages/darwin_app Makefile,1.8,1.9
by Hans-Christoph Steiner 21 Apr '05

21 Apr '05

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13086 Modified Files: Makefile Log Message: added Thomas' new flext target Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 20 Apr 2005 23:23:31 -0000 1.8 --- Makefile 20 Apr 2005 23:55:06 -0000 1.9 *************** *** 252,258 **** #---------------------------------------------------------------------------- # FLEXT ! cd ../../externals/grill/flext && make -f makefile.pd-darwin ! cd ../../externals/grill/flext/pd-darwin/ && cp libflext.a ../source ! cd ../../externals/grill/flext/source && ranlib libflext.a install -d $(HELP_DIR)/tutorials cp -rp ../../externals/grill/flext/tutorial $(HELP_DIR)/tutorials/flext --- 252,257 ---- #---------------------------------------------------------------------------- # FLEXT ! cd ../../externals/grill/flext && bash build.sh pd gcc build-release-shared ! install -p -m0444 ../../externals/grill/flext/pd-darwin/release-shared/libflext-pd.dylib $(EXTERNALS_DIR) install -d $(HELP_DIR)/tutorials cp -rp ../../externals/grill/flext/tutorial $(HELP_DIR)/tutorials/flext *************** *** 264,280 **** # FLEXTERNALS ######### ! # dyn ! cd ../../externals/grill/dyn && make -f makefile.pd-darwin ! install -p -m0444 ../../externals/grill/dyn/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) ! install -p -m0444 ../../externals/grill/dyn/pd/*.pd $(HELP_DIR)/5.reference ! install -d $(HELP_DIR)/dyn ! install -p -m0444 ../../externals/grill/dyn/gpl.txt \ ! ../../externals/grill/dyn/readme.txt \ ! ../../externals/grill/dyn/license.txt \ ! $(HELP_DIR)/dyn ######### # pool ! cd ../../externals/grill/pool && make -f makefile.pd-darwin ! install -p -m0444 ../../externals/grill/pool/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/pool/help-pool.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/pool --- 263,279 ---- # FLEXTERNALS ######### ! # dyn~ ! cd ../../externals/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared ! install -p -m0444 ../../externals/grill/dynext/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) ! install -p -m0444 ../../externals/grill/dynext/pd/*.pd $(HELP_DIR)/5.reference ! install -d $(HELP_DIR)/dynext ! install -p -m0444 ../../externals/grill/dynext/gpl.txt \ ! ../../externals/grill/dynext/readme.txt \ ! ../../externals/grill/dynext/license.txt \ ! $(HELP_DIR)/dynext ######### # pool ! cd ../../externals/grill/pool && bash ../flext/build.sh pd gcc build-release-shared ! install -p -m0444 ../../externals/grill/pool/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/pool/help-pool.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/pool *************** *** 285,290 **** ######### # py/pyext ! # cd ../../externals/grill/py && make -f makefile.pd-darwin ! # install -p -m0444 ../../externals/grill/py/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -d $(HELP_DIR)/py/examples install -d $(HELP_DIR)/py/scripts --- 284,289 ---- ######### # py/pyext ! # cd ../../externals/grill/py && bash ../flext/build.sh pd gcc build-release-shared ! # install -p -m0444 ../../externals/grill/py/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -d $(HELP_DIR)/py/examples install -d $(HELP_DIR)/py/scripts *************** *** 300,305 **** # fails without the dir # test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin ! # cd ../../externals/grill/vasp/ && make -f makefile.pd-darwin ! # install -p -m0444 ../../externals/grill/vasp/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/vasp/pd-help/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/vasp --- 299,304 ---- # fails without the dir # test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin ! cd ../../externals/grill/vasp/ && bash ../flext/build.sh pd gcc build-release-shared ! install -p -m0444 ../../externals/grill/vasp/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/vasp/pd-help/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/vasp *************** *** 313,318 **** ######### # xsample ! cd ../../externals/grill/xsample && make -f makefile.pd-darwin ! install -p -m0444 ../../externals/grill/xsample/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/xsample/pd/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/xsample --- 312,317 ---- ######### # xsample ! cd ../../externals/grill/xsample && bash ../flext/build.sh pd gcc build-release-shared ! install -p -m0444 ../../externals/grill/xsample/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/xsample/pd/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/xsample *************** *** 327,330 **** --- 326,330 ---- install -p -m0444 ../../externals/footils/syncgrain/pd/*.* $(HELP_DIR)/5.reference + darwin_app_externals_standard: #----------------------------------------------------------------------------

1 0

packages TODO,NONE,1.1
by Hans-Christoph Steiner 21 Apr '05

21 Apr '05

Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28393 Added Files: TODO Log Message: made the Pd-0.38-2hcs0 release based on the Pd.app from Ben Bogard/PixelTANGO --- NEW FILE: TODO --- - global versioning system the package releases should have versions of there own which apply to all packages, regardless of format or OS. This will make for easy and seemless cross-platform work. - global optimization flags ideally, you would use a version of Pd that is fully optimized for your CPU. In order to do this, a system of optimization flags needs to be developed so that you can specific the target CPU in one place and have everything compile for that CPU.

1 0

packages/darwin_app Makefile,1.7,1.8
by Hans-Christoph Steiner 21 Apr '05

21 Apr '05

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27738 Modified Files: Makefile Log Message: made the Pd-0.38-2hcs0 release based on the Pd.app from Ben Bogard/PixelTANGO Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 19 Apr 2005 05:04:56 -0000 1.7 --- Makefile 20 Apr 2005 23:23:31 -0000 1.8 *************** *** 31,35 **** # release version for this distro ! PACKAGE_VERSION = beta4 PACKAGE_NAME = pd-$(PD_VERSION)-$(PACKAGE_VERSION) DMG_NAME = $(PACKAGE_NAME) --- 31,35 ---- # release version for this distro ! PACKAGE_VERSION = hcs0 PACKAGE_NAME = pd-$(PD_VERSION)-$(PACKAGE_VERSION) DMG_NAME = $(PACKAGE_NAME) *************** *** 77,80 **** --- 77,83 ---- darwin_app_docs darwin_app_externals darwin_app_abstractions + # this target is for when you already have a pre-built Pd.app and you + # just want to fill it with goodies from CVS. To do so, place your + # Pd.app in installroot/Applications/Pd.app darwin_prebuilt_app: darwin_app_externals darwin_app_docs \ darwin_app_abstractions darwin_app_doc_format *************** *** 97,101 **** echo "</head>" >> $(README_FILE) echo "<body>" >> $(README_FILE) ! echo "<h2><IMG SRC=\"pd-16.png\"> Pure Data $(PD_VERSION)-$(PACKAGE_VERSION)</h2>" >> $(README_FILE) echo "<p>Pd is a free real-time computer music software package resembling Max. It provides a patchable environment for audio analysis, synthesis, and processing, with a rich set of multimedia capabilities. You can get Pd for Linux, Windows, MacOS X, BSD, or IRIX.</p>" >> $(README_FILE) echo "<p>For more information, go to: http://www.puredata.org</p>" >> $(README_FILE) --- 100,104 ---- echo "</head>" >> $(README_FILE) echo "<body>" >> $(README_FILE) ! echo "<h2>Pure Data $(PD_VERSION)-$(PACKAGE_VERSION)</h2>" >> $(README_FILE) echo "<p>Pd is a free real-time computer music software package resembling Max. It provides a patchable environment for audio analysis, synthesis, and processing, with a rich set of multimedia capabilities. You can get Pd for Linux, Windows, MacOS X, BSD, or IRIX.</p>" >> $(README_FILE) echo "<p>For more information, go to: http://www.puredata.org</p>" >> $(README_FILE) *************** *** 197,212 **** -rm -Rf `find $(PD_FILE_ROOT) -name CVS` # set the font to 10pt on all help patches - cd $(HELP_DIR) && \ - sed -i.bak 's/^$\#N canvas [0-9]* [0-9]* [0-9]* [0-9]*$ 12/\1 10/' */*.pd # the BSD/Darwin version of sed must create a backup file when doing # in-place replacement, so delete the unneeded backup files ! -rm */*.pd.bak # run script to move help-*.pd files to *-help.pd according to the standard ! ../../scripts/convert-help-to-standard.sh darwin_app_docs: #---------------------------------------------------------------------------- ! # DOC install -d $(HELP_DIR)/5.reference install -d $(HELP_DIR)/7.stuff cp -Rp ../../doc/tutorials $(HELP_DIR) --- 200,219 ---- -rm -Rf `find $(PD_FILE_ROOT) -name CVS` # set the font to 10pt on all help patches # the BSD/Darwin version of sed must create a backup file when doing # in-place replacement, so delete the unneeded backup files ! cd $(HELP_DIR) && \ ! sed -i.bak 's/^$\#N canvas [0-9]* [0-9]* [0-9]* [0-9]*$ 12/\1 10/' */*.pd && \ ! rm -f */*.pd.bak # run script to move help-*.pd files to *-help.pd according to the standard ! cd $(HELP_DIR) && ../../../../../../../../scripts/convert-help-to-standard.sh darwin_app_docs: #---------------------------------------------------------------------------- ! # externals help patches install -d $(HELP_DIR)/5.reference + cd ../../externals/build/doc && make + cp -Rp ../../externals/build/doc/* $(HELP_DIR)/5.reference + #---------------------------------------------------------------------------- + # DOC install -d $(HELP_DIR)/7.stuff cp -Rp ../../doc/tutorials $(HELP_DIR) *************** *** 383,387 **** cd ../../externals/unauthorized && make install -p -m0444 ../../externals/unauthorized/*/*.pd_darwin $(EXTERNALS_DIR) ! install -p -m0444 ../../externals/unauthorized/*/*.pd $(HELP_DIR)/5.reference install -p -m0444 ../../externals/unauthorized/*/*.txt $(HELP_DIR)/5.reference install -p -m0444 ../../externals/unauthorized/*/*.pls $(HELP_DIR)/5.reference --- 390,394 ---- cd ../../externals/unauthorized && make install -p -m0444 ../../externals/unauthorized/*/*.pd_darwin $(EXTERNALS_DIR) ! install -p -m0644 ../../externals/unauthorized/*/*.pd $(HELP_DIR)/5.reference install -p -m0444 ../../externals/unauthorized/*/*.txt $(HELP_DIR)/5.reference install -p -m0444 ../../externals/unauthorized/*/*.pls $(HELP_DIR)/5.reference *************** *** 397,403 **** grep -v '-help.pd' | sed 's/$[&<>|~]$/\\\1/g') \ $(EXTERNALS_DIR) - install -p -m0444 ../../externals/zexy/zexy.pd $(HELP_DIR)/5.reference - install -d $(HELP_DIR)/help-zexy - install -p -m0444 ../../externals/zexy/examples/*.* $(HELP_DIR)/help-zexy install -p -m0444 ../../externals/zexy/abs/*-help.pd $(HELP_DIR)/5.reference --- 404,407 ---- *************** *** 481,487 **** cd $(DESTDIR)/Applications && mv $(PD_APP_NAME).app "../../$(DMG_NAME)" install -p -m0444 ../../pd/LICENSE.txt "$(DMG_NAME)/PD LICENSE.txt" ! install -p -m0444 pd-16.png $(LICENSE_FILE) $(README_FILE) \ ! $(WELCOME_FILE) $(LICENSE_FILE) \ ! "$(DMG_NAME)" /bin/sh mkdmg "$(DMG_NAME)" --- 485,490 ---- cd $(DESTDIR)/Applications && mv $(PD_APP_NAME).app "../../$(DMG_NAME)" install -p -m0444 ../../pd/LICENSE.txt "$(DMG_NAME)/PD LICENSE.txt" ! install -p -m0444 $(LICENSE_FILE) $(README_FILE) \ ! $(WELCOME_FILE) $(LICENSE_FILE) "$(DMG_NAME)" /bin/sh mkdmg "$(DMG_NAME)"

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
31
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 April 2005