Some bugs fixed

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

2 files changed, 53 insertions, 44 deletions

diff --git a/msd2D/02_msd2Dadd.pd b/msd2D/02_msd2Dadd.pd
index 95c6173..0f498f7 100644
--- a/msd2D/02_msd2Dadd.pd
+++ b/msd2D/02_msd2Dadd.pd
@@ -219,45 +219,47 @@
 #X connect 92 0 61 0;
 #X connect 93 0 64 0;
 #X restore 230 679 pd synthese;
-#X obj 295 454 gemhead;
+#X obj 10 698 gemhead;
 #X msg 155 258 Xmax 100 \, Xmin 0 \, Ymax 100 \, Ymin 0;
 #X msg 511 503 reset \, create \, lighting 1 \, 1;
 #X obj 52 399 t b;
-#N canvas 643 123 605 590 massrender 0;
+#N canvas 643 123 605 590 massrender 1;
 #X obj 127 22 inlet;
-#X obj 62 231 translateXYZ;
+#X obj 62 267 translateXYZ;
 #X obj 141 87 / 12.5;
 #X obj 141 110 - 4;
 #X obj 206 88 / 12.5;
 #X obj 206 111 - 4;
 #X obj 78 115 gemhead;
-#X obj 62 205 separator;
+#X obj 62 241 separator;
 #X obj 62 181 any;
 #X obj 127 57 unpack f f f;
-#X obj 185 178 f;
-#X msg 185 241 \$1;
+#X obj 212 182 f;
+#X msg 212 241 \$1;
 #X obj 141 137 t b b f;
-#X obj 185 221 / 99;
-#X obj 185 199 - 29;
-#X obj 62 322 sphere 0.1;
+#X obj 62 314 sphere 0.1;
+#X obj 62 219 colorRGB 1 1 1;
+#X obj 212 221 / 29;
 #X connect 0 0 9 0;
-#X connect 1 0 15 0;
+#X connect 1 0 13 0;
 #X connect 2 0 3 0;
 #X connect 3 0 12 0;
 #X connect 4 0 5 0;
 #X connect 5 0 1 2;
 #X connect 6 0 8 1;
 #X connect 7 0 1 0;
-#X connect 8 0 7 0;
+#X connect 8 0 14 0;
 #X connect 9 0 10 1;
 #X connect 9 1 2 0;
 #X connect 9 2 4 0;
-#X connect 10 0 14 0;
-#X connect 12 0 10 0;
+#X connect 10 0 15 0;
+#X connect 11 0 14 2;
+#X connect 11 0 14 3;
 #X connect 12 1 8 0;
+#X connect 12 1 10 0;
 #X connect 12 2 1 1;
-#X connect 13 0 11 0;
-#X connect 14 0 13 0;
+#X connect 14 0 7 0;
+#X connect 15 0 11 0;
 #X restore 141 657 pd massrender;
 #N canvas 284 227 587 558 linkrender 0;
 #X obj 93 25 inlet;
@@ -324,15 +326,10 @@
 #X obj 173 148 t b b b;
 #X obj 52 358 gemhead;
 #X obj 511 547 gemwin;
-#X obj 52 628 route linksPos massesPos massesSpeedsNo;
-#X msg 71 498 forceX mob -200;
-#X msg 52 420 bang \, get massesPos \, get linksPos \, get massesSpeeds
-1 5 9 13 17 21 25 29;
-#X msg 71 478 forceX mob 200;
 #X text 175 41 Reset;
 #X text 484 171 Random positions and masses;
-#X text 370 502 1 Create window -->;
-#X text 196 484 Add force;
+#X text 367 502 1 Create window -->;
+#X text 225 498 Add force;
 #X msg 522 585 \; pd dsp 1;
 #X text 396 591 2 SET DSP ON -->;
 #N canvas 311 224 409 530 gemmouse2 0;
@@ -357,31 +354,39 @@
 #X connect 7 0 6 0;
 #X connect 8 0 9 0;
 #X connect 9 0 1 0;
-#X restore 295 476 pd gemmouse2;
-#X msg 295 518 grabMass \$1 \$2 \$3;
+#X restore 10 720 pd gemmouse2;
+#X msg 10 762 grabMass \$1 \$2 \$3;
 #X obj 173 126 repeat 30;
 #X obj 79 187 repeat 29;
 #X msg 129 348 link souple \$1 \$2 10 0.5 0.5;
