Link and Mass structures now carry info about physical parameters, this is settable

on creation of links.

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

1 files changed, 134 insertions, 47 deletions

diff --git a/msd2D/editor/morelinks.pd b/msd2D/editor/morelinks.pd
index 439145a..d5d8073 100644
--- a/msd2D/editor/morelinks.pd
+++ b/msd2D/editor/morelinks.pd
@@ -1,8 +1,7 @@
-#N canvas 225 469 136 103 10;
+#N canvas 225 469 135 183 10;
 #N canvas 375 417 614 523 left-right-links 0;
 #X msg 111 227 vnext 1;
 #X obj 192 225 pointer mass;
-#X obj 184 454 link2masses;
 #X obj 184 423 pack p p;
 #X msg 192 193 traverse pd-data \, vnext 1;
 #X obj 191 150 inlet;
@@ -22,25 +21,28 @@ to right and create links between two neighbor masses like:;
 #X obj 184 385 spigot;
 #X msg 206 321 1;
 #X text 258 384 Skip the first mass;
+#X obj 184 454 link2masses;
+#X obj 256 416 r \$0-link-param;
 #X connect 0 0 1 0;
-#X connect 1 0 13 0;
+#X connect 1 0 12 0;
 #X connect 1 1 0 0;
-#X connect 3 0 2 0;
-#X connect 4 0 1 0;
-#X connect 5 0 12 0;
-#X connect 8 0 7 0;
-#X connect 12 0 4 0;
-#X connect 12 1 16 0;
-#X connect 12 2 8 0;
-#X connect 13 0 0 0;
-#X connect 13 1 18 0;
-#X connect 13 2 15 0;
-#X connect 14 0 12 0;
-#X connect 15 0 3 1;
-#X connect 15 1 17 0;
-#X connect 16 0 17 1;
-#X connect 17 0 3 0;
-#X connect 18 0 17 1;
+#X connect 2 0 19 0;
+#X connect 3 0 1 0;
+#X connect 4 0 11 0;
+#X connect 7 0 6 0;
+#X connect 11 0 3 0;
+#X connect 11 1 15 0;
+#X connect 11 2 7 0;
+#X connect 12 0 0 0;
+#X connect 12 1 17 0;
+#X connect 12 2 14 0;
+#X connect 13 0 11 0;
+#X connect 14 0 2 1;
+#X connect 14 1 16 0;
+#X connect 15 0 16 1;
+#X connect 16 0 2 0;
+#X connect 17 0 16 1;
+#X connect 20 0 19 1;
 #X restore 141 68 pd left-right-links;
 #X obj 2 19 cnv 15 130 80 empty empty empty 20 12 0 14 -233017 -66577
 0;
@@ -48,7 +50,6 @@ to right and create links between two neighbor masses like:;
 -1 -1;
 #N canvas 487 247 771 749 one-to-many 0;
 #X obj 203 173 pointer mass;
-#X obj 182 473 link2masses;
 #X obj 182 442 pack p p;
 #X msg 203 141 traverse pd-data \, vnext 1;
 #X obj 132 337 t b p;
@@ -62,29 +63,31 @@ to right and create links between two neighbor masses like:;
 #X msg 274 325 label one2many-Start;
 #X msg 281 351 label one2many-Ends;
 #X obj 69 146 select 0 1;
-#X connect 0 0 8 0;
-#X connect 2 0 1 0;
-#X connect 3 0 0 0;
-#X connect 4 0 7 0;
-#X connect 4 1 2 0;
-#X connect 5 0 14 0;
-#X connect 6 0 4 0;
-#X connect 6 1 7 0;
-#X connect 6 2 12 0;
-#X connect 7 0 6 0;
-#X connect 8 0 13 0;
-#X connect 8 1 2 1;
-#X connect 9 0 7 0;
-#X connect 9 1 10 0;
-#X connect 10 0 6 0;
-#X connect 12 0 11 0;
-#X connect 13 0 11 0;
-#X connect 14 0 9 0;
-#X connect 14 1 3 0;
+#X obj 182 473 link2masses;
+#X obj 254 440 r \$0-link-param;
+#X connect 0 0 7 0;
+#X connect 1 0 14 0;
+#X connect 2 0 0 0;
+#X connect 3 0 6 0;
+#X connect 3 1 1 0;
+#X connect 4 0 13 0;
+#X connect 5 0 3 0;
+#X connect 5 1 6 0;
+#X connect 5 2 11 0;
+#X connect 6 0 5 0;
+#X connect 7 0 12 0;
+#X connect 7 1 1 1;
+#X connect 8 0 6 0;
+#X connect 8 1 9 0;
+#X connect 9 0 5 0;
+#X connect 11 0 10 0;
+#X connect 12 0 10 0;
+#X connect 13 0 8 0;
+#X connect 13 1 2 0;
+#X connect 15 0 14 1;
 #X restore 143 95 pd one-to-many;
