*** empty log message ***

svn path=/trunk/externals/nusmuk/; revision=5040

4 files changed, 207 insertions, 199 deletions

diff --git a/msd2D/02_msd2Dadd.pd b/msd2D/02_msd2Dadd.pd
index 5a17364..120f98c 100644
--- a/msd2D/02_msd2Dadd.pd
+++ b/msd2D/02_msd2Dadd.pd
@@ -337,9 +337,6 @@
 #X obj 52 594 route linksPos massesPos massesSpeedsNo;
 #X msg 52 420 bang \, get massesPos \, get linksPos \, get massesSpeeds
 1 5 9 13 17 21 25 29;
-#X obj 334 650 print;
-#X msg 95 484 forceX mob -1000;
-#X msg 94 458 forceX mob 1000;
 #X text 130 679 Move red masses for bass and white ones for high tones...
 ;
 #N canvas 557 309 487 357 masses 0;
@@ -419,12 +416,12 @@
 #X restore 137 176 pd links;
 #X obj 137 62 t b b b b;
 #X text 491 431 Get a few masses speeds;
-#N canvas 0 0 450 300 record 1;
-#X restore 268 344 pd record;
+#X msg 94 458 forceX mob 100;
+#X msg 95 484 forceX mob -100;
 #X connect 0 0 5 0;
-#X connect 1 0 34 0;
+#X connect 1 0 31 0;
 #X connect 2 0 0 0;
-#X connect 3 0 34 0;
+#X connect 3 0 31 0;
 #X connect 5 0 26 0;
 #X connect 5 1 4 0;
 #X connect 6 0 17 0;
@@ -440,11 +437,11 @@
 #X connect 26 1 14 0;
 #X connect 26 2 9 0;
 #X connect 27 0 5 0;
-#X connect 29 0 5 0;
-#X connect 30 0 5 0;
-#X connect 32 0 0 0;
-#X connect 33 0 0 0;
-#X connect 34 0 33 0;
-#X connect 34 1 11 0;
-#X connect 34 2 32 0;
-#X connect 34 3 2 0;
+#X connect 29 0 0 0;
+#X connect 30 0 0 0;
+#X connect 31 0 30 0;
+#X connect 31 1 11 0;
+#X connect 31 2 29 0;
+#X connect 31 3 2 0;
+#X connect 33 0 5 0;
+#X connect 34 0 5 0;
diff --git a/msd2D/03_imsd2Dtest.pd b/msd2D/03_imsd2Dtest.pd
index 31dee78..fac75d2 100644
--- a/msd2D/03_imsd2Dtest.pd
+++ b/msd2D/03_imsd2Dtest.pd
@@ -1,4 +1,4 @@
-#N canvas 483 96 839 834 10;
+#N canvas 574 52 839 834 10;
 #X obj 52 15 loadbang;
 #X obj 314 524 print msd;
 #X obj 633 647 gemwin;
diff --git a/msd2D/05_msd2DDataStruct.pd b/msd2D/05_msd2DDataStruct.pd
index 8bc35e8..a35b99e 100644
--- a/msd2D/05_msd2DDataStruct.pd
+++ b/msd2D/05_msd2DDataStruct.pd
@@ -12,10 +12,9 @@ mid2 float lid;
 #X text 173 21 reset;
 #X obj 135 42 t b b b b b;
 #X obj 574 252 structures;
-#X obj 53 188 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1
+#X obj 53 188 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1
 ;
 #X msg 153 181 Xmax 300 \, Xmin 0 \, Ymax 300 \, Ymin 0;
-#X msg 171 146 mass mob 1 100 \$1 \$2;
 #X msg 186 317 forceY mob 8;
 #X msg 171 113 100 300 \, 150 300 \, 100 230 \, 150 230 \, 100 180
 \, 150 180 \, 50 180 \, 200 180 \, 115 180 \, 135 180 \, 110 150 \,
