Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

externals/nusmuk/msd2D/editor msd2d-editor.pd,1.6,1.7
by Frank Barknecht 04 May '05

04 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27105 Modified Files: msd2d-editor.pd Log Message: Even more simplifications while creating the network were possible, another temporary table is gone. Not there's only one left... Index: msd2d-editor.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/msd2d-editor.pd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** msd2d-editor.pd 3 May 2005 16:33:44 -0000 1.6 --- msd2d-editor.pd 3 May 2005 23:36:19 -0000 1.7 *************** *** 38,52 **** #X text 728 46 Edit here:; #N canvas 257 131 781 748 generator 0; ! #N canvas 311 93 931 555 getter 0; #X obj 244 89 inlet; #X obj 330 145 outlet; #X text 91 57 First build masses \, then links!!; #X obj 234 285 outlet; ! #N canvas 571 1 685 826 fix-mass-ids 0; ! #X obj 139 158 t b b b b b b b; ! #X msg 175 254 traverse pd-data \, next; ! #X msg 116 316 next; ! #X obj 175 284 pointer mass; ! #X obj 239 189 s \$0-reset-counter; #N canvas 331 520 708 349 counter 0; #X obj 156 125 f 0; --- 38,52 ---- #X text 728 46 Edit here:; #N canvas 257 131 781 748 generator 0; ! #N canvas 311 93 877 551 getter 0; #X obj 244 89 inlet; #X obj 330 145 outlet; #X text 91 57 First build masses \, then links!!; #X obj 234 285 outlet; ! #N canvas 629 18 551 784 fix-mass-ids 0; ! #X obj 43 72 t b b b b b b b; ! #X msg 79 168 traverse pd-data \, next; ! #X msg 20 230 next; ! #X obj 79 198 pointer mass; ! #X obj 143 103 s \$0-reset-counter; #N canvas 331 520 708 349 counter 0; #X obj 156 125 f 0; *************** *** 62,76 **** #X connect 3 0 0 1; #X connect 5 0 0 0; ! #X restore 192 384 pd counter; ! #X obj 192 482 set mass mid; ! #X text 272 286 At end: fix links!; ! #X obj 282 386 get mass mid; ! #X obj 175 333 t b b b b p p; ! #X obj 307 461 pack 0 0; ! #X obj 307 490 tabwrite \$0-mid2msdid; ! #X text 269 520 Store a mapping mid => msdid for fixing links later ; ! #X obj 139 116 inlet; ! #X obj 254 307 outlet; #X connect 0 5 1 0; #X connect 0 6 4 0; --- 62,76 ---- #X connect 3 0 0 1; #X connect 5 0 0 0; ! #X restore 96 298 pd counter; ! #X obj 96 396 set mass mid; ! #X text 176 200 At end: fix links!; ! #X obj 186 300 get mass mid; ! #X obj 79 247 t b b b b p p; ! #X obj 211 375 pack 0 0; ! #X obj 211 404 tabwrite \$0-mid2msdid; ! #X text 125 434 Store a mapping mid => msdid for fixing links later ; ! #X obj 43 30 inlet; ! #X obj 158 221 outlet; #X connect 0 5 1 0; #X connect 0 6 4 0; *************** *** 119,193 **** #X connect 11 0 0 0; #X restore 244 196 pd fix-links; ! #N canvas 0 0 920 707 get-masses 0; ! #X obj 228 162 t b b b b b b b; ! #X msg 264 258 traverse pd-data \, next; ! #X msg 215 362 next; ! #X obj 264 288 pointer mass; ! #X obj 458 455 select 0; ! #X msg 498 480 0; ! #X msg 457 479 1; ! #X obj 328 193 s \$0-reset-counter; ! #N canvas 331 520 708 349 counter 0; ! #X obj 156 125 f 0; ! #X msg 172 102 0; ! #X obj 172 74 r \$0-reset-counter; ! #X obj 188 125 + 1; ! #X obj 156 179 outlet; ! #X obj 156 50 inlet; ! #X connect 0 0 3 0; ! #X connect 0 0 4 0; ! #X connect 1 0 0 1; ! #X connect 2 0 1 0; ! #X connect 3 0 0 1; ! #X connect 5 0 0 0; ! #X restore 364 362 pd counter; ! #X obj 264 337 t b b b b p p b; ! #X obj 364 385 s \$0-current-mass-idx; ! #X obj 437 537 s \$0-current-mid; ! #X msg 328 213 const 0; ! #X obj 328 234 s \$0-mid; ! #X obj 390 234 s \$0-msdid; ! #X text 124 479 At end: start 2nd pass; ! #X obj 228 113 inlet; ! #X obj 347 564 outlet; ! #X obj 656 566 r \$0-current-mass-idx; ! #X obj 605 539 r \$0-current-mid; ! #X obj 605 616 tabwrite \$0-mid; ! #X obj 605 592 pack 0 0; ! #X text 598 515 Write old mids to table; ! #X obj 605 640 print mass-as-in-struct; ! #X obj 161 517 outlet; ! #X obj 347 432 get mass x y mid mob M; ! #X obj 347 514 pack 0 0 0 0 0; #X connect 0 5 1 0; #X connect 0 6 7 0; ! #X connect 0 6 12 0; #X connect 1 0 3 0; #X connect 2 0 3 0; ! #X connect 3 0 9 0; #X connect 3 1 2 0; ! #X connect 3 2 24 0; #X connect 4 0 6 0; #X connect 4 1 5 0; ! #X connect 5 0 26 3; ! #X connect 6 0 26 3; #X connect 8 0 10 0; ! #X connect 9 0 2 0; ! #X connect 9 5 25 0; ! #X connect 9 6 8 0; ! #X connect 12 0 13 0; ! #X connect 12 0 14 0; ! #X connect 16 0 0 0; ! #X connect 18 0 21 1; ! #X connect 19 0 21 0; ! #X connect 21 0 20 0; ! #X connect 21 0 23 0; ! #X connect 25 0 26 0; ! #X connect 25 1 26 1; ! #X connect 25 2 11 0; ! #X connect 25 2 26 2; ! #X connect 25 3 4 0; ! #X connect 25 4 26 4; ! #X connect 26 0 17 0; #X restore 244 115 pd get-masses; #N canvas 0 0 768 708 make-links 0; --- 119,164 ---- #X connect 11 0 0 0; #X restore 244 196 pd fix-links; ! #N canvas 236 8 602 856 get-masses 0; ! #X obj 148 80 t b b b b b b b; ! #X msg 184 176 traverse pd-data \, next; ! #X msg 135 280 next; ! #X obj 184 206 pointer mass; ! #X obj 325 385 select 0; ! #X msg 365 410 0; ! #X msg 324 409 1; ! #X obj 248 111 s \$0-reset-counter; ! #X msg 248 131 const 0; ! #X obj 248 152 s \$0-mid; ! #X obj 310 152 s \$0-msdid; ! #X text 44 397 At end: start 2nd pass; ! #X obj 148 31 inlet; ! #X obj 214 494 outlet; ! #X obj 81 435 outlet; ! #X obj 214 362 get mass x y mid mob M; ! #X obj 214 444 pack 0 0 0 0 0; ! #X obj 184 255 t b p; #X connect 0 5 1 0; #X connect 0 6 7 0; ! #X connect 0 6 8 0; #X connect 1 0 3 0; #X connect 2 0 3 0; ! #X connect 3 0 17 0; #X connect 3 1 2 0; ! #X connect 3 2 14 0; #X connect 4 0 6 0; #X connect 4 1 5 0; ! #X connect 5 0 16 3; ! #X connect 6 0 16 3; ! #X connect 8 0 9 0; #X connect 8 0 10 0; ! #X connect 12 0 0 0; ! #X connect 15 0 16 0; ! #X connect 15 1 16 1; ! #X connect 15 2 16 2; ! #X connect 15 3 4 0; ! #X connect 15 4 16 4; ! #X connect 16 0 13 0; ! #X connect 17 0 2 0; ! #X connect 17 1 15 0; #X restore 244 115 pd get-masses; #N canvas 0 0 768 708 make-links 0; *************** *** 217,225 **** #X connect 9 0 4 0; #X restore 148 257 pd make-links; ! #X text 569 416 TABLES USED:; ! #X text 610 458 ordered mass ids; ! #X text 611 484 mass id as index \, msdid as value; ! #X text 354 111 First get masses positions \, send to msd2D \, store ! in table mid; #X text 364 174 Change DS mass ids to match msdIds \, store mid2msdid mapping; --- 188,192 ---- #X connect 9 0 4 0; #X restore 148 257 pd make-links; ! #X text 284 418 TABLES USED:; #X text 364 174 Change DS mass ids to match msdIds \, store mid2msdid mapping; *************** *** 269,274 **** #X restore 148 322 pd set-lid; #X text 238 322 Correct lids to match what msd2D tells us; ! #X obj 475 458 table \$0-mid 4000; ! #X obj 433 484 table \$0-mid2msdid 4000; #X connect 0 0 6 0; #X connect 4 0 5 0; --- 236,243 ---- #X restore 148 322 pd set-lid; #X text 238 322 Correct lids to match what msd2D tells us; ! #X obj 146 446 table \$0-mid2msdid 4000; ! #X text 354 111 First get masses positions \, send to msd2D; ! #X text 324 446 mass id as index \, msdid as value. Size 4000 taken ! from the #define in msd sources.; #X connect 0 0 6 0; #X connect 4 0 5 0; *************** *** 276,280 **** #X connect 6 0 4 0; #X connect 6 1 1 0; ! #X connect 7 0 15 0; #X connect 7 1 3 0; #X restore 131 221 pd getter; --- 245,249 ---- #X connect 6 0 4 0; #X connect 6 1 1 0; ! #X connect 7 0 12 0; #X connect 7 1 3 0; #X restore 131 221 pd getter; *************** *** 282,286 **** #X msg 175 154 reset; #X obj 175 200 s \$0-msd; - #X msg 368 473 mass fix 0 100 \$1 \$2; #X obj 112 132 t b b b b; #N canvas 376 279 682 601 make-setters 0; --- 251,254 ---- *************** *** 337,352 **** #X msg 189 275 mass id \$4 \$5 \$1 \$2; #X msg 175 177 Xmin 0 \, Xmax 1200 \, Ymin 0 \, Ymax 800; ! #X connect 0 0 9 0; ! #X connect 0 1 10 0; #X connect 2 0 3 0; ! #X connect 5 0 6 0; ! #X connect 5 1 0 0; ! #X connect 5 2 11 0; ! #X connect 5 3 2 0; ! #X connect 7 0 1 0; ! #X connect 8 0 5 0; #X connect 9 0 1 0; ! #X connect 10 0 1 0; ! #X connect 11 0 3 0; #X restore 62 337 pd generator; #N canvas 0 0 718 819 activate 0; --- 305,320 ---- #X msg 189 275 mass id \$4 \$5 \$1 \$2; #X msg 175 177 Xmin 0 \, Xmax 1200 \, Ymin 0 \, Ymax 800; ! #X connect 0 0 8 0; ! #X connect 0 1 9 0; #X connect 2 0 3 0; ! #X connect 4 0 5 0; ! #X connect 4 1 0 0; ! #X connect 4 2 10 0; ! #X connect 4 3 2 0; ! #X connect 6 0 1 0; ! #X connect 7 0 4 0; ! #X connect 8 0 1 0; #X connect 9 0 1 0; ! #X connect 10 0 3 0; #X restore 62 337 pd generator; #N canvas 0 0 718 819 activate 0; *************** *** 455,523 **** #X obj 147 210 r \$0-msd-out; #N canvas 0 0 578 686 setter 0; ! #X obj 930 100 mass-set 31; ! #X obj 900 100 mass-set 30; ! #X obj 870 100 mass-set 29; ! #X obj 840 100 mass-set 28; ! #X obj 810 100 mass-set 27; ! #X obj 780 100 mass-set 26; ! #X obj 750 100 mass-set 25; ! #X obj 720 100 mass-set 24; ! #X obj 690 100 mass-set 23; ! #X obj 660 100 mass-set 22; ! #X obj 630 100 mass-set 21; ! #X obj 600 100 mass-set 20; ! #X obj 570 100 mass-set 19; ! #X obj 540 100 mass-set 18; ! #X obj 510 100 mass-set 17; ! #X obj 480 100 mass-set 16; ! #X obj 450 100 mass-set 15; ! #X obj 420 100 mass-set 14; ! #X obj 390 100 mass-set 13; ! #X obj 360 100 mass-set 12; ! #X obj 330 100 mass-set 11; ! #X obj 300 100 mass-set 10; ! #X obj 270 100 mass-set 9; ! #X obj 240 100 mass-set 8; ! #X obj 210 100 mass-set 7; ! #X obj 180 100 mass-set 6; ! #X obj 150 100 mass-set 5; ! #X obj 120 100 mass-set 4; ! #X obj 90 100 mass-set 3; ! #X obj 60 100 mass-set 2; ! #X obj 30 100 mass-set 1; ! #X obj 0 100 mass-set 0; #X restore 305 122 pd setter; #N canvas 0 0 822 675 lsetter 0; ! #X obj 0 100 link-set 15; ! #X obj 30 100 link-set 23; ! #X obj 60 100 link-set 7; ! #X obj 90 100 link-set 27; ! #X obj 120 100 link-set 11; ! #X obj 150 100 link-set 19; ! #X obj 180 100 link-set 3; ! #X obj 210 100 link-set 29; ! #X obj 240 100 link-set 13; ! #X obj 270 100 link-set 21; ! #X obj 300 100 link-set 5; ! #X obj 330 100 link-set 25; ! #X obj 360 100 link-set 9; ! #X obj 390 100 link-set 17; ! #X obj 420 100 link-set 1; ! #X obj 450 100 link-set 30; ! #X obj 480 100 link-set 14; ! #X obj 510 100 link-set 22; ! #X obj 540 100 link-set 6; ! #X obj 570 100 link-set 26; ! #X obj 600 100 link-set 10; ! #X obj 630 100 link-set 18; ! #X obj 660 100 link-set 2; ! #X obj 690 100 link-set 28; ! #X obj 720 100 link-set 12; ! #X obj 750 100 link-set 20; ! #X obj 780 100 link-set 4; ! #X obj 810 100 link-set 24; ! #X obj 840 100 link-set 8; ! #X obj 870 100 link-set 16; ! #X obj 900 100 link-set 0; #X restore 304 145 pd lsetter; #X text 288 98 Automatic scripting targets; --- 423,485 ---- #X obj 147 210 r \$0-msd-out; #N canvas 0 0 578 686 setter 0; ! #X obj 61 100 mass-set 10; ! #X obj 103 72 mass-set 9; ! #X obj 77 103 mass-set 8; ! #X obj 69 38 mass-set 7; ! #X obj 39 30 mass-set 6; ! #X obj 57 40 mass-set 5; ! #X obj 57 66 mass-set 4; ! #X obj 26 38 mass-set 3; ! #X obj 52 99 mass-set 2; ! #X obj 47 118 mass-set 1; ! #X obj 158 166 mass-set 0; #X restore 305 122 pd setter; #N canvas 0 0 822 675 lsetter 0; ! #X obj 47 118 link-set 31; ! #X obj 47 118 link-set 15; ! #X obj 47 118 link-set 23; ! #X obj 47 118 link-set 39; ! #X obj 47 118 link-set 7; ! #X obj 47 118 link-set 27; ! #X obj 47 118 link-set 43; ! #X obj 47 118 link-set 11; ! #X obj 47 118 link-set 19; ! #X obj 52 99 link-set 35; ! #X obj 52 99 link-set 3; ! #X obj 52 99 link-set 29; ! #X obj 52 99 link-set 45; ! #X obj 52 99 link-set 13; ! #X obj 52 99 link-set 21; ! #X obj 52 99 link-set 37; ! #X obj 52 99 link-set 5; ! #X obj 26 38 link-set 25; ! #X obj 26 38 link-set 41; ! #X obj 26 38 link-set 9; ! #X obj 26 38 link-set 17; ! #X obj 26 38 link-set 33; ! #X obj 26 38 link-set 1; ! #X obj 26 38 link-set 30; ! #X obj 57 66 link-set 14; ! #X obj 57 66 link-set 22; ! #X obj 57 66 link-set 38; ! #X obj 57 66 link-set 6; ! #X obj 57 66 link-set 26; ! #X obj 57 66 link-set 42; ! #X obj 57 40 link-set 10; ! #X obj 57 40 link-set 18; ! #X obj 57 40 link-set 34; ! #X obj 57 40 link-set 2; ! #X obj 57 40 link-set 28; ! #X obj 39 30 link-set 44; ! #X obj 39 30 link-set 12; ! #X obj 39 30 link-set 20; ! #X obj 39 30 link-set 36; ! #X obj 69 38 link-set 4; ! #X obj 69 38 link-set 24; ! #X obj 69 38 link-set 40; ! #X obj 77 103 link-set 8; ! #X obj 77 103 link-set 16; ! #X obj 103 72 link-set 32; ! #X obj 158 166 link-set 0; #X restore 304 145 pd lsetter; #X text 288 98 Automatic scripting targets; *************** *** 525,529 **** wrong.; #X obj 269 233 spigot; ! #X obj 306 180 tgl 15 0 empty empty debug 0 -6 0 8 -262144 -1 -1 1 1; #X obj 269 206 r \$0-msd-attr; --- 487,491 ---- wrong.; #X obj 269 233 spigot; ! #X obj 306 180 tgl 15 0 empty empty debug 0 -6 0 8 -262144 -1 -1 0 1; #X obj 269 206 r \$0-msd-attr;

