Generalized links

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

2 files changed, 143 insertions, 85 deletions

diff --git a/msd3D/03_msd3Dmemb.pd b/msd3D/03_msd3Dmemb.pd
index 244ec73..2cb4e82 100644
--- a/msd3D/03_msd3Dmemb.pd
+++ b/msd3D/03_msd3Dmemb.pd
@@ -1,32 +1,27 @@
-#N canvas 342 69 790 805 10;
+#N canvas 832 113 790 805 10;
 #X obj 32 13 loadbang;
 #X obj 294 641 print msd;
-#X obj 466 735 gemwin;
-#X msg 466 713 0 \, destroy;
+#X obj 461 703 gemwin;
+#X msg 461 681 0 \, destroy;
 #X obj 688 623 gemhead;
 #X obj 688 646 world_light;
-#X msg 466 622 reset \, create \, lighting 1 \, 1;
 #X obj 130 361 t a;
 #X obj 129 18 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262131 -1
 -1;
 #X msg 202 59 reset;
 #X text 167 19 reset;
-#X obj 33 399 gemhead;
 #X msg 65 500 setD souple 0.01;
-#X msg 196 501 setK souple 1;
 #X msg 65 520 setD souple 1;
 #X msg 196 521 setK souple 2;
-#N canvas 284 227 587 558 linkrender 0;
+#N canvas 613 332 587 558 linkrender 1;
 #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 42 266 separator;
 #X obj 44 192 any;
-#X obj 93 164 t b f;
-#X obj 44 265 curve 2;
+#X obj 63 163 t b f;
 #X obj 266 117 / 12.5;
 #X obj 266 140 - 4;
 #X obj 320 118 / 12.5;
@@ -40,34 +35,55 @@
 #X obj 266 189 pack f f f;
 #X msg 266 212 \$1 \$2 \$3;
 #X obj 93 69 unpack f f f f f f f;
-#X connect 0 0 22 0;
+#X obj 136 297 sel 0;
+#X obj 354 24 inlet;
+#X msg 132 418 \$1 \$1 \$1;
+#X obj 139 333 counter 0 2;
+#X obj 44 310 curve2;
+#X obj 133 363 / 2;
+#X msg 268 24 reset;
+#X obj 434 26 inlet;
+#X obj 437 52 t b;
+#X obj 26 41 gemhead 5;
+#X obj 31 222 color 1 1 1;
+#X connect 0 0 20 0;
 #X connect 1 0 2 0;
-#X connect 2 0 8 0;
+#X connect 2 0 14 0;
 #X connect 3 0 4 0;
-#X connect 4 0 16 1;
-#X connect 5 0 7 1;
-#X connect 6 0 9 0;
+#X connect 4 0 14 1;
+#X connect 5 0 25 0;
+#X connect 6 0 31 0;
 #X connect 7 0 6 0;
-#X connect 8 0 7 0;
-#X connect 8 1 16 0;
+#X connect 7 1 21 0;
+#X connect 8 0 9 0;
+#X connect 9 0 18 0;
 #X connect 10 0 11 0;
-#X connect 11 0 20 0;
+#X connect 11 0 18 1;
 #X connect 12 0 13 0;
-#X connect 13 0 20 1;
+#X connect 13 0 14 2;
 #X connect 14 0 15 0;
-#X connect 15 0 16 2;
+#X connect 15 0 25 1;
 #X connect 16 0 17 0;
-#X connect 17 0 9 1;
+#X connect 17 0 18 2;
 #X connect 18 0 19 0;
-#X connect 19 0 20 2;
-#X connect 20 0 21 0;
-#X connect 21 0 9 2;
-#X connect 22 1 1 0;
-#X connect 22 2 3 0;
-#X connect 22 3 14 0;
-#X connect 22 4 10 0;
-#X connect 22 5 12 0;
-#X connect 22 6 18 0;
+#X connect 19 0 25 2;
+#X connect 20 0 7 0;
+#X connect 20 1 1 0;
+#X connect 20 2 3 0;
+#X connect 20 3 12 0;
+#X connect 20 4 8 0;
+#X connect 20 5 10 0;
+#X connect 20 6 16 0;
+#X connect 21 0 24 0;
+#X connect 22 0 24 3;
+#X connect 22 0 26 1;
+#X connect 24 0 26 0;
+#X connect 26 0 23 0;
+#X connect 27 0 24 0;
+#X connect 28 0 29 0;
+#X connect 29 0 27 0;
+#X connect 30 0 6 1;
+#X connect 31 0 5 0;
 #X restore 33 666 pd linkrender;
 #X obj 33 616 msd3D --------------------------------;
 #X msg 62 559 forceZ mob 200;