@@ -24,43 +23,43 @@ mid2 float lid;
 \, 4 5 \, 5 3 \, 3 4 \, 2 5 \, 4 6 \, 5 7 \, 6 5 \, 4 7 \, 4 8 \, 5
 9 \, 8 9 \, 8 10 \, 10 11 \, 11 9 \, 9 10 \, 8 11;
 #X obj 53 217 metro 10;
-#N canvas 0 0 307 306 1000-anim 0;
-#X scalar liaison 127.938 300 187.405 185.614 0 0 0 \;;
-#X scalar liaison 135.515 184.954 150.735 193.676 0 0 0 \;;
-#X scalar liaison 135.515 184.954 187.405 185.614 0 0 0 \;;
-#X scalar liaison 185.431 234.14 127.938 300 0 0 0 \;;
-#X scalar liaison 149.143 163.975 179.054 166.366 0 0 0 \;;
-#X scalar liaison 135.515 184.954 93.8641 216.012 0 0 0 \;;
-#X scalar liaison 193.606 300 135.515 184.954 0 0 0 \;;
-#X scalar liaison 150.735 193.676 172.65 195.175 0 0 0 \;;
-#X scalar liaison 185.431 234.14 135.515 184.954 0 0 0 \;;
-#X scalar liaison 193.606 300 185.431 234.14 0 0 0 \;;
-#X scalar liaison 172.65 195.175 149.143 163.975 0 0 0 \;;
-#X scalar liaison 93.8641 216.012 187.405 185.614 0 0 0 \;;
-#X scalar liaison 193.606 300 136.415 233.819 0 0 0 \;;
-#X scalar liaison 187.405 185.614 172.65 195.175 0 0 0 \;;
-#X scalar liaison 187.405 185.614 185.431 234.14 0 0 0 \;;
-#X scalar liaison 127.938 300 136.415 233.819 0 0 0 \;;
-#X scalar liaison 179.054 166.366 172.65 195.175 0 0 0 \;;
-#X scalar liaison 187.405 185.614 228.226 217.782 0 0 0 \;;
-#X scalar liaison 136.415 233.819 185.431 234.14 0 0 0 \;;
-#X scalar liaison 150.735 193.676 149.143 163.975 0 0 0 \;;
-#X scalar liaison 136.415 233.819 187.405 185.614 0 0 0 \;;
-#X scalar liaison 136.415 233.819 135.515 184.954 0 0 0 \;;
-#X scalar liaison 150.735 193.676 179.054 166.366 0 0 0 \;;
-#X scalar liaison 135.515 184.954 228.226 217.782 0 0 0 \;;
-#X scalar mass 127.938 300 0 0 \;;
-#X scalar mass 150.735 193.676 8 0 \;;
-#X scalar mass 135.515 184.954 4 0 \;;
-#X scalar mass 136.415 233.819 2 0 \;;
-#X scalar mass 149.143 163.975 10 0 \;;
-#X scalar mass 93.8641 216.012 6 0 \;;
-#X scalar mass 193.606 300 1 0 \;;
-#X scalar mass 172.65 195.175 9 0 \;;
-#X scalar mass 187.405 185.614 5 0 \;;
-#X scalar mass 185.431 234.14 3 0 \;;
-#X scalar mass 179.054 166.366 11 0 \;;
-#X scalar mass 228.226 217.782 7 0 \;;
+#N canvas 0 0 307 306 1028-anim 0;
+#X scalar liaison 100 300 150 180 0 0 0 \;;
+#X scalar liaison 100 180 115 180 0 0 0 \;;
+#X scalar liaison 100 180 150 180 0 0 0 \;;
+#X scalar liaison 150 230 100 300 0 0 0 \;;
+#X scalar liaison 110 150 140 150 0 0 0 \;;
+#X scalar liaison 100 180 50 180 0 0 0 \;;
+#X scalar liaison 150 300 100 180 0 0 0 \;;
+#X scalar liaison 115 180 135 180 0 0 0 \;;
+#X scalar liaison 150 230 100 180 0 0 0 \;;
+#X scalar liaison 150 300 150 230 0 0 0 \;;
+#X scalar liaison 135 180 110 150 0 0 0 \;;
+#X scalar liaison 50 180 150 180 0 0 0 \;;
+#X scalar liaison 150 300 100 230 0 0 0 \;;
+#X scalar liaison 150 180 135 180 0 0 0 \;;
+#X scalar liaison 150 180 150 230 0 0 0 \;;
+#X scalar liaison 100 300 100 230 0 0 0 \;;
+#X scalar liaison 140 150 135 180 0 0 0 \;;
+#X scalar liaison 150 180 200 180 0 0 0 \;;
+#X scalar liaison 100 230 150 230 0 0 0 \;;
+#X scalar liaison 115 180 110 150 0 0 0 \;;
+#X scalar liaison 100 230 150 180 0 0 0 \;;
+#X scalar liaison 100 230 100 180 0 0 0 \;;
+#X scalar liaison 115 180 140 150 0 0 0 \;;
+#X scalar liaison 100 180 200 180 0 0 0 \;;
+#X scalar mass 100 300 0 0 \;;
+#X scalar mass 115 180 8 0 \;;
+#X scalar mass 100 180 4 0 \;;
+#X scalar mass 100 230 2 0 \;;
+#X scalar mass 110 150 10 0 \;;
+#X scalar mass 50 180 6 0 \;;
+#X scalar mass 150 300 1 0 \;;
+#X scalar mass 135 180 9 0 \;;
+#X scalar mass 150 180 5 0 \;;
+#X scalar mass 150 230 3 0 \;;
+#X scalar mass 140 150 11 0 \;;
+#X scalar mass 200 180 7 0 \;;
 #X coords 0 0 300 300 300 300 1;
 #X restore 466 370 pd \$0-anim;
 #X obj 52 290 make_anim \$0-anim;