+#X text 130 713 Move red masses for bass and white ones for high tones...
+!Index errors;
+#X obj 52 628 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 684 print;
+#X msg 95 518 forceX mob -1000;
+#X msg 94 492 forceX mob 1000;
 #X connect 0 0 6 0;
 #X connect 1 0 4 0;
 #X connect 2 0 0 0;
 #X connect 3 0 4 0;
-#X connect 4 0 50 0;
+#X connect 4 0 46 0;
 #X connect 4 1 12 0;
-#X connect 4 2 49 0;
+#X connect 4 2 45 0;
 #X connect 4 4 2 0;
 #X connect 4 4 31 0;
 #X connect 4 4 23 0;
 #X connect 4 4 19 0;
 #X connect 4 4 22 0;
-#X connect 6 0 37 0;
+#X connect 6 0 49 0;
 #X connect 6 1 5 0;
 #X connect 7 0 36 0;
 #X connect 8 0 9 0;
-#X connect 11 0 47 0;
+#X connect 11 0 43 0;
 #X connect 12 0 0 0;
 #X connect 13 0 36 0;
-#X connect 14 0 39 0;
+#X connect 14 0 50 0;
 #X connect 17 0 0 0;
 #X connect 18 0 25 2;
 #X connect 19 0 18 0;
@@ -401,19 +406,19 @@
 #X connect 30 1 28 0;
 #X connect 31 0 32 1;
 #X connect 32 0 27 0;
-#X connect 33 0 51 0;
+#X connect 33 0 47 0;
 #X connect 34 0 21 0;
 #X connect 34 1 20 0;
 #X connect 34 2 18 0;
 #X connect 35 0 14 0;
-#X connect 37 0 16 0;
-#X connect 37 1 15 0;
-#X connect 37 2 10 0;
-#X connect 38 0 6 0;
-#X connect 39 0 6 0;
-#X connect 40 0 6 0;
-#X connect 47 0 48 0;
-#X connect 48 0 6 0;
-#X connect 49 0 34 0;
-#X connect 50 0 26 0;
-#X connect 51 0 0 0;
+#X connect 43 0 44 0;
+#X connect 44 0 6 0;
+#X connect 45 0 34 0;
+#X connect 46 0 26 0;
+#X connect 47 0 0 0;
+#X connect 49 0 16 0;
+#X connect 49 1 15 0;
+#X connect 49 2 10 0;
+#X connect 50 0 6 0;
+#X connect 52 0 6 0;
+#X connect 53 0 6 0;
diff --git a/msd2D/help-msd2D.pd b/msd2D/help-msd2D.pd
index f40ee81..f4b3208 100644
--- a/msd2D/help-msd2D.pd
+++ b/msd2D/help-msd2D.pd
@@ -20,7 +20,7 @@
 #X text 350 431 Set position of mass(es);
 #X text 347 486 Add force on mass(es);
 #X msg 85 485 forceX \$1 \$2;
-#X obj 61 617 cnv 15 610 230 empty empty GET_ATTRIBUTES 20 12 0 14
+#X obj 61 617 cnv 15 610 260 empty empty GET_ATTRIBUTES 20 12 0 14
 -261689 -66577 0;
 #X msg 147 644 massePosL;
 #X msg 147 694 masseForcesL;
@@ -35,7 +35,7 @@
 #X msg 79 290 deleteMass \$1;
 #X text 248 292 Delete a mass and associated links;
 #X text 338 309 \$1 : Creation No of mass;
-#X msg 144 815 infosL;
+#X msg 144 813 infosL;
 #X text 247 815 Get infos on all masses and links on outlet No 2;
 #X text 347 555 \$1 : Value;
 #X text 73 22 MASSES :;
@@ -64,6 +64,10 @@ their;
 #X msg 147 669 massePosYL;
 #X text 248 669 output all masses x/y position in a list on outlet
 No 1;
+#X msg 112 838 grabMass \$1 \$2 \$3;
+#X text 247 838 Get nearest mass and grab it;
+#X text 112 857 \$1 \, \$2 : X \, Y position of mouse;
+#X text 357 857 \$3 : grab or not (left click);
 #X connect 1 0 44 0;
 #X connect 8 0 44 0;
 #X connect 13 0 44 0;
@@ -77,7 +81,7 @@ No 1;
 #X connect 41 0 44 0;
 #X connect 46 0 44 0;
 #X connect 50 0 44 0;
-#X restore 222 312 pd masses;
+#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 :;