1 0

externals/nusmuk/msd2D/editor scale4gem.pd,NONE,1.1
by Frank Barknecht 03 May '05

03 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17217 Added Files: scale4gem.pd Log Message: missing abstraction --- NEW FILE: scale4gem.pd --- #N canvas 0 0 458 426 10; #X obj 231 131 * 0.0066666; #X text 325 132 == [/ 150]; #X obj 200 184 * -0.0066666; #X obj 169 232 * 0.0066666; #X obj 169 331 outlet; #X obj 200 204 outlet; #X obj 231 153 outlet; #X obj 169 27 inlet; #X text 265 245 out: scaled for gemwin; #X text 198 11 x y z; #X obj 200 59 inlet; #X obj 231 91 inlet; #X obj 169 287 - 3; #X text 203 288 shift left \, found empirically; #X connect 0 0 6 0; #X connect 2 0 5 0; #X connect 3 0 12 0; #X connect 7 0 3 0; #X connect 10 0 2 0; #X connect 11 0 0 0; #X connect 12 0 4 0;

1 0

externals/nusmuk/msd2D/editor gem_links.pd, 1.2, 1.3 gem_masses.pd, 1.2, 1.3 msd2d-editor.pd, 1.5, 1.6
by Frank Barknecht 03 May '05

03 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16978 Modified Files: gem_links.pd gem_masses.pd msd2d-editor.pd Log Message: Made compatible with latest changes in msd2D again. Index: msd2d-editor.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/msd2d-editor.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** msd2d-editor.pd 2 May 2005 10:36:10 -0000 1.5 --- msd2d-editor.pd 3 May 2005 16:33:44 -0000 1.6 *************** *** 1,7 **** ! #N canvas 130 52 866 562 10; ! #N canvas 610 84 617 552 data 1; #X restore 735 71 pd data; #X obj 56 517 structures; - #X msg 152 72 \; pd-data clear; #X obj 62 308 bng 24 250 50 0 empty \$0-generate generate 0 -6 0 8 -24198 -1 -1; --- 1,6 ---- ! #N canvas 84 270 866 562 10; ! #N canvas 610 84 617 552 data 0; #X restore 735 71 pd data; #X obj 56 517 structures; #X obj 62 308 bng 24 250 50 0 empty \$0-generate generate 0 -6 0 8 -24198 -1 -1; *************** *** 12,16 **** #X obj 4 17 bng 20 250 50 0 empty empty load 0 -6 0 8 -258699 -1 -1 ; ! #X obj 62 17 bng 20 250 50 0 empty empty save_as 0 -6 0 8 -24198 -1 -1; #X obj 101 60 savepanel; --- 11,15 ---- #X obj 4 17 bng 20 250 50 0 empty empty load 0 -6 0 8 -258699 -1 -1 ; ! #X obj 34 17 bng 20 250 50 0 empty empty saveas 0 -6 0 8 -24198 -1 -1; #X obj 101 60 savepanel; *************** *** 21,25 **** #X obj 20 138 t b a; #X obj 20 195 s \$0-generate; ! #X obj 33 17 bng 20 250 50 0 empty empty save 0 -6 0 8 -241291 -1 -1 ; #X obj 100 91 symbol; --- 20,24 ---- #X obj 20 138 t b a; #X obj 20 195 s \$0-generate; ! #X obj 79 17 bng 20 250 50 0 empty empty save 0 -6 0 8 -241291 -1 -1 ; #X obj 100 91 symbol; *************** *** 39,48 **** #X text 728 46 Edit here:; #N canvas 257 131 781 748 generator 0; ! #N canvas 210 99 931 555 getter 0; #X obj 244 89 inlet; ! #X obj 244 141 outlet; #X text 91 57 First build masses \, then links!!; ! #X obj 148 281 outlet; ! #N canvas 403 15 685 826 fix-mass-ids 0; #X obj 139 158 t b b b b b b b; #X msg 175 254 traverse pd-data \, next; --- 38,47 ---- #X text 728 46 Edit here:; #N canvas 257 131 781 748 generator 0; ! #N canvas 311 93 931 555 getter 0; #X obj 244 89 inlet; ! #X obj 330 145 outlet; #X text 91 57 First build masses \, then links!!; ! #X obj 234 285 outlet; ! #N canvas 571 1 685 826 fix-mass-ids 0; #X obj 139 158 t b b b b b b b; #X msg 175 254 traverse pd-data \, next; *************** *** 64,68 **** #X connect 5 0 0 0; #X restore 192 384 pd counter; - #X obj 192 420 tabread \$0-msdid; #X obj 192 482 set mass mid; #X text 272 286 At end: fix links!; --- 63,66 ---- *************** *** 79,96 **** #X connect 1 0 3 0; #X connect 2 0 3 0; ! #X connect 3 0 10 0; #X connect 3 1 2 0; ! #X connect 3 2 15 0; #X connect 5 0 6 0; ! #X connect 6 0 7 0; ! #X connect 6 0 11 0; ! #X connect 9 0 11 1; ! #X connect 10 0 2 0; ! #X connect 10 1 5 0; ! #X connect 10 4 9 0; ! #X connect 10 5 7 1; ! #X connect 11 0 12 0; ! #X connect 14 0 0 0; ! #X restore 330 177 pd fix-mass-ids; #N canvas 403 15 685 826 fix-links 0; #X obj 139 158 t b b b b b b b; --- 77,93 ---- #X connect 1 0 3 0; #X connect 2 0 3 0; ! #X connect 3 0 9 0; #X connect 3 1 2 0; ! #X connect 3 2 14 0; ! #X connect 5 0 10 0; #X connect 5 0 6 0; ! #X connect 8 0 10 1; ! #X connect 9 0 2 0; ! #X connect 9 1 5 0; ! #X connect 9 4 8 0; ! #X connect 9 5 6 1; ! #X connect 10 0 11 0; ! #X connect 13 0 0 0; ! #X restore 244 173 pd fix-mass-ids; #N canvas 403 15 685 826 fix-links 0; #X obj 139 158 t b b b b b b b; *************** *** 121,125 **** #X connect 10 5 7 2; #X connect 11 0 0 0; ! #X restore 330 200 pd fix-links; #N canvas 0 0 920 707 get-masses 0; #X obj 228 162 t b b b b b b b; --- 118,122 ---- #X connect 10 5 7 2; #X connect 11 0 0 0; ! #X restore 244 196 pd fix-links; #N canvas 0 0 920 707 get-masses 0; #X obj 228 162 t b b b b b b b; *************** *** 151,155 **** #X obj 328 234 s \$0-mid; #X obj 390 234 s \$0-msdid; ! #X text 575 330 At end: start 2nd pass; #X obj 228 113 inlet; #X obj 347 564 outlet; --- 148,152 ---- #X obj 328 234 s \$0-mid; #X obj 390 234 s \$0-msdid; ! #X text 124 479 At end: start 2nd pass; #X obj 228 113 inlet; #X obj 347 564 outlet; *************** *** 160,164 **** #X text 598 515 Write old mids to table; #X obj 605 640 print mass-as-in-struct; ! #X obj 612 368 outlet; #X obj 347 432 get mass x y mid mob M; #X obj 347 514 pack 0 0 0 0 0; --- 157,161 ---- #X text 598 515 Write old mids to table; #X obj 605 640 print mass-as-in-struct; ! #X obj 161 517 outlet; #X obj 347 432 get mass x y mid mob M; #X obj 347 514 pack 0 0 0 0 0; *************** *** 195,208 **** #X restore 244 115 pd get-masses; #N canvas 0 0 768 708 make-links 0; ! #X obj 156 229 pointer liaison; ! #X msg 156 203 next; ! #X msg 194 204 traverse pd-data \, bang; ! #X obj 126 251 t b p; ! #X obj 174 351 outlet; ! #X obj 194 147 inlet; ! #X obj 388 303 outlet; ! #X text 440 302 Now set lid field of links.; ! #X obj 156 275 get liaison mid1 mid2 K D D2; ! #X obj 174 318 pack 0 0 0 0 0; #X connect 0 0 3 0; #X connect 0 1 1 0; --- 192,205 ---- #X restore 244 115 pd get-masses; #N canvas 0 0 768 708 make-links 0; ! #X obj 316 252 pointer liaison; ! #X msg 316 226 next; ! #X msg 354 227 traverse pd-data \, bang; ! #X obj 286 274 t b p; ! #X obj 334 374 outlet; ! #X obj 354 170 inlet; ! #X obj 192 389 outlet; ! #X text 142 412 Now set lid field of links.; ! #X obj 316 298 get liaison mid1 mid2 K D D2; ! #X obj 334 341 pack 0 0 0 0 0; #X connect 0 0 3 0; #X connect 0 1 1 0; *************** *** 220,283 **** #X connect 9 0 4 0; #X restore 148 257 pd make-links; - #N canvas 0 0 590 588 get-ids-from-msd 0; - #X obj 176 209 r \$0-msd-attr; - #X msg 287 189 infosL; - #X obj 176 277 route Mass; - #N canvas 331 520 708 349 counter 0; - #X obj 156 125 f 0; - #X msg 172 102 0; - #X obj 172 74 r \$0-reset-counter; - #X obj 188 125 + 1; - #X obj 156 179 outlet; - #X obj 156 50 inlet; - #X connect 0 0 3 0; - #X connect 0 0 4 0; - #X connect 1 0 0 1; - #X connect 2 0 1 0; - #X connect 3 0 0 1; - #X connect 5 0 0 0; - #X restore 206 324 pd counter; - #X obj 176 301 t a b; - #X obj 287 233 s \$0-msd; - #X obj 176 249 spigot; - #X msg 347 187 1; - #X msg 237 185 0; - #X obj 176 350 pack 0 0; - #X obj 176 374 tabwrite \$0-msdid; - #X obj 176 412 print mass-as-in-msd; - #X msg 176 325 \$1; - #X obj 239 151 t b b b b; - #X obj 239 120 inlet; - #X obj 94 208 outlet; - #X text 71 167 Then fix mass ids; - #X connect 0 0 6 0; - #X connect 1 0 5 0; - #X connect 2 0 4 0; - #X connect 3 0 9 1; - #X connect 4 0 12 0; - #X connect 4 1 3 0; - #X connect 6 0 2 0; - #X connect 7 0 6 1; - #X connect 8 0 6 1; - #X connect 9 0 10 0; - #X connect 9 0 11 0; - #X connect 12 0 9 0; - #X connect 13 0 15 0; - #X connect 13 1 8 0; - #X connect 13 2 1 0; - #X connect 13 3 7 0; - #X connect 14 0 13 0; - #X restore 330 151 pd get-ids-from-msd; #X text 569 416 TABLES USED:; ! #X text 639 457 ordered mass ids; ! #X text 639 481 ordered mass ids as in [msd*]; ! #X text 639 510 mass id as index \, msdid as value; #X text 354 111 First get masses positions \, send to msd2D \, store in table mid; ! #X text 482 152 Then get numercial ids from msd2D \, store in table ! msdid; ! #X text 484 174 Change DS mass ids to match msdIds \, store mid2msdid mapping; ! #X text 480 200 Fix mid1 and mid2 in links to match what msd2D thinks is right.; #X text 257 258 Create messages to msd2D to create links; --- 217,228 ---- #X connect 9 0 4 0; #X restore 148 257 pd make-links; #X text 569 416 TABLES USED:; ! #X text 610 458 ordered mass ids; ! #X text 611 484 mass id as index \, msdid as value; #X text 354 111 First get masses positions \, send to msd2D \, store in table mid; ! #X text 364 174 Change DS mass ids to match msdIds \, store mid2msdid mapping; ! #X text 366 196 Fix mid1 and mid2 in links to match what msd2D thinks is right.; #X text 257 258 Create messages to msd2D to create links; *************** *** 322,343 **** #X connect 12 1 15 0; #X connect 15 0 16 0; ! #X restore 234 286 pd set-lid; ! #X text 314 284 Correct lids to match what msd2D tells us; #X obj 475 458 table \$0-mid 4000; ! #X obj 459 484 table \$0-msdid 4000; ! #X obj 433 512 table \$0-mid2msdid 4000; #X connect 0 0 6 0; #X connect 4 0 5 0; #X connect 5 0 7 0; ! #X connect 6 0 1 0; ! #X connect 6 1 8 0; ! #X connect 7 0 3 0; ! #X connect 7 1 18 0; ! #X connect 8 0 4 0; #X restore 131 221 pd getter; #X obj 131 369 s \$0-msd; #X msg 175 154 reset; #X obj 175 200 s \$0-msd; - #X msg 175 175 Xmin 0 \, Xmax 800 \, Ymin 0 \, Ymax 800; #X msg 368 473 mass fix 0 100 \$1 \$2; #X obj 112 132 t b b b b; --- 267,285 ---- #X connect 12 1 15 0; #X connect 15 0 16 0; ! #X restore 148 322 pd set-lid; ! #X text 238 322 Correct lids to match what msd2D tells us; #X obj 475 458 table \$0-mid 4000; ! #X obj 433 484 table \$0-mid2msdid 4000; #X connect 0 0 6 0; #X connect 4 0 5 0; #X connect 5 0 7 0; ! #X connect 6 0 4 0; ! #X connect 6 1 1 0; ! #X connect 7 0 15 0; ! #X connect 7 1 3 0; #X restore 131 221 pd getter; #X obj 131 369 s \$0-msd; #X msg 175 154 reset; #X obj 175 200 s \$0-msd; #X msg 368 473 mass fix 0 100 \$1 \$2; #X obj 112 132 t b b b b; *************** *** 394,409 **** #X msg 131 324 link ml \$1 \$2 \$3 \$4 \$5; #X msg 189 275 mass id \$4 \$5 \$1 \$2; ! #X connect 0 0 10 0; ! #X connect 0 1 11 0; #X connect 2 0 3 0; ! #X connect 4 0 3 0; ! #X connect 6 0 7 0; ! #X connect 6 1 0 0; ! #X connect 6 2 4 0; ! #X connect 6 3 2 0; ! #X connect 8 0 1 0; ! #X connect 9 0 6 0; #X connect 10 0 1 0; ! #X connect 11 0 1 0; #X restore 62 337 pd generator; #N canvas 0 0 718 819 activate 0; --- 336,352 ---- #X msg 131 324 link ml \$1 \$2 \$3 \$4 \$5; #X msg 189 275 mass id \$4 \$5 \$1 \$2; ! #X msg 175 177 Xmin 0 \, Xmax 1200 \, Ymin 0 \, Ymax 800; ! #X connect 0 0 9 0; ! #X connect 0 1 10 0; #X connect 2 0 3 0; ! #X connect 5 0 6 0; ! #X connect 5 1 0 0; ! #X connect 5 2 11 0; ! #X connect 5 3 2 0; ! #X connect 7 0 1 0; ! #X connect 8 0 5 0; ! #X connect 9 0 1 0; #X connect 10 0 1 0; ! #X connect 11 0 3 0; #X restore 62 337 pd generator; #N canvas 0 0 718 819 activate 0; *************** *** 418,422 **** #X obj 233 396 route massesPos linksPos; #X obj 139 498 gemwin; - #X msg 139 447 create \, 1; #X msg 139 471 0 \, destroy; #X msg 315 233 forceX id 200; --- 361,364 ---- *************** *** 451,497 **** #X obj 413 395 r \$0-gem-masses-on; #X obj 413 417 r \$0-gem-links-on; #X connect 0 0 8 0; ! #X connect 0 0 13 0; ! #X connect 0 1 16 0; #X connect 1 0 0 0; #X connect 2 0 0 0; #X connect 3 0 0 0; #X connect 6 0 0 0; ! #X connect 7 0 23 0; ! #X connect 8 0 17 0; ! #X connect 8 0 20 0; ! #X connect 8 1 18 0; ! #X connect 8 1 21 0; #X connect 10 0 9 0; ! #X connect 11 0 9 0; ! #X connect 12 0 0 0; ! #X connect 14 0 10 0; ! #X connect 14 1 11 0; ! #X connect 15 0 14 0; ! #X connect 15 0 20 1; ! #X connect 15 0 21 1; ! #X connect 15 0 35 0; ! #X connect 19 0 34 0; ! #X connect 19 0 38 0; ! #X connect 20 0 4 0; ! #X connect 21 0 5 0; ! #X connect 23 0 6 0; ! #X connect 23 1 24 0; ! #X connect 25 0 33 0; ! #X connect 26 0 30 0; ! #X connect 27 0 38 1; ! #X connect 28 0 29 0; ! #X connect 29 0 19 0; ! #X connect 30 0 15 0; ! #X connect 30 1 28 0; ! #X connect 31 0 32 0; ! #X connect 32 0 15 0; ! #X connect 33 0 19 0; ! #X connect 33 1 31 0; #X connect 34 0 36 0; ! #X connect 35 0 37 0; ! #X connect 38 0 23 0; ! #X connect 39 0 4 1; ! #X connect 40 0 5 1; #X restore 61 414 pd activate; #X obj 61 378 tgl 24 0 empty empty GEM 0 -6 0 8 -233017 -1 -1 0 1; --- 393,440 ---- #X obj 413 395 r \$0-gem-masses-on; #X obj 413 417 r \$0-gem-links-on; + #X msg 139 447 reset \, create \, 1; #X connect 0 0 8 0; ! #X connect 0 0 12 0; ! #X connect 0 1 15 0; #X connect 1 0 0 0; #X connect 2 0 0 0; #X connect 3 0 0 0; #X connect 6 0 0 0; ! #X connect 7 0 22 0; ! #X connect 8 0 16 0; ! #X connect 8 0 19 0; ! #X connect 8 1 17 0; ! #X connect 8 1 20 0; #X connect 10 0 9 0; ! #X connect 11 0 0 0; ! #X connect 13 0 40 0; ! #X connect 13 1 10 0; ! #X connect 14 0 13 0; ! #X connect 14 0 19 1; ! #X connect 14 0 20 1; ! #X connect 14 0 34 0; ! #X connect 18 0 33 0; ! #X connect 18 0 37 0; ! #X connect 19 0 4 0; ! #X connect 20 0 5 0; ! #X connect 22 0 6 0; ! #X connect 22 1 23 0; ! #X connect 24 0 32 0; ! #X connect 25 0 29 0; ! #X connect 26 0 37 1; ! #X connect 27 0 28 0; ! #X connect 28 0 18 0; ! #X connect 29 0 14 0; ! #X connect 29 1 27 0; ! #X connect 30 0 31 0; ! #X connect 31 0 14 0; ! #X connect 32 0 18 0; ! #X connect 32 1 30 0; ! #X connect 33 0 35 0; #X connect 34 0 36 0; ! #X connect 37 0 22 0; ! #X connect 38 0 4 1; ! #X connect 39 0 5 1; ! #X connect 40 0 9 0; #X restore 61 414 pd activate; #X obj 61 378 tgl 24 0 empty empty GEM 0 -6 0 8 -233017 -1 -1 0 1; *************** *** 500,565 **** #X text 275 306 Press "generate" to generate messages to msd2D and create the physical model inside.; ! #N canvas 0 0 751 433 ignore 0; ! #X obj 102 264 print ToMSD; ! #X obj 102 234 spigot; ! #X obj 139 181 tgl 15 0 empty empty debug 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X obj 102 207 r \$0-msd; ! #X obj 281 239 spigot; ! #X obj 318 186 tgl 15 0 empty empty debug 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 281 267 print FromMSD; ! #X obj 281 212 r \$0-msd-out; #N canvas 0 0 578 686 setter 0; ! #X obj 137 196 mass-set 12; ! #X obj 164 167 mass-set 11; ! #X obj 133 167 mass-set 10; ! #X obj 160 196 mass-set 9; ! #X obj 215 220 mass-set 8; ! #X obj 82 220 mass-set 7; ! #X obj 175 187 mass-set 6; ! #X obj 122 187 mass-set 5; ! #X obj 173 235 mass-set 4; ! #X obj 124 235 mass-set 3; ! #X obj 184 300 mass-set 2; ! #X obj 113 300 mass-set 1; ! #X obj 149 100 mass-set 0; #X restore 305 122 pd setter; #N canvas 0 0 822 675 lsetter 0; ! #X obj 133 167 link-set 23; ! #X obj 160 196 link-set 22; ! #X obj 164 167 link-set 21; ! #X obj 137 196 link-set 20; ! #X obj 133 167 link-set 19; ! #X obj 133 167 link-set 18; ! #X obj 124 235 link-set 17; ! #X obj 175 187 link-set 16; ! #X obj 173 235 link-set 15; ! #X obj 122 187 link-set 14; ! #X obj 124 235 link-set 13; ! #X obj 175 187 link-set 12; ! #X obj 122 187 link-set 11; ! #X obj 82 220 link-set 10; ! #X obj 175 187 link-set 9; ! #X obj 215 220 link-set 8; ! #X obj 113 300 link-set 7; ! #X obj 113 300 link-set 6; ! #X obj 184 300 link-set 5; ! #X obj 173 235 link-set 4; ! #X obj 149 100 link-set 3; ! #X obj 164 167 link-set 2; ! #X obj 122 187 link-set 1; ! #X obj 160 196 link-set 0; #X restore 304 145 pd lsetter; #X text 288 98 Automatic scripting targets; #X text 65 66 You can ignore this stuff here \, unless something goes wrong.; ! #X obj 407 239 spigot; ! #X obj 444 186 tgl 15 0 empty empty debug 0 -6 0 8 -262144 -1 -1 1 1; ! #X obj 407 212 r \$0-msd-attr; ! #X obj 407 270 print AttrMSD; #X obj 532 270 s \$0-msd; #X msg 532 249 infosL; #X connect 1 0 0 0; #X connect 2 0 1 1; --- 443,549 ---- #X text 275 306 Press "generate" to generate messages to msd2D and create the physical model inside.; ! #N canvas 334 329 751 433 ignore 0; ! #X obj 46 264 print ToMSD; ! #X obj 46 234 spigot; ! #X obj 83 181 tgl 15 0 empty empty debug 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X obj 46 207 r \$0-msd; ! #X obj 147 237 spigot; ! #X obj 184 184 tgl 15 0 empty empty debug 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 147 265 print FromMSD; ! #X obj 147 210 r \$0-msd-out; #N canvas 0 0 578 686 setter 0; ! #X obj 930 100 mass-set 31; ! #X obj 900 100 mass-set 30; ! #X obj 870 100 mass-set 29; ! #X obj 840 100 mass-set 28; ! #X obj 810 100 mass-set 27; ! #X obj 780 100 mass-set 26; ! #X obj 750 100 mass-set 25; ! #X obj 720 100 mass-set 24; ! #X obj 690 100 mass-set 23; ! #X obj 660 100 mass-set 22; ! #X obj 630 100 mass-set 21; ! #X obj 600 100 mass-set 20; ! #X obj 570 100 mass-set 19; ! #X obj 540 100 mass-set 18; ! #X obj 510 100 mass-set 17; ! #X obj 480 100 mass-set 16; ! #X obj 450 100 mass-set 15; ! #X obj 420 100 mass-set 14; ! #X obj 390 100 mass-set 13; ! #X obj 360 100 mass-set 12; ! #X obj 330 100 mass-set 11; ! #X obj 300 100 mass-set 10; ! #X obj 270 100 mass-set 9; ! #X obj 240 100 mass-set 8; ! #X obj 210 100 mass-set 7; ! #X obj 180 100 mass-set 6; ! #X obj 150 100 mass-set 5; ! #X obj 120 100 mass-set 4; ! #X obj 90 100 mass-set 3; ! #X obj 60 100 mass-set 2; ! #X obj 30 100 mass-set 1; ! #X obj 0 100 mass-set 0; #X restore 305 122 pd setter; #N canvas 0 0 822 675 lsetter 0; ! #X obj 0 100 link-set 15; ! #X obj 30 100 link-set 23; ! #X obj 60 100 link-set 7; ! #X obj 90 100 link-set 27; ! #X obj 120 100 link-set 11; ! #X obj 150 100 link-set 19; ! #X obj 180 100 link-set 3; ! #X obj 210 100 link-set 29; ! #X obj 240 100 link-set 13; ! #X obj 270 100 link-set 21; ! #X obj 300 100 link-set 5; ! #X obj 330 100 link-set 25; ! #X obj 360 100 link-set 9; ! #X obj 390 100 link-set 17; ! #X obj 420 100 link-set 1; ! #X obj 450 100 link-set 30; ! #X obj 480 100 link-set 14; ! #X obj 510 100 link-set 22; ! #X obj 540 100 link-set 6; ! #X obj 570 100 link-set 26; ! #X obj 600 100 link-set 10; ! #X obj 630 100 link-set 18; ! #X obj 660 100 link-set 2; ! #X obj 690 100 link-set 28; ! #X obj 720 100 link-set 12; ! #X obj 750 100 link-set 20; ! #X obj 780 100 link-set 4; ! #X obj 810 100 link-set 24; ! #X obj 840 100 link-set 8; ! #X obj 870 100 link-set 16; ! #X obj 900 100 link-set 0; #X restore 304 145 pd lsetter; #X text 288 98 Automatic scripting targets; #X text 65 66 You can ignore this stuff here \, unless something goes wrong.; ! #X obj 269 233 spigot; ! #X obj 306 180 tgl 15 0 empty empty debug 0 -6 0 8 -262144 -1 -1 1 1; ! #X obj 269 206 r \$0-msd-attr; ! #X obj 269 264 print AttrMSD; #X obj 532 270 s \$0-msd; #X msg 532 249 infosL; + #X obj 143 363 spigot; + #X obj 180 310 tgl 15 0 empty empty global-send 0 -6 0 8 -262144 -1 + -1 0 1; + #X obj 143 336 r \$0-msd-out; + #X obj 143 391 s MSD-OUT-GLOBAL; + #X msg 532 223 massesPosL; + #X obj 532 199 metro 40; + #X obj 532 177 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 + 1; + #X floatatom 585 178 5 0 0 0 - - -; + #X obj 280 365 spigot; + #X obj 317 312 tgl 15 0 empty empty global-receive 0 -6 0 8 -262144 + -1 -1 0 1; + #X obj 280 338 r MSD-IN-GLOBAL; + #X obj 280 393 s \$0-msd; #X connect 1 0 0 0; #X connect 2 0 1 1; *************** *** 572,575 **** --- 556,569 ---- #X connect 14 0 12 0; #X connect 17 0 16 0; + #X connect 18 0 21 0; + #X connect 19 0 18 1; + #X connect 20 0 18 0; + #X connect 22 0 16 0; + #X connect 23 0 22 0; + #X connect 24 0 23 0; + #X connect 25 0 23 1; + #X connect 26 0 29 0; + #X connect 27 0 26 1; + #X connect 28 0 26 0; #X restore 149 517 pd ignore this; #X floatatom 133 385 5 10 1000 1 frequency - -; *************** *** 582,603 **** select more than two masses \, then all possible links between those masses will get created. Use this to mass-connect masses. :); ! #N canvas 0 0 526 412 forces 0; ! #X obj 183 333 s \$0-msd; ! #X obj 282 273 hsl 128 24 -500 500 0 1 empty empty empty -2 -6 0 8 -262144 -1 -1 6350 1; ! #X obj 183 148 vsl 24 128 -500 500 0 1 empty empty empty 0 -8 0 8 -262144 -1 -1 6350 1; ! #X msg 183 306 forceY id \$1; ! #X msg 279 306 forceX id \$1; ! #X obj 183 284 * -1; ! #X obj 183 92 tgl 24 0 empty empty constant? 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 279 213 tgl 24 0 empty empty constant? 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 183 123 metro 10; ! #X obj 279 244 metro 10; ! #X msg 343 243 0; ! #X msg 151 122 0; ! #X text 118 45 Add some forces to the system.; #X connect 1 0 4 0; #X connect 2 0 5 0; --- 576,616 ---- select more than two masses \, then all possible links between those masses will get created. Use this to mass-connect masses. :); ! #N canvas 705 166 576 613 forces 0; ! #X obj 295 415 s \$0-msd; ! #X obj 394 355 hsl 128 24 -500 500 0 1 empty empty empty -2 -6 0 8 -262144 -1 -1 6350 1; ! #X obj 295 230 vsl 24 128 -500 500 0 1 empty empty empty 0 -8 0 8 -262144 -1 -1 6350 1; ! #X msg 295 388 forceY id \$1; ! #X msg 391 388 forceX id \$1; ! #X obj 295 366 * -1; ! #X obj 295 174 tgl 24 0 empty empty constant? 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 391 295 tgl 24 0 empty empty constant? 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 295 205 metro 10; ! #X obj 391 326 metro 10; ! #X msg 455 325 0; ! #X msg 263 204 0; ! #X text 230 127 Add some forces to the system.; ! #X msg 63 158 forceX \$2 \$1; ! #X msg 63 272 forceY \$2 \$1; ! #X obj 63 137 pack 0 0; ! #X floatatom 114 114 5 0 0 2 Mass_ID - -; ! #X obj 63 249 pack 0 0; ! #X floatatom 63 115 5 0 0 0 forceX - -; ! #X floatatom 63 204 5 0 0 0 forceY - -; ! #X obj 63 299 s \$0-msd; ! #X obj 63 181 s \$0-msd; ! #X obj 63 224 * -1; ! #X obj 63 461 pack 0 0; ! #X floatatom 63 437 5 0 0 0 posY - -; ! #X obj 63 511 s \$0-msd; ! #X msg 63 484 posY \$2 \$1; ! #X obj 63 358 pack 0 0; ! #X floatatom 63 334 5 0 0 0 posX - -; ! #X obj 63 408 s \$0-msd; ! #X msg 63 381 posX \$2 \$1; ! #X text 31 74 Modify one mass:; #X connect 1 0 4 0; #X connect 2 0 5 0; *************** *** 611,614 **** --- 624,644 ---- #X connect 10 0 1 0; #X connect 11 0 2 0; + #X connect 13 0 21 0; + #X connect 14 0 20 0; + #X connect 15 0 13 0; + #X connect 16 0 15 1; + #X connect 16 0 17 1; + #X connect 16 0 23 1; + #X connect 16 0 27 1; + #X connect 17 0 14 0; + #X connect 18 0 15 0; + #X connect 19 0 22 0; + #X connect 22 0 17 0; + #X connect 23 0 26 0; + #X connect 24 0 23 0; + #X connect 26 0 25 0; + #X connect 27 0 30 0; + #X connect 28 0 27 0; + #X connect 30 0 29 0; #X restore 60 457 pd forces; #X obj 286 518 tgl 15 0 \$0-gem-masses-on empty gem_m 0 -6 0 8 -233017 *************** *** 616,624 **** #X obj 328 518 tgl 15 0 \$0-gem-links-on empty gem_l 0 -6 0 8 -233017 -1 -1 0 1; ! #N canvas 84 573 450 300 props 0; #X obj 117 204 s \$0-msd; #X obj 117 46 vsl 15 64 0 10 0 0 empty empty D 0 -8 0 8 -262144 -1 -1 0 1; ! #X obj 141 46 vsl 15 64 0 1 0 0 empty empty D2 0 -8 0 8 -262144 -1 -1 0 1; #X obj 90 46 vsl 15 64 0 100 0 0 empty empty K 0 -8 0 8 -262144 -1 --- 646,654 ---- #X obj 328 518 tgl 15 0 \$0-gem-links-on empty gem_l 0 -6 0 8 -233017 -1 -1 0 1; ! #N canvas 557 667 450 300 props 0; #X obj 117 204 s \$0-msd; #X obj 117 46 vsl 15 64 0 10 0 0 empty empty D 0 -8 0 8 -262144 -1 -1 0 1; ! #X obj 141 46 vsl 15 64 0 10 0 0 empty empty D2 0 -8 0 8 -262144 -1 -1 0 1; #X obj 90 46 vsl 15 64 0 100 0 0 empty empty K 0 -8 0 8 -262144 -1 *************** *** 644,648 **** First select the first mass \, the set the toggle to 1 \, after that select the other masses and set toggle to 0; - #X text 150 47 Clear all:; #X text 270 181 "L" is only active \, if the green toggle "Key:L" is set to on. Otherwise use the yellow "link" bang.; --- 674,677 ---- *************** *** 653,660 **** Add mobile masses with black bang \, add fixed masses with the red bang. Set weight of mass with the "M" number box.; ! #X connect 3 0 7 0; ! #X connect 8 0 9 0; ! #X connect 8 1 10 0; ! #X connect 9 0 8 0; ! #X connect 10 0 8 1; ! #X connect 13 0 8 2; --- 682,695 ---- Add mobile masses with black bang \, add fixed masses with the red bang. Set weight of mass with the "M" number box.; ! #X obj 152 86 s pd-data; ! #X msg 152 46 clear; ! #X msg 152 66 sort; ! #X text 150 21 Clear or sort:; ! #X connect 2 0 6 0; ! #X connect 7 0 8 0; ! #X connect 7 1 9 0; ! #X connect 8 0 7 0; ! #X connect 9 0 7 1; ! #X connect 12 0 7 2; ! #X connect 28 0 27 0; ! #X connect 29 0 27 0; Index: gem_masses.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/gem_masses.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gem_masses.pd 1 May 2005 15:34:29 -0000 1.2 --- gem_masses.pd 3 May 2005 16:33:44 -0000 1.3 *************** *** 5,13 **** #X obj 150 393 separator; #X obj 150 298 any; ! #X obj 180 162 t b f; ! #X obj 220 124 - 250; ! #X obj 180 107 - 250; ! #X obj 180 137 / 100; ! #X obj 220 153 / -100; #X msg 47 325 draw line; #X obj 48 300 loadbang; --- 5,9 ---- #X obj 150 393 separator; #X obj 150 298 any; ! #X obj 166 162 t b f; #X msg 47 325 draw line; #X obj 48 300 loadbang; *************** *** 18,38 **** #X msg 239 289 1; #X obj 239 264 loadbang; ! #X connect 0 0 12 0; ! #X connect 1 0 13 0; #X connect 2 0 4 1; #X connect 3 0 1 0; ! #X connect 4 0 15 0; #X connect 5 0 4 0; #X connect 5 1 1 1; #X connect 6 0 9 0; ! #X connect 7 0 8 0; ! #X connect 8 0 5 0; ! #X connect 9 0 1 2; ! #X connect 10 0 13 0; ! #X connect 11 0 10 0; ! #X connect 12 1 7 0; ! #X connect 12 2 6 0; ! #X connect 14 0 15 1; ! #X connect 15 0 3 0; ! #X connect 16 0 15 1; ! #X connect 17 0 16 0; --- 14,33 ---- #X msg 239 289 1; #X obj 239 264 loadbang; ! #X obj 181 126 scale4gem; ! #X connect 0 0 8 0; ! #X connect 1 0 9 0; #X connect 2 0 4 1; #X connect 3 0 1 0; ! #X connect 4 0 11 0; #X connect 5 0 4 0; #X connect 5 1 1 1; #X connect 6 0 9 0; ! #X connect 7 0 6 0; ! #X connect 8 1 14 0; ! #X connect 8 2 14 1; ! #X connect 10 0 11 1; ! #X connect 11 0 3 0; ! #X connect 12 0 11 1; ! #X connect 13 0 12 0; ! #X connect 14 0 5 0; ! #X connect 14 1 1 2; Index: gem_links.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/gem_links.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gem_links.pd 1 May 2005 15:34:29 -0000 1.2 --- gem_links.pd 3 May 2005 16:33:44 -0000 1.3 *************** *** 5,16 **** #X obj 109 337 any; #X obj 147 166 t b f; - #X obj 229 116 - 250; - #X obj 147 110 - 250; - #X obj 147 140 / 100; - #X obj 229 143 / -100; - #X obj 352 114 - 250; - #X obj 287 116 - 250; - #X obj 287 151 / 100; - #X obj 352 143 / -100; #X obj 156 432 curve 2; #X obj 178 210 pack 0 0 0; --- 5,8 ---- *************** *** 21,46 **** #X msg 247 300 1; #X obj 247 275 loadbang; ! #X connect 0 0 16 0; #X connect 1 0 3 1; ! #X connect 2 0 13 0; ! #X connect 3 0 18 0; #X connect 4 0 3 0; ! #X connect 4 1 14 0; ! #X connect 5 0 8 0; ! #X connect 6 0 7 0; ! #X connect 7 0 4 0; ! #X connect 8 0 14 1; ! #X connect 9 0 12 0; ! #X connect 10 0 11 0; ! #X connect 11 0 15 0; ! #X connect 12 0 15 1; ! #X connect 14 0 13 1; ! #X connect 15 0 13 2; ! #X connect 16 1 6 0; ! #X connect 16 2 5 0; ! #X connect 16 3 10 0; ! #X connect 16 4 9 0; ! #X connect 17 0 18 1; ! #X connect 18 0 2 0; ! #X connect 19 0 18 1; ! #X connect 20 0 19 0; --- 13,36 ---- #X msg 247 300 1; #X obj 247 275 loadbang; ! #X obj 161 111 scale4gem; ! #X obj 255 140 scale4gem; ! #X connect 0 0 8 0; #X connect 1 0 3 1; ! #X connect 2 0 5 0; ! #X connect 3 0 10 0; #X connect 4 0 3 0; ! #X connect 4 1 6 0; ! #X connect 6 0 5 1; ! #X connect 7 0 5 2; ! #X connect 8 1 13 0; ! #X connect 8 2 13 1; ! #X connect 8 3 14 0; ! #X connect 8 4 14 1; ! #X connect 9 0 10 1; ! #X connect 10 0 2 0; ! #X connect 11 0 10 1; ! #X connect 12 0 11 0; ! #X connect 13 0 4 0; ! #X connect 13 1 6 1; ! #X connect 14 0 7 0; ! #X connect 14 1 7 1;