@@ -78,30 +77,32 @@ state;
 #X msg 52 609 forceY 0 -200 \, forceY 1 -200 \, forceX 0 -200 \, forceX
 1 200;
 #X msg 52 571 forceY 6 -200 \, forceY 7 -200;
+#X msg 171 146 mass mob 1 100 \$1 \$2;
+#X text 417 61 NOT UPDATED...;
 #X connect 0 0 6 0;
-#X connect 1 0 16 0;
-#X connect 1 1 16 0;
+#X connect 1 0 15 0;
+#X connect 1 1 15 0;
 #X connect 2 0 1 0;
 #X connect 3 0 6 0;
 #X connect 4 0 2 0;
-#X connect 6 0 13 0;
+#X connect 6 0 12 0;
 #X connect 6 1 9 0;
-#X connect 6 2 12 0;
+#X connect 6 2 11 0;
 #X connect 6 4 4 0;
-#X connect 8 0 14 0;
+#X connect 8 0 13 0;
 #X connect 9 0 2 0;
-#X connect 10 0 2 0;
-#X connect 11 0 1 0;
-#X connect 12 0 10 0;
-#X connect 13 0 21 0;
-#X connect 14 0 1 0;
-#X connect 14 0 11 0;
-#X connect 16 0 1 0;
-#X connect 21 0 2 0;
+#X connect 10 0 1 0;
+#X connect 11 0 28 0;
+#X connect 12 0 20 0;
+#X connect 13 0 1 0;
+#X connect 13 0 10 0;
+#X connect 15 0 1 0;
+#X connect 20 0 2 0;
+#X connect 21 0 1 0;
 #X connect 22 0 1 0;
 #X connect 23 0 1 0;
 #X connect 24 0 1 0;
 #X connect 25 0 1 0;
 #X connect 26 0 1 0;
 #X connect 27 0 1 0;
-#X connect 28 0 1 0;
+#X connect 28 0 2 0;
diff --git a/msd2D/06_msd2Dgravit.pd b/msd2D/06_msd2Dgravit.pd
index 21d3e07..3f237c5 100644
--- a/msd2D/06_msd2Dgravit.pd
+++ b/msd2D/06_msd2Dgravit.pd
@@ -1,16 +1,109 @@
-#N canvas 817 45 843 799 10;
+#N canvas 597 49 843 799 10;
+#X obj 119 28 cnv 15 400 300 empty empty CREATION 20 12 1 14 -260818
+-66577 0;
 #X obj 167 310 t a;