@@ -79,77 +95,118 @@
 \, 1 11 \, 7 12 \, 8 13 \, 9 14 \, 10 15 \, 11 16 \, 12 17 \, 13 18
 \, 14 19 \, 15 20 \, 16 21 \, 2 17 \, 18 22 \, 19 23 \, 20 24 \, 21
 3;
-#X msg 166 193 mass mob 1 100 \$1 \$2 \$3;
 #X msg 166 130 30 40 40 \, 30 50 40 \, 30 60 40 \, 40 30 40 \, 40 40
 40 \, 40 50 40 \, 40 60 40 \, 40 70 40 \, 50 30 40 \, 50 40 40 \, 50
 50 40 \, 50 60 40 \, 50 70 40 \, 60 30 40 \, 60 40 40 \, 60 50 40 \,
 60 60 40 \, 60 70 40 \, 70 40 40 \, 70 50 40 \, 70 60 40;
-#X msg 466 688 view 0 4 0 0 0 0 0 0 1;
-#X msg 466 646 view 4 0 0.5 0 0 0 0 0 1;
+#X msg 461 656 view 0 4 0 0 0 0 0 0 1;
+#X msg 461 614 view 4 0 0.5 0 0 0 0 0 1;
 #X obj 312 479 f;
 #X floatatom 333 456 5 0 0 0 - - -;
-#X obj 312 403 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1
+#X obj 312 403 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0
 1;
 #X msg 312 504 forceZ mob \$1;
 #X obj 312 423 metro 65;
-#X msg 466 667 view 0 0 4 0 0 0 0 1 0;
+#X msg 461 635 view 0 0 4 0 0 0 0 1 0;
 #X text 370 401 Add a constant force;
-#X msg 33 462 bang \, get linksPos;
 #X obj 33 641 route linksPos;
 #X msg 184 82 mass fix 0 100 30 30 40 \, mass fix 0 100 30 70 40 \,
 mass fix 0 100 70 30 40 \, mass fix 0 100 70 70 40;
 #X msg 527 543 posZ fix \$1;
 #X obj 527 402 vsl 15 128 0 70 0 0 empty empty empty 0 -8 0 8 -262131
--1 -1 7900 1;
+-1 -1 12100 1;
 #X text 559 457 Change altitude of corners;
-#X obj 33 427 t b b b;
 #X text 385 455 Amplitude;
-#X text 362 619 Create window;
-#X text 374 668 Change view;
+#X text 357 587 Create window;
+#X text 369 636 Change view;
 #X obj 130 38 t b b b b b;
 #X text 98 428 Multiple draw;
 #X msg 188 560 forceZ mob -0.1;