1 0

externals/nusmuk/msd3D 02_msd3Dperf.pd,1.4,1.5
by Thomas Grill 03 May '05

03 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd3D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12266/msd3D Modified Files: 02_msd3Dperf.pd Log Message: fixed patches, improved error reporting Index: 02_msd3Dperf.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd3D/02_msd3Dperf.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 02_msd3Dperf.pd 28 Apr 2005 15:22:13 -0000 1.4 --- 02_msd3Dperf.pd 3 May 2005 12:03:42 -0000 1.5 *************** *** 1,3 **** ! #N canvas 545 25 692 818 10; #X obj 177 369 t a; #X obj 159 5 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --- 1,3 ---- ! #N canvas 545 25 696 822 10; #X obj 177 369 t a; #X obj 159 5 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 *************** *** 10,16 **** #X obj 456 583 gemhead; #X obj 460 670 world_light; - #X msg 213 177 mass fix 0 100 50 50; #X msg 456 468 reset \, create \, lighting 1 \, 1; ! #X obj 52 391 t b; #N canvas 643 123 605 590 massrender 0; #X obj 127 22 inlet; --- 10,15 ---- #X obj 456 583 gemhead; #X obj 460 670 world_light; #X msg 456 468 reset \, create \, lighting 1 \, 1; ! #X obj 52 380 t b; #N canvas 643 123 605 590 massrender 0; #X obj 127 22 inlet; *************** *** 61,65 **** #X obj 586 255 pack f f; #X msg 177 339 link souple \$1 \$2 100 0.5 0.5; ! #X obj 52 368 gemhead; #X obj 456 548 gemwin; #X obj 52 655 msd3D --------------------------------; --- 60,64 ---- #X obj 586 255 pack f f; #X msg 177 339 link souple \$1 \$2 100 0.5 0.5; ! #X obj 52 357 gemhead; #X obj 456 548 gemwin; #X obj 52 655 msd3D --------------------------------; *************** *** 68,72 **** #X msg 505 233 seed 4; #X obj 177 271 pack f f f f; - #X msg 177 293 mass mob 1 \$1 \$2 \$3 \$4; #X msg 177 316 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0 \, Zmax 100 \, Zmin 0; --- 67,70 ---- *************** *** 77,82 **** #X obj 456 487 t b; #X obj 52 678 route massesPos; ! #X msg 52 425 bang \, get massesPos; ! #X text 265 487 <-- Move masses; #X floatatom 495 615 5 0 0 0 - - -; #X floatatom 536 618 5 0 0 0 - - -; --- 75,80 ---- #X obj 456 487 t b; #X obj 52 678 route massesPos; ! #X msg 52 414 bang \, get massesPos; ! #X text 300 485 <-- Move masses; #X floatatom 495 615 5 0 0 0 - - -; #X floatatom 536 618 5 0 0 0 - - -; *************** *** 84,159 **** #X obj 457 640 rotateXYZ 30 30 0; #X msg 459 20 3999; ! #X msg 163 529 forceY mob 100; ! #X msg 162 553 forceY mob -100; ! #X msg 176 577 forceZ mob 100; ! #X msg 175 601 forceZ mob -100; ! #X msg 143 479 forceX mob 100; ! #X msg 144 503 forceX mob -100; ! #X connect 0 0 31 0; #X connect 1 0 5 0; #X connect 2 0 0 0; #X connect 3 0 5 0; ! #X connect 5 0 40 0; ! #X connect 5 1 37 0; ! #X connect 5 2 39 0; ! #X connect 5 3 9 0; #X connect 5 4 2 0; ! #X connect 5 4 25 0; ! #X connect 5 4 18 0; ! #X connect 5 4 14 0; #X connect 5 4 17 0; ! #X connect 5 4 34 0; ! #X connect 6 0 30 0; ! #X connect 7 0 49 0; ! #X connect 9 0 0 0; ! #X connect 10 0 30 0; #X connect 10 0 42 0; ! #X connect 11 0 44 0; ! #X connect 13 0 35 2; ! #X connect 14 0 13 0; ! #X connect 15 0 35 1; ! #X connect 16 0 19 0; #X connect 17 0 15 0; ! #X connect 18 0 16 0; ! #X connect 19 0 35 0; ! #X connect 20 0 26 0; ! #X connect 21 0 23 0; ! #X connect 21 0 24 0; #X connect 21 0 26 1; ! #X connect 22 0 27 1; ! #X connect 23 0 22 1; ! #X connect 24 0 27 0; ! #X connect 24 1 22 0; ! #X connect 25 0 26 1; ! #X connect 26 0 21 0; ! #X connect 27 0 28 0; ! #X connect 28 0 0 0; ! #X connect 29 0 11 0; ! #X connect 31 0 43 0; ! #X connect 32 0 16 0; ! #X connect 32 1 15 0; ! #X connect 32 1 33 0; ! #X connect 32 2 13 0; ! #X connect 33 0 35 3; ! #X connect 34 0 33 0; ! #X connect 35 0 36 0; ! #X connect 36 0 0 0; ! #X connect 37 0 0 0; ! #X connect 38 0 30 0; ! #X connect 39 0 32 0; ! #X connect 40 0 20 0; ! #X connect 42 0 38 0; ! #X connect 43 0 12 0; ! #X connect 44 0 31 0; ! #X connect 46 0 49 1; ! #X connect 47 0 49 2; ! #X connect 48 0 49 3; ! #X connect 49 0 8 0; ! #X connect 50 0 39 1; ! #X connect 50 0 40 1; ! #X connect 51 0 31 0; ! #X connect 52 0 31 0; ! #X connect 53 0 31 0; ! #X connect 54 0 31 0; ! #X connect 55 0 31 0; ! #X connect 56 0 31 0; --- 82,167 ---- #X obj 457 640 rotateXYZ 30 30 0; #X msg 459 20 3999; ! #X msg 198 527 forceY mob 100; ! #X msg 197 551 forceY mob -100; ! #X msg 211 575 forceZ mob 100; ! #X msg 210 599 forceZ mob -100; ! #X msg 178 477 forceX mob 100; ! #X msg 179 501 forceX mob -100; ! #X msg 213 177 mass fix 0 100 50 50 0; ! #X msg 177 293 mass mob 1 \$1 \$2 \$3 \$4; ! #X obj 75 491 metro 10; ! #X obj 76 469 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ! ; ! #X floatatom 107 470 5 0 0 0 - - -; ! #X text 74 453 instead of GEM; ! #X connect 0 0 30 0; #X connect 1 0 5 0; #X connect 2 0 0 0; #X connect 3 0 5 0; ! #X connect 5 0 38 0; ! #X connect 5 1 35 0; ! #X connect 5 2 37 0; ! #X connect 5 3 55 0; #X connect 5 4 2 0; ! #X connect 5 4 24 0; #X connect 5 4 17 0; ! #X connect 5 4 13 0; ! #X connect 5 4 16 0; ! #X connect 5 4 33 0; ! #X connect 6 0 29 0; ! #X connect 7 0 47 0; ! #X connect 9 0 29 0; ! #X connect 9 0 40 0; #X connect 10 0 42 0; ! #X connect 12 0 34 2; ! #X connect 13 0 12 0; ! #X connect 14 0 34 1; ! #X connect 15 0 18 0; ! #X connect 16 0 14 0; #X connect 17 0 15 0; ! #X connect 18 0 34 0; ! #X connect 19 0 25 0; ! #X connect 20 0 22 0; ! #X connect 20 0 23 0; ! #X connect 20 0 25 1; #X connect 21 0 26 1; ! #X connect 22 0 21 1; ! #X connect 23 0 26 0; ! #X connect 23 1 21 0; ! #X connect 24 0 25 1; ! #X connect 25 0 20 0; ! #X connect 26 0 27 0; ! #X connect 27 0 0 0; ! #X connect 28 0 10 0; ! #X connect 30 0 41 0; ! #X connect 31 0 15 0; ! #X connect 31 1 14 0; ! #X connect 31 1 32 0; ! #X connect 31 2 12 0; ! #X connect 32 0 34 3; ! #X connect 33 0 32 0; ! #X connect 34 0 56 0; ! #X connect 35 0 0 0; ! #X connect 36 0 29 0; ! #X connect 37 0 31 0; ! #X connect 38 0 19 0; ! #X connect 40 0 36 0; ! #X connect 41 0 11 0; ! #X connect 42 0 30 0; ! #X connect 44 0 47 1; ! #X connect 45 0 47 2; ! #X connect 46 0 47 3; ! #X connect 47 0 8 0; ! #X connect 48 0 37 1; ! #X connect 48 0 38 1; ! #X connect 49 0 30 0; ! #X connect 50 0 30 0; ! #X connect 51 0 30 0; ! #X connect 52 0 30 0; ! #X connect 53 0 30 0; ! #X connect 54 0 30 0; ! #X connect 55 0 0 0; ! #X connect 56 0 0 0; ! #X connect 57 0 30 0; ! #X connect 58 0 57 0; ! #X connect 59 0 57 1;