-#X obj 9 80 tgl 15 0 empty empty one2many-Start 20 8 0 8 -262131 -1
+#X obj 10 76 tgl 15 0 empty empty one2many-Start 20 8 0 8 -262131 -1
 -1 0 1;
-#X obj 149 46 ilinker;
 #X obj 10 31 bng 15 250 50 0 empty empty all_selected 20 8 0 8 -241291
 -1 -1;
 #X obj 107 30 tgl 15 0 empty empty Key:L -3 -6 0 8 -24198 -1 -1 0 1
@@ -92,12 +95,96 @@ to right and create links between two neighbor masses like:;
 #X obj 211 6 keyup;
 #X obj 211 48 select 108;
 #X obj 211 27 spigot;
+#X obj 2 101 cnv 15 130 80 empty empty Link_Params 10 10 0 10 -195568
+-1 0;
+#X obj 44 121 nbx 5 14 -1e+37 1e+37 0 0 \$0-K \$0-K K -12 8 0 10 -225271
+-1 -1 10 256;
+#X obj 44 156 nbx 5 14 -1e+37 1e+37 0 0 \$0-D2 \$0-D2 D2 -22 8 0 10
+-225271 -1 -1 1.5 256;
+#X obj 44 138 nbx 5 14 -1e+37 1e+37 0 0 \$0-D \$0-D D -12 8 0 10 -225271
+-1 -1 2.5 256;
+#N canvas 374 319 630 363 linkparam 0;
+#X obj 40 195 s \$0-link-param;
+#X obj 40 162 pack 0 0 0;
+#X obj 50 128 t b f;
+#X obj 93 130 t b f;
+#X obj 40 51 r \$0-K;
+#X obj 50 80 r \$0-D;
+#X obj 93 104 r \$0-D2;
+#X obj 240 240 s \$0-K;
+#X obj 320 233 s \$0-D;
+#X obj 402 236 s \$0-D2;
+#X obj 240 147 f \$1;
+#X obj 320 157 f \$2;
+#X obj 402 156 f \$3;
+#X obj 240 178 select 0;
+#X msg 240 204 10;
+#X obj 320 181 select 0;
+#X obj 402 177 select 0;
+#X msg 320 207 2.5;
+#X msg 402 203 1.5;
+#X obj 300 97 loadbang;
+#X text 295 75 Init;
+#X connect 1 0 0 0;
+#X connect 2 0 1 0;
+#X connect 2 1 1 1;
+#X connect 3 0 1 0;
+#X connect 3 1 1 2;
+#X connect 4 0 1 0;
+#X connect 5 0 2 0;
+#X connect 6 0 3 0;
+#X connect 10 0 13 0;
+#X connect 11 0 15 0;
+#X connect 12 0 16 0;
+#X connect 13 0 14 0;
+#X connect 13 1 7 0;
+#X connect 14 0 7 0;
+#X connect 15 0 17 0;
+#X connect 15 1 8 0;
+#X connect 16 0 18 0;
+#X connect 16 1 9 0;
+#X connect 17 0 8 0;
+#X connect 18 0 9 0;
+#X connect 19 0 10 0;
+#X connect 19 0 11 0;
+#X connect 19 0 12 0;
+#X restore 145 127 pd linkparam;
+#N canvas 0 0 483 507 ilinker 0;
+#X obj 195 306 pointer mass;
+#X msg 147 260 vnext 1;
+#X msg 274 218 vnext 1;
+#X obj 197 167 pointer mass;
+#X obj 197 190 t b p;
+#X obj 177 418 link2masses;
+#X obj 177 387 pack p p;
+#X msg 197 135 traverse pd-data \, vnext 1;
+#X obj 147 330 t b p;
+#X obj 197 106 inlet;
+#X text 111 48 This will create all possible links between all selected
+masses like iLink.;
+#X obj 249 386 r \$0-link-param;
+#X connect 0 0 8 0;
+#X connect 0 1 1 0;
+#X connect 0 2 2 0;
+#X connect 1 0 0 0;
+#X connect 2 0 3 0;
+#X connect 3 0 4 0;
+#X connect 3 1 2 0;
+#X connect 4 0 1 0;
+#X connect 4 1 6 1;
+#X connect 4 1 0 1;
+#X connect 6 0 5 0;
+#X connect 7 0 3 0;
+#X connect 8 0 1 0;
+#X connect 8 1 6 0;
+#X connect 9 0 7 0;
+#X connect 11 0 5 1;
+#X restore 137 46 pd ilinker;
 #X connect 2 0 0 0;
 #X connect 3 0 4 0;
 #X connect 4 0 3 0;
-#X connect 6 0 5 0;
-#X connect 7 0 10 1;
-#X connect 8 0 10 0;
-#X connect 9 0 5 0;
-#X connect 10 0 9 0;
-#X coords 0 0 1 1 132 100 1;
+#X connect 5 0 15 0;
+#X connect 6 0 9 1;
+#X connect 7 0 9 0;
+#X connect 9 0 8 0;
+#X coords 0 0 1 1 132 180 1;