-#X obj 167 32 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+#X obj 42 28 bng 20 250 50 0 empty empty empty 0 -6 0 8 -258699 -1
 -1;
 #X msg 239 84 reset;
-#X obj 52 15 loadbang;
-#X text 205 33 reset;
+#X obj 245 32 loadbang;
+#X text 68 30 reset;
 #X obj 167 55 t b b b b b;
-#X obj 52 572 msd2D --------------------------------;
+#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 1681.79 256;
+#X msg 185 241 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4;
+#X msg 167 215 setL sun 0;
+#X msg 221 107 mass fix 0 100 0 0;
+#X text 409 270 0.2 : rigidity \, 0 : damping \, -2 : power \, 0.4
+: Lmin;
+#X text 363 109 Sun;
+#X text 288 181 Initial speed;
+#N canvas 309 104 769 663 masses 0;
+#X obj 151 16 inlet;
+#X obj 232 28 inlet;
+#X obj 151 616 outlet;
+#X msg 151 551 mass mob 1 \$1 \$2 \$3;
+#X msg 151 307 seed 3;
+#X obj 151 519 pack f f f;
+#X obj 151 228 t b b b;
+#X msg 243 306 seed 20;
+#X msg 331 308 seed 10;
+#X obj 151 327 random 10000;
+#X obj 243 371 - 1;
+#X obj 331 370 - 1;
+#X obj 151 47 t b;
+#X obj 333 52 loadbang;
+#X text 263 277 X;
+#X text 166 276 M;
+#X text 372 278 Y;
+#X obj 151 67 until;
+#X obj 151 86 f;
+#X obj 177 87 + 1;
+#X obj 177 118 mod 1000;
+#X obj 206 87 sel 0;
+#X obj 243 327 random 1000;
+#X obj 331 328 random 1000;
+#X obj 243 348 / 50000;
+#X obj 331 349 / 50000;
+#X obj 151 349 / 250;
+#X obj 151 371 + 185;
+#X connect 0 0 12 0;
+#X connect 1 0 20 1;
+#X connect 3 0 2 0;
+#X connect 4 0 9 0;
+#X connect 5 0 3 0;
+#X connect 6 0 9 0;
+#X connect 6 1 22 0;
+#X connect 6 2 23 0;
+#X connect 7 0 22 0;
+#X connect 8 0 23 0;
+#X connect 9 0 26 0;
+#X connect 10 0 5 1;
+#X connect 11 0 5 2;
+#X connect 12 0 17 0;
+#X connect 13 0 7 0;
+#X connect 13 0 8 0;
+#X connect 13 0 4 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 18 0 6 0;
+#X connect 19 0 20 0;
+#X connect 20 0 21 0;
+#X connect 20 0 18 1;
+#X connect 21 0 17 1;
+#X connect 22 0 24 0;
+#X connect 23 0 25 0;
+#X connect 24 0 10 0;
+#X connect 25 0 11 0;
+#X connect 26 0 27 0;
+#X connect 27 0 5 0;
+#X restore 203 144 pd masses;
+#X text 410 289 The power of the link is -2 to simulate a gravity field
+in 1/R^2;
+#X text 292 146 Particules;
+#X msg 185 268 link sun fix mob 0.2 0 -2 0.4;
+#X msg 167 178 forceX mob 5.9;
+#X obj 453 353 cnv 15 300 300 empty empty GEM_STUFF 20 12 1 14 -241291
+-66577 0;
 #X msg 460 409 0 \, destroy;