-#X msg 130 335 link souple \$1 \$2 10 20;
-#X connect 0 0 42 0;
+#X msg 166 193 mass mob 1 70 \$1 \$2 \$3;
+#X msg 461 590 reset \, dimen 800 800 \, create \, lighting 1 \, 1
+;
+#X msg 130 335 link souple \$1 \$2 2 10;
+#X msg 196 501 setK souple 10;
+#X obj 178 407 repeat 3;
+#X obj 29 109 vsl 15 128 0 30 0 0 empty empty empty 0 -8 0 8 -262144
+-1 -1 423 1;
+#X obj 33 427 t b;
+#X obj 167 701 pix_write;
+#X msg 255 728 file GEM;
+#X msg 259 675 50 50;
+#X msg 315 686 700 700;
+#X obj 35 738 key;
+#X obj 37 764 sel 32;
+#X obj 77 734 t b b;
+#X obj 167 673 gemhead 90;
+#X msg 71 72 posZ fix 70;
+#X msg 69 343 0;
+#X obj 33 399 gemhead 15;
+#X msg 392 687 0;
+#X msg 66 314 1;
+#X obj 128 691 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+-1;
+#X msg 395 425 -100;
+#X msg 15 69 1;
+#X msg 33 462 bang \, get linksPos;
+#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 17 0;
-#X connect 8 0 42 0;
-#X connect 9 0 7 0;
-#X connect 11 0 38 0;
-#X connect 12 0 17 0;
-#X connect 13 0 17 0;
-#X connect 14 0 17 0;
-#X connect 15 0 17 0;
-#X connect 17 0 33 0;
-#X connect 17 1 1 0;
-#X connect 18 0 17 0;
-#X connect 19 0 7 0;
-#X connect 20 0 45 0;
-#X connect 21 0 7 0;
-#X connect 22 0 21 0;
-#X connect 23 0 2 0;
-#X connect 24 0 2 0;
-#X connect 25 0 28 0;
-#X connect 26 0 25 1;
-#X connect 27 0 29 0;
-#X connect 28 0 17 0;
-#X connect 29 0 25 0;
-#X connect 30 0 2 0;
-#X connect 32 0 17 0;
-#X connect 32 0 44 0;
-#X connect 33 0 16 0;
-#X connect 34 0 7 0;
-#X connect 35 0 17 0;
-#X connect 36 0 35 0;
-#X connect 38 0 32 0;
-#X connect 38 1 32 0;
-#X connect 38 2 32 0;
-#X connect 42 0 20 0;
-#X connect 42 1 19 0;
-#X connect 42 2 22 0;
-#X connect 42 3 34 0;
-#X connect 42 4 9 0;
-#X connect 44 0 17 0;
-#X connect 45 0 7 0;
+#X connect 6 0 14 0;
+#X connect 7 0 36 0;
+#X connect 8 0 6 0;
+#X connect 10 0 14 0;
+#X connect 11 0 14 0;
+#X connect 12 0 14 0;
+#X connect 14 0 28 0;
+#X connect 14 1 1 0;
+#X connect 15 0 14 0;
+#X connect 16 0 6 0;
+#X connect 17 0 41 0;
+#X connect 18 0 39 0;
+#X connect 19 0 2 0;
+#X connect 20 0 2 0;
+#X connect 21 0 24 0;
+#X connect 22 0 21 1;
+#X connect 23 0 25 0;
+#X connect 24 0 14 0;
+#X connect 25 0 21 0;
+#X connect 26 0 2 0;
+#X connect 28 0 13 0;
+#X connect 29 0 6 0;
+#X connect 30 0 14 0;
+#X connect 31 0 30 0;
+#X connect 36 0 17 0;
+#X connect 36 0 54 0;
+#X connect 36 1 16 0;
+#X connect 36 2 18 0;
+#X connect 36 3 29 0;
+#X connect 36 3 13 2;
+#X connect 36 4 8 0;
+#X connect 38 0 14 0;
+#X connect 39 0 6 0;
+#X connect 40 0 2 0;
+#X connect 41 0 6 0;
+#X connect 42 0 14 0;
+#X connect 44 0 43 1;
+#X connect 45 0 62 0;
+#X connect 47 0 46 0;
+#X connect 48 0 46 1;
+#X connect 49 0 46 2;
+#X connect 50 0 51 0;
+#X connect 51 0 52 0;
+#X connect 52 0 57 0;
+#X connect 52 1 60 0;
+#X connect 53 0 46 0;
+#X connect 54 0 6 0;
+#X connect 55 0 24 0;
+#X connect 55 0 21 1;
+#X connect 56 0 45 0;
+#X connect 57 0 2 0;
+#X connect 58 0 2 0;
+#X connect 59 0 46 0;
+#X connect 60 0 22 0;
+#X connect 60 0 21 1;
+#X connect 60 0 24 0;
+#X connect 61 0 44 0;
+#X connect 62 0 14 0;
diff --git a/msd3D/06_msd3Dcylindre.pd b/msd3D/06_msd3Dcylindre.pd
index e25967f..2172c15 100644
--- a/msd3D/06_msd3Dcylindre.pd
+++ b/msd3D/06_msd3Dcylindre.pd
@@ -87,7 +87,7 @@
 #X obj 405 213 random 50;
 #X msg 213 130 mass fix 0 100 50 50 50;
 #X obj 34 141 vradio 20 1 0 3 \$0-choix empty empty 0 -6 0 8 -262144
--1 -1 2;
+-1 -1 1;
 #N canvas 82 198 791 599 cylindertype 0;
 #X obj 49 14 inlet;
 #X obj 248 503 outlet;
@@ -138,7 +138,8 @@
 #X text 63 164 Rings;
 #X text 63 184 Obstacle;
 #X obj 434 22 nbx 5 14 200 20000 1 0 empty empty empty 0 -6 0 10 -262144
--1 -1 1473.05 256;
+-1 -1 874.289 256;
+#X text 132 758 NOT UPDATED;
 #X connect 0 0 17 0;
 #X connect 1 0 5 0;
 #X connect 2 0 0 0;