1 0

externals/nusmuk msd.h,1.4,1.5
by Thomas Grill 03 May '05

03 May '05

Update of /cvsroot/pure-data/externals/nusmuk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12266 Modified Files: msd.h Log Message: fixed patches, improved error reporting Index: msd.h =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** msd.h 3 May 2005 11:30:18 -0000 1.4 --- msd.h 3 May 2005 12:03:42 -0000 1.5 *************** *** 146,150 **** } ! static t_float dist(const Mass &m1,const Mass &m2) { if(N == 1) --- 146,150 ---- } ! static inline t_float dist(const Mass &m1,const Mass &m2) { if(N == 1) *************** *** 367,371 **** { if(argc != 3+N) { ! error("mass : Id mobile mass X"); return; } --- 367,371 ---- { if(argc != 3+N) { ! error("mass : Id mobile mass X%s%s",N >= 2?" Y":"",N >= 3?" Z":""); return; }

1 0

externals/nusmuk/msd2D 04_msd2Dperf.pd,1.3,1.4
by Thomas Grill 03 May '05

03 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5533/msd2D Modified Files: 04_msd2Dperf.pd Log Message: adapted perf patch Index: 04_msd2Dperf.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/04_msd2Dperf.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 04_msd2Dperf.pd 3 May 2005 11:30:18 -0000 1.3 --- 04_msd2Dperf.pd 3 May 2005 11:34:09 -0000 1.4 *************** *** 1,3 **** ! #N canvas 291 84 839 795 10; #X obj 167 310 t a; #X obj 167 33 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --- 1,3 ---- ! #N canvas 291 84 843 799 10; #X obj 167 310 t a; #X obj 167 33 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 *************** *** 6,10 **** #X obj 52 15 loadbang; #X text 205 34 reset; ! #X msg 281 402 forceX mob 100; #X obj 167 55 t b b b b b; #X obj 52 583 msd2D --------------------------------; --- 6,10 ---- #X obj 52 15 loadbang; #X text 205 34 reset; ! #X msg 300 402 forceX mob 100; #X obj 167 55 t b b b b b; #X obj 52 583 msd2D --------------------------------; *************** *** 135,154 **** #X obj 52 606 route linksPos massesPos; #X msg 460 433 view 0 0 4 0 0 0 0 1 0; ! #X msg 281 425 forceX mob -100; ! #X text 478 30 change number of mass to test performance; ! #X obj 457 65 f; #X obj 380 109 repeat 100; #X obj 592 105 repeat 100; ! #X msg 412 31 200; ! #X msg 375 32 100; ! #X msg 385 55 300; ! #X msg 445 31 5000; ! #X obj 82 372 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; ! #X obj 82 393 metro 10; ! #X msg 415 10 1000; ! #X msg 422 54 500; ! #X floatatom 132 372 5 0 0 0 - - -; ! #X msg 455 9 2000; #X connect 0 0 7 0; #X connect 1 0 6 0; --- 135,151 ---- #X obj 52 606 route linksPos massesPos; #X msg 460 433 view 0 0 4 0 0 0 0 1 0; ! #X msg 300 425 forceX mob -100; ! #X obj 441 55 f; #X obj 380 109 repeat 100; #X obj 592 105 repeat 100; ! #X obj 91 421 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; ! #X obj 91 442 metro 10; ! #X floatatom 141 421 5 0 0 0 - - -; ! #X text 501 28 change number of mass to test performance; ! #X text 501 41 (and reset afterwards); ! #X obj 441 34 nbx 5 14 1 20000 1 1 empty empty empty 0 -6 0 10 -262144 ! -1 -1 500 256; ! #X text 90 393 instead of GEM doing the timing; #X connect 0 0 7 0; #X connect 1 0 6 0; *************** *** 156,163 **** #X connect 3 0 6 0; #X connect 5 0 7 0; ! #X connect 6 0 52 0; #X connect 6 1 18 0; #X connect 6 1 19 0; ! #X connect 6 2 51 0; #X connect 6 3 11 0; #X connect 6 4 2 0; --- 153,160 ---- #X connect 3 0 6 0; #X connect 5 0 7 0; ! #X connect 6 0 51 0; #X connect 6 1 18 0; #X connect 6 1 19 0; ! #X connect 6 2 50 0; #X connect 6 3 11 0; #X connect 6 4 2 0; *************** *** 211,226 **** #X connect 47 0 44 0; #X connect 48 0 7 0; ! #X connect 50 0 51 1; ! #X connect 50 0 52 1; ! #X connect 51 0 41 0; ! #X connect 52 0 33 0; ! #X connect 53 0 50 0; ! #X connect 54 0 50 0; ! #X connect 55 0 50 0; ! #X connect 56 0 50 0; ! #X connect 57 0 58 0; ! #X connect 58 0 7 0; ! #X connect 59 0 50 0; ! #X connect 60 0 50 0; ! #X connect 61 0 58 1; ! #X connect 62 0 50 0; --- 208,217 ---- #X connect 47 0 44 0; #X connect 48 0 7 0; ! #X connect 49 0 50 1; ! #X connect 49 0 51 1; ! #X connect 50 0 41 0; ! #X connect 51 0 33 0; ! #X connect 52 0 53 0; ! #X connect 53 0 7 0; ! #X connect 54 0 53 1; ! #X connect 57 0 49 0;

1 0

externals/nusmuk/msd2D 04_msd2Dperf.pd,1.2,1.3
by Thomas Grill 03 May '05

03 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4827/msd2D Modified Files: 04_msd2Dperf.pd Log Message: represent mobility by inverse mass, larger index tables Index: 04_msd2Dperf.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/04_msd2Dperf.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 04_msd2Dperf.pd 26 Apr 2005 16:10:07 -0000 1.2 --- 04_msd2Dperf.pd 3 May 2005 11:30:18 -0000 1.3 *************** *** 1,3 **** ! #N canvas 291 84 827 783 10; #X obj 167 310 t a; #X obj 167 33 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --- 1,3 ---- ! #N canvas 291 84 839 795 10; #X obj 167 310 t a; #X obj 167 33 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 *************** *** 136,143 **** #X msg 460 433 view 0 0 4 0 0 0 0 1 0; #X msg 281 425 forceX mob -100; ! #X obj 380 109 repeat 500; ! #X obj 592 105 repeat 500; ! #X msg 445 53 500; ! #X text 478 52 change number of mass to test performance; #X connect 0 0 7 0; #X connect 1 0 6 0; --- 136,154 ---- #X msg 460 433 view 0 0 4 0 0 0 0 1 0; #X msg 281 425 forceX mob -100; ! #X text 478 30 change number of mass to test performance; ! #X obj 457 65 f; ! #X obj 380 109 repeat 100; ! #X obj 592 105 repeat 100; ! #X msg 412 31 200; ! #X msg 375 32 100; ! #X msg 385 55 300; ! #X msg 445 31 5000; ! #X obj 82 372 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ! ; ! #X obj 82 393 metro 10; ! #X msg 415 10 1000; ! #X msg 422 54 500; ! #X floatatom 132 372 5 0 0 0 - - -; ! #X msg 455 9 2000; #X connect 0 0 7 0; #X connect 1 0 6 0; *************** *** 145,152 **** #X connect 3 0 6 0; #X connect 5 0 7 0; ! #X connect 6 0 50 0; #X connect 6 1 18 0; #X connect 6 1 19 0; ! #X connect 6 2 49 0; #X connect 6 3 11 0; #X connect 6 4 2 0; --- 156,163 ---- #X connect 3 0 6 0; #X connect 5 0 7 0; ! #X connect 6 0 52 0; #X connect 6 1 18 0; #X connect 6 1 19 0; ! #X connect 6 2 51 0; #X connect 6 3 11 0; #X connect 6 4 2 0; *************** *** 200,205 **** #X connect 47 0 44 0; #X connect 48 0 7 0; ! #X connect 49 0 41 0; ! #X connect 50 0 33 0; ! #X connect 51 0 49 1; ! #X connect 51 0 50 1; --- 211,226 ---- #X connect 47 0 44 0; #X connect 48 0 7 0; ! #X connect 50 0 51 1; ! #X connect 50 0 52 1; ! #X connect 51 0 41 0; ! #X connect 52 0 33 0; ! #X connect 53 0 50 0; ! #X connect 54 0 50 0; ! #X connect 55 0 50 0; ! #X connect 56 0 50 0; ! #X connect 57 0 58 0; ! #X connect 58 0 7 0; ! #X connect 59 0 50 0; ! #X connect 60 0 50 0; ! #X connect 61 0 58 1; ! #X connect 62 0 50 0;

1 0

externals/nusmuk msd.h,1.3,1.4
by Thomas Grill 03 May '05

03 May '05

Update of /cvsroot/pure-data/externals/nusmuk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4827 Modified Files: msd.h Log Message: represent mobility by inverse mass, larger index tables Index: msd.h =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** msd.h 3 May 2005 08:45:36 -0000 1.3 --- msd.h 3 May 2005 11:30:18 -0000 1.4 *************** *** 93,98 **** t_int nbr; const t_symbol *Id; ! bool mobile; ! t_float invM; t_float speed[N]; t_float pos[N]; --- 93,97 ---- t_int nbr; const t_symbol *Id; ! t_float M,invM; t_float speed[N]; t_float pos[N]; *************** *** 104,110 **** Mass(t_int n,const t_symbol *id,bool mob,t_float m,t_float p[N]) : nbr(n),Id(id) ! , mobile(mob) ! , invM(m?1.f/m:1) { for(int i = 0; i < N; ++i) { pos[i] = pos2[i] = p[i]; --- 103,110 ---- Mass(t_int n,const t_symbol *id,bool mob,t_float m,t_float p[N]) : nbr(n),Id(id) ! , M(m) { + if(mob) setMobile(); else setFixed(); + for(int i = 0; i < N; ++i) { pos[i] = pos2[i] = p[i]; *************** *** 127,147 **** } inline void compute(t_float limit[N][2]) { - // compute new masses position only if mobile = 1 - if(mobile) { - for(int i = 0; i < N; ++i) { - t_float pold = pos[i]; - t_float pnew = force[i] * invM + 2*pold - pos2[i]; // x[n] =Fx[n]/M+2x[n]-x[n-1] - if(pnew < limit[i][0]) pnew = limit[i][0]; else if(pnew > limit[i][1]) pnew = limit[i][1]; - speed[i] = (pos[i] = pnew) - (pos2[i] = pold); // x[n-2] = x[n-1], x[n-1] = x[n],vx[n] = x[n] - x[n-1] - } - } - // clear forces for(int i = 0; i < N; ++i) { out_force[i] = force[i]; force[i] = 0; // Fx[n] = 0 } } }; --- 127,159 ---- } + inline bool getMobile() const { return invM != 0; } + + inline void setMobile() { invM = M?1.f/M:1.; } + inline void setFixed() { invM = 0; } + inline void compute(t_float limit[N][2]) { for(int i = 0; i < N; ++i) { + t_float pold = pos[i]; + t_float pnew = force[i] * invM + 2*pold - pos2[i]; // x[n] =Fx[n]/M+2x[n]-x[n-1] + if(pnew < limit[i][0]) pnew = limit[i][0]; else if(pnew > limit[i][1]) pnew = limit[i][1]; + speed[i] = (pos[i] = pnew) - (pos2[i] = pold); // x[n-2] = x[n-1], x[n-1] = x[n],vx[n] = x[n] - x[n-1] + + // clear forces out_force[i] = force[i]; force[i] = 0; // Fx[n] = 0 } } + + static t_float dist(const Mass &m1,const Mass &m2) + { + if(N == 1) + return fabs(m1.pos[0]-m2.pos[0]); // L[n] = |x1 - x2| + else { + t_float distance = 0; + for(int i = 0; i < N; ++i) distance += sqr(m1.pos[i]-m2.pos[i]); + return sqrt(distance); + } + } }; *************** *** 156,173 **** t_float distance_old; - inline t_float compdist() const - { - const Mass<N> *m1 = mass1,*m2 = mass2; // cache locally - t_float distance; - if(N == 1) - distance = fabs(m1->pos[0]-m2->pos[0]); // L[n] = |x1 - x2| - else { - distance = 0; - for(int i = 0; i < N; ++i) distance += sqr(m1->pos[i]-m2->pos[i]); - distance = sqrt(distance); - } - return distance; - } - Link(t_int n,const t_symbol *id,Mass<N> *m1,Mass<N> *m2,t_float k1,t_float d1,t_float d2,t_float lmin,t_float lmax) : nbr(n),Id(id) --- 168,171 ---- *************** *** 176,180 **** , long_min(lmin),long_max(lmax) { ! distance_old = longueur = compdist(); // L[n-1] mass1->links.insert(this); --- 174,178 ---- , long_min(lmin),long_max(lmax) { ! distance_old = longueur = Mass<N>::dist(*mass1,*mass2); // L[n-1] mass1->links.insert(this); *************** *** 192,197 **** { Mass<N> *m1 = mass1,*m2 = mass2; // cache locally ! t_float distance = compdist(); ! if (distance < long_min || distance > long_max || distance == 0) { for(int i = 0; i < N; ++i) { --- 190,194 ---- { Mass<N> *m1 = mass1,*m2 = mass2; // cache locally ! t_float distance = Mass<N>::dist(*m1,*m2); if (distance < long_min || distance > long_max || distance == 0) { for(int i = 0; i < N; ++i) { *************** *** 225,232 **** template <typename T> class IndexMap ! : TablePtrMap<unsigned int,T,16> { public: ! typedef TablePtrMap<unsigned int,T,16> Parent; virtual ~IndexMap() { reset(); } --- 222,229 ---- template <typename T> class IndexMap ! : TablePtrMap<unsigned int,T,64> { public: ! typedef TablePtrMap<unsigned int,T,64> Parent; virtual ~IndexMap() { reset(); } *************** *** 259,263 **** template <typename T> class IDMap ! : TablePtrMap<const t_symbol *,TablePtrMap<T,T,4> *> { public: --- 256,260 ---- template <typename T> class IDMap ! : TablePtrMap<const t_symbol *,TablePtrMap<T,T,4> *,4> { public: *************** *** 265,269 **** typedef TablePtrMap<T,T,4> Container; // that's the map for the key ID (symbol,int) relating to the data items ! typedef TablePtrMap<const t_symbol *,Container *> Parent; typedef typename Container::iterator iterator; --- 262,266 ---- typedef TablePtrMap<T,T,4> Container; // that's the map for the key ID (symbol,int) relating to the data items ! typedef TablePtrMap<const t_symbol *,Container *,4> Parent; typedef typename Container::iterator iterator; *************** *** 460,464 **** t_mass *m = mass.find(GetAInt(argv[0])); if(m) ! m->mobile = mob; else error("%s - %s : Index not found",thisName(),GetString(thisTag())); --- 457,462 ---- t_mass *m = mass.find(GetAInt(argv[0])); if(m) ! if(mob) m->setMobile(); ! else m->setFixed(); else error("%s - %s : Index not found",thisName(),GetString(thisTag())); *************** *** 850,855 **** SetInt((sortie[0]),m->nbr); SetSymbol((sortie[1]),m->Id); ! SetBool((sortie[2]),m->mobile); ! SetFloat((sortie[3]),1.f/m->invM); for(int i = 0; i < N; ++i) SetFloat((sortie[4+i]),m->pos[i]); ToOutAnything(1,s,4+N,sortie); --- 848,853 ---- SetInt((sortie[0]),m->nbr); SetSymbol((sortie[1]),m->Id); ! SetBool((sortie[2]),m->getMobile()); ! SetFloat((sortie[3]),m->M); for(int i = 0; i < N; ++i) SetFloat((sortie[4+i]),m->pos[i]); ToOutAnything(1,s,4+N,sortie);

1 0

externals/nusmuk msd.h,1.2,1.3
by Thomas Grill 03 May '05

03 May '05

Update of /cvsroot/pure-data/externals/nusmuk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28584/nusmuk Modified Files: msd.h Log Message: fixed bitreversing use flext maps Index: msd.h =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** msd.h 2 May 2005 22:07:18 -0000 1.2 --- msd.h 3 May 2005 08:45:36 -0000 1.3 *************** *** 40,44 **** #include <string.h> #include <vector> - #include <map> // define constants --- 40,43 ---- *************** *** 219,223 **** { T r = 0; ! for(int i = 0; i < sizeof(k)*4; ++i) r = (r<<1)|(k&1),k >>= 1; return r; } --- 218,222 ---- { T r = 0; ! for(int i = 0; i < sizeof(k)*8; ++i) r = (r<<1)|(k&1),k >>= 1; return r; } *************** *** 240,244 **** } ! inline size_t size() const { return Parent::size(); } inline T insert(unsigned int k,T v) { return Parent::insert(bitrev(k),v); } --- 239,243 ---- } ! inline int size() const { return Parent::size(); } inline T insert(unsigned int k,T v) { return Parent::insert(bitrev(k),v); } *************** *** 260,264 **** template <typename T> class IDMap ! : std::map<const t_symbol *,TablePtrMap<T,T,4> *> { public: --- 259,263 ---- template <typename T> class IDMap ! : TablePtrMap<const t_symbol *,TablePtrMap<T,T,4> *> { public: *************** *** 266,270 **** typedef TablePtrMap<T,T,4> Container; // that's the map for the key ID (symbol,int) relating to the data items ! typedef std::map<const t_symbol *,Container *> Parent; typedef typename Container::iterator iterator; --- 265,269 ---- typedef TablePtrMap<T,T,4> Container; // that's the map for the key ID (symbol,int) relating to the data items ! typedef TablePtrMap<const t_symbol *,Container *> Parent; typedef typename Container::iterator iterator; *************** *** 276,282 **** void reset() { ! typename Parent::iterator it; ! for(it = Parent::begin(); it != Parent::end(); ++it) ! delete it->second; Parent::clear(); } --- 275,280 ---- void reset() { ! typename Parent::iterator it(*this); ! for(; it; ++it) delete it.data(); Parent::clear(); } *************** *** 284,293 **** void insert(T item) { ! typename Parent::iterator it = Parent::find(item->Id); ! Container *c; ! if(it == Parent::end()) ! Parent::operator[](item->Id) = c = new Container; ! else ! c = it->second; c->insert(item,item); } --- 282,288 ---- void insert(T item) { ! Container *c = Parent::find(item->Id); ! if(!c) ! Parent::insert(item->Id,c = new Container); c->insert(item,item); } *************** *** 295,311 **** iterator find(const t_symbol *key) { ! typename Parent::iterator it = Parent::find(key); ! if(it == Parent::end()) ! return iterator(); ! else { ! Container *c = it->second; return iterator(*c); ! } } void erase(T item) { ! typename Parent::iterator it = Parent::find(item->Id); ! if(it != Parent::end()) it->second->remove(item); } }; --- 290,304 ---- iterator find(const t_symbol *key) { ! Container *c = Parent::find(key); ! if(c) return iterator(*c); ! else ! return iterator(); } void erase(T item) { ! Container *c = Parent::find(item->Id); ! if(c) c->remove(item); } };

1 0

externals/nusmuk msd.h,1.1,1.2
by Thomas Grill 03 May '05

03 May '05

Update of /cvsroot/pure-data/externals/nusmuk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26016 Modified Files: msd.h Log Message: use index bit-reversal to pseudo-balance the map tree Index: msd.h =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** msd.h 2 May 2005 15:39:24 -0000 1.1 --- msd.h 2 May 2005 22:07:18 -0000 1.2 *************** *** 216,224 **** template <typename T> class IndexMap ! : public TablePtrMap<int,T,16> { public: ! typedef TablePtrMap<int,T,16> Parent; virtual ~IndexMap() { reset(); } --- 216,233 ---- template <typename T> + inline T bitrev(T k) + { + T r = 0; + for(int i = 0; i < sizeof(k)*4; ++i) r = (r<<1)|(k&1),k >>= 1; + return r; + } + + // use bit-reversed key to pseudo-balance the map tree + template <typename T> class IndexMap ! : TablePtrMap<unsigned int,T,16> { public: ! typedef TablePtrMap<unsigned int,T,16> Parent; virtual ~IndexMap() { reset(); } *************** *** 230,234 **** --- 239,259 ---- Parent::clear(); } + + inline size_t size() const { return Parent::size(); } + inline T insert(unsigned int k,T v) { return Parent::insert(bitrev(k),v); } + + inline T find(unsigned int k) { return Parent::find(bitrev(k)); } + + inline T remove(unsigned int k) { return Parent::remove(bitrev(k)); } + + class iterator + : public Parent::iterator + { + public: + iterator() {} + iterator(IndexMap &m): Parent::iterator(m) {} + inline unsigned int key() const { return bitrev(Parent::key()); } + }; }; *************** *** 322,326 **** t_float limit[N][2]; // Limit values ! int id_mass, id_link; // --------------------------------------------------------------- RESET --- 347,351 ---- t_float limit[N][2]; // Limit values ! unsigned int id_mass, id_link; // --------------------------------------------------------------- RESET

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2005