-#X obj 458 500 gemhead;
-#X obj 458 553 world_light;
-#X obj 52 301 t b;
+#X obj 460 525 gemhead;
+#X obj 460 578 world_light;
+#X obj 460 488 gemwin;
+#X msg 460 433 view 0 0 4 0 0 0 0 1 0;
+#X msg 460 386 reset \, dimen 800 800 \, create \, lighting 1 \, 1
+;
+#X obj 460 552 rotateXYZ 30 20 0;
+#X obj 38 359 cnv 15 350 250 empty empty COMPUTING 20 12 1 14 -260818
+-66577 0;
+#X obj 52 542 msd2D --------------------------------;
+#X obj 52 424 t b;
+#X obj 52 401 gemhead;
+#X msg 197 483 forceX mob 0.051;
+#X msg 197 509 forceY mob 0.1;
+#X msg 52 458 bang \, bang \, get massesPos;
+#X obj 37 639 cnv 15 300 100 empty empty DISPLAYING 20 12 1 14 -241291
+-66577 0;
 #N canvas 637 205 605 590 massrender 0;
 #X obj 124 5 inlet;
 #X obj 291 245 translateXYZ;
@@ -33,22 +126,23 @@
 #X obj 175 76 unpack f f;
 #X obj 161 121 t b f;
 #X obj 169 290 color 1 0 0;
-#X obj 292 291 color 1 1 1;
-#X obj 57 315 sphere 0.3 20;
 #X obj 292 319 square 0.015;
 #X obj 168 320 square 0.04;
 #X text 61 351 Sun;
 #X text 169 355 Red particule;
 #X text 307 355 Particule;
+#X obj 56 315 sphere 0.3 30;
+#X obj 57 289 color 0.3 0.3 0.3;
+#X obj 292 291 color 0.3 0.3 0.3;
 #X connect 0 0 10 0;
-#X connect 1 0 21 0;
+#X connect 1 0 28 0;
 #X connect 2 0 4 1;
 #X connect 3 0 1 0;
 #X connect 4 0 3 0;
 #X connect 5 0 11 0;
 #X connect 5 1 1 1;
 #X connect 5 2 1 2;
-#X connect 6 0 22 0;
+#X connect 6 0 27 0;
 #X connect 7 0 9 1;
 #X connect 8 0 6 0;
 #X connect 9 0 8 0;
@@ -68,122 +162,38 @@
 #X connect 18 1 14 2;
 #X connect 19 0 17 0;
 #X connect 19 1 14 1;
-#X connect 20 0 24 0;
-#X connect 21 0 23 0;
-#X restore 52 648 pd massrender;
-#X obj 52 278 gemhead;
-#X obj 460 458 gemwin;
-#X msg 460 433 view 0 0 4 0 0 0 0 1 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 2291.81 256;
-#X msg 170 245 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4;
-#X msg 119 203 setL sun 0;
-#X msg 221 107 mass fix 0 100 0 0;
-#X obj 458 527 rotateXYZ 30 20 0;
-#X msg 167 178 forceX mob 5;
-#X text 409 258 0.2 : rigidity \, 0 : damping \, -2 : power \, 0.4
-: Lmin;
-#X msg 460 386 reset \, dimen 800 800 \, create \, lighting 1 \, 1
-;
-#X msg 52 335 bang \, bang \, get massesPos \, get massesSpeeds;
-#X obj 52 611 route massesPos massesSpeeds;
-#X text 358 111 Sun;
-#X text 267 177 Initial speed;
-#N canvas 0 0 945 455 masses 0;
-#X obj 151 16 inlet;
-#X obj 232 28 inlet;
-#X obj 151 347 outlet;
-#X msg 151 282 mass mob 1 \$1 \$2 \$3;
-#X obj 574 221 random 100;
-#X obj 499 220 random 100;
-#X msg 422 197 seed 3;
-#X obj 151 250 pack f f f;
-#X obj 151 228 t b b b;
-#X msg 499 199 seed 20;
-#X msg 574 201 seed 10;
-#X obj 422 217 random 10000;
-#X obj 424 236 / 500;
-#X obj 500 261 - 1;
-#X obj 574 263 - 1;
-#X obj 425 258 + 205;
-#X obj 499 241 / 10000;
-#X obj 574 242 / 10000;
-#X obj 151 47 t b;
-#X obj 333 52 loadbang;
-#X text 516 172 X;
-#X text 434 168 M;
-#X text 612 173 Y;
-#X obj 151 67 until;
-#X obj 151 86 f;
-#X obj 177 87 + 1;
-#X obj 177 118 mod 1000;
-#X obj 206 87 sel 0;
-#X connect 0 0 18 0;
-#X connect 1 0 26 1;
-#X connect 3 0 2 0;
-#X connect 4 0 17 0;
-#X connect 5 0 16 0;
+#X connect 20 0 22 0;
+#X connect 27 0 26 0;
+#X connect 28 0 21 0;
+#X restore 52 709 pd massrender;
+#X obj 52 672 route massesPos;
+#X connect 1 0 30 0;
+#X connect 2 0 6 0;
+#X connect 3 0 1 0;
+#X connect 4 0 6 0;
 #X connect 6 0 11 0;
-#X connect 7 0 3 0;
-#X connect 8 0 11 0;
-#X connect 8 1 5 0;
-#X connect 8 2 4 0;
-#X connect 9 0 5 0;
-#X connect 10 0 4 0;
-#X connect 11 0 12 0;
-#X connect 12 0 15 0;
-#X connect 13 0 7 1;
-#X connect 14 0 7 2;
-#X connect 15 0 7 0;
-#X connect 16 0 13 0;
-#X connect 17 0 14 0;
-#X connect 18 0 23 0;
-#X connect 19 0 9 0;
-#X connect 19 0 10 0;
-#X connect 19 0 6 0;
-#X connect 23 0 24 0;
-#X connect 24 0 25 0;
-#X connect 24 0 8 0;
-#X connect 25 0 26 0;
-#X connect 26 0 27 0;
-#X connect 26 0 24 1;
-#X connect 27 0 23 1;
-#X restore 203 144 pd masses;
-#X text 410 277 The power of the link is -2 to simulate a gravity field
-in 1/R^2;
-#X text 290 147 Particules;
-#X msg 171 270 link sun fix mob 0.2 0 -2 0.4;
-#X msg 125 508 forceX mob 1;
-#X msg 136 534 forceY mob 1;
-#X connect 0 0 6 0;
-#X connect 1 0 5 0;
-#X connect 2 0 0 0;
-#X connect 3 0 5 0;
-#X connect 5 0 19 0;
-#X connect 5 0 22 0;
-#X connect 5 1 18 0;
-#X connect 5 1 32 0;
-#X connect 5 2 29 0;
-#X connect 5 3 20 0;
-#X connect 5 4 2 0;
-#X connect 6 0 26 0;
-#X connect 7 0 13 0;
-#X connect 8 0 21 0;
-#X connect 10 0 25 0;
-#X connect 12 0 10 0;
-#X connect 14 0 13 0;
-#X connect 17 0 29 1;
-#X connect 18 0 0 0;
-#X connect 19 0 0 0;
-#X connect 20 0 0 0;
-#X connect 21 0 9 0;
-#X connect 22 0 0 0;
-#X connect 24 0 13 0;
-#X connect 25 0 6 0;
-#X connect 26 0 11 0;
-#X connect 29 0 0 0;
-#X connect 32 0 0 0;
-#X connect 33 0 6 0;
-#X connect 34 0 6 0;
+#X connect 6 0 20 0;
+#X connect 6 1 10 0;
+#X connect 6 1 19 0;
+#X connect 6 2 16 0;
+#X connect 6 3 12 0;
+#X connect 6 4 3 0;
+#X connect 9 0 16 1;
+#X connect 10 0 1 0;
+#X connect 11 0 1 0;
+#X connect 12 0 1 0;
+#X connect 16 0 1 0;
+#X connect 19 0 1 0;
+#X connect 20 0 1 0;
+#X connect 22 0 25 0;
+#X connect 23 0 28 0;
+#X connect 26 0 25 0;
+#X connect 27 0 25 0;
+#X connect 28 0 24 0;
+#X connect 30 0 38 0;
+#X connect 31 0 35 0;
+#X connect 32 0 31 0;
+#X connect 33 0 30 0;
+#X connect 34 0 30 0;
+#X connect 35 0 30 0;
+#X connect 38 0 37 0;