aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorN.N. <nimon@users.sourceforge.net>2006-04-08 10:35:25 +0000
committerN.N. <nimon@users.sourceforge.net>2006-04-08 10:35:25 +0000
commit40d572f52d16222486b694c7ec453a25830bcb35 (patch)
tree6de031327969a2dbfd48a236f68c2c5db9286ce4
parentf5e65426ea3c0e7d34eb28ea20550cdfc817bcdb (diff)
msdwave updated
svn path=/trunk/externals/nusmuk/; revision=4847
-rw-r--r--msd/03_msdwave.pd138
-rw-r--r--msd/filet.pd102
2 files changed, 126 insertions, 114 deletions
diff --git a/msd/03_msdwave.pd b/msd/03_msdwave.pd
index 1532213..5f913ff 100644
--- a/msd/03_msdwave.pd
+++ b/msd/03_msdwave.pd
@@ -1,4 +1,4 @@
-#N canvas 303 67 947 811 10;
+#N canvas 493 42 947 811 10;
#X obj 32 13 loadbang;
#X obj 603 265 gemwin;
#X msg 603 243 0 \, destroy;
@@ -16,23 +16,24 @@
#X obj 48 153 any;
#X obj 127 136 t b f;
#X obj 127 57 unpack f f f;
-#X obj 48 283 cuboid 0.065 0.065 0.07;
#X obj 64 114 gemhead 45;
+#X obj 48 239 color 0.2 0.2 0.2;
+#X obj 48 283 cuboid 0.005 0.15 0.08;
#X connect 0 0 5 0;
-#X connect 1 0 6 0;
+#X connect 1 0 7 0;
#X connect 2 0 1 0;
#X connect 3 0 2 0;
#X connect 4 0 3 0;
#X connect 4 1 1 1;
#X connect 5 0 4 0;
#X connect 5 1 1 2;
-#X connect 5 2 6 3;
-#X connect 7 0 3 1;
+#X connect 5 2 8 3;
+#X connect 6 0 3 1;
+#X connect 7 0 8 0;
#X restore 274 531 pd massrender;
#X msg 203 83 symbol reset;
#X text 793 205 Select view;
#X obj 145 38 t b b b b;
-#X text 418 114 Filet abstraction : x0 y0 stepx stepy ny nx;
#X obj 63 403 msd -------------;
#X obj 425 423 msd2D --------------------------------;
#X obj 305 254 route mass;
@@ -55,16 +56,11 @@
#X obj 112 547 vsl 15 128 0 4 0 0 empty empty empty 0 -8 0 8 -262131
-1 -1 0 1;
#X msg 56 682 posX 0 \$1;
-#X msg 621 311 45;
-#X msg 603 223 view 4 0 0.5 0 0 0 0 0 1;
-#X msg 603 185 view 0 0.5 6 0 0 0 0 1 0;
-#X msg 650 311 45;
#X msg 603 138 reset \, dimen 800 800 \, create \, lighting 1 \, 1
;
#X msg 145 173 Xmax 4 \, Xmin -4 \, Ymax 4 \, Ymin -4;
#X msg 145 199 Xmax 4 \, Xmin -4;
#X obj 603 161 t b;
-#X obj 183 113 filet -3.2 -2 0.1685 0.1685 20 40;
#X msg 164 140 setFixed 0 \, setFixed 39 \, setFixed 760 \, setFixed
799;
#X msg 603 204 view 0 5 0 0 0 0 0 0 1;
@@ -72,7 +68,7 @@
#X msg 94 722 posX 799 \$1;
#X msg 112 742 posX 760 \$1;
#X text 28 514 Move corners to send a wave!;
-#X text 330 559 Each time a mass2D position is send \, the corresponding
+#X text 327 559 Each time a mass2D position is send \, the corresponding
z is asked to the 1D model.;
#X text 389 35 X-Y : 2D model;
#X text 389 49 Z : 1D model;
@@ -86,63 +82,75 @@ test synchronization between msd objects;
#X obj 91 462 unpack f f;
#X obj 481 502 f;
#X obj 425 485 t b f;
+#X msg 611 72 border 1;
+#X text 453 114 Filet abstraction : x0 y0 stepx stepy ny nx M;
+#X msg 603 223 view 5 -1 0.5 0 0 0 0 0 1;
+#X msg 714 275 color 1 1 1;
+#X msg 621 311 45;
+#X msg 650 311 45;
+#X msg 603 185 view 0 0.5 6 0 0 0 0 1 0;
+#X msg 709 318 view 0 0.3 6 0 0 0 0 1 0;
+#X obj 183 113 filet -3.2 -3 0.1685 0.3 20 40 100;
#X connect 0 0 12 0;
#X connect 2 0 1 0;
-#X connect 3 0 26 0;
-#X connect 5 0 16 0;
-#X connect 5 0 18 0;
+#X connect 3 0 25 0;
+#X connect 5 0 15 0;
+#X connect 5 0 17 0;
#X connect 6 0 12 0;
#X connect 7 0 5 0;
-#X connect 8 0 22 0;
-#X connect 10 0 40 1;
-#X connect 12 0 37 0;
-#X connect 12 0 38 0;
-#X connect 12 1 41 0;
-#X connect 12 2 40 0;
+#X connect 8 0 21 0;
+#X connect 10 0 60 1;
+#X connect 12 0 32 0;
+#X connect 12 0 33 0;
+#X connect 12 1 35 0;
+#X connect 12 2 60 0;
#X connect 12 3 7 0;
#X connect 12 3 10 0;
-#X connect 14 0 24 0;
-#X connect 15 0 20 0;
-#X connect 16 0 17 0;
-#X connect 16 1 14 0;
-#X connect 17 0 14 0;
-#X connect 18 0 19 0;
-#X connect 18 1 15 0;
-#X connect 19 0 15 0;
-#X connect 20 0 54 0;
-#X connect 21 0 15 0;
-#X connect 22 0 21 0;
-#X connect 22 1 14 0;
-#X connect 23 0 9 0;
-#X connect 24 0 55 0;
-#X connect 25 0 14 0;
-#X connect 26 0 4 0;
-#X connect 27 0 31 0;
-#X connect 28 0 43 0;
-#X connect 29 0 44 0;
-#X connect 30 0 45 0;
-#X connect 31 0 14 0;
-#X connect 32 0 26 1;
-#X connect 33 0 1 0;
-#X connect 34 0 1 0;
-#X connect 35 0 26 2;
+#X connect 13 0 23 0;
+#X connect 14 0 19 0;
+#X connect 15 0 16 0;
+#X connect 15 1 13 0;
+#X connect 16 0 13 0;
+#X connect 17 0 18 0;
+#X connect 17 1 14 0;
+#X connect 18 0 14 0;
+#X connect 19 0 48 0;
+#X connect 20 0 14 0;
+#X connect 21 0 20 0;
+#X connect 21 1 13 0;
+#X connect 22 0 9 0;
+#X connect 23 0 49 0;
+#X connect 24 0 13 0;
+#X connect 25 0 4 0;
+#X connect 26 0 30 0;
+#X connect 27 0 37 0;
+#X connect 28 0 38 0;
+#X connect 29 0 39 0;
+#X connect 30 0 13 0;
+#X connect 31 0 1 0;
+#X connect 31 0 34 0;
+#X connect 32 0 14 0;
+#X connect 33 0 13 0;
+#X connect 34 0 58 0;
+#X connect 34 0 57 0;
+#X connect 34 0 56 0;
+#X connect 35 0 5 0;
#X connect 36 0 1 0;
-#X connect 36 0 39 0;
-#X connect 37 0 15 0;
-#X connect 38 0 14 0;
-#X connect 39 0 34 0;
-#X connect 39 0 35 0;
-#X connect 39 0 32 0;
-#X connect 40 0 5 0;
-#X connect 41 0 5 0;
-#X connect 42 0 1 0;
-#X connect 43 0 14 0;
-#X connect 44 0 14 0;
-#X connect 45 0 14 0;
-#X connect 54 0 57 0;
-#X connect 54 1 56 1;
-#X connect 54 2 23 1;
-#X connect 55 1 23 2;
-#X connect 56 0 23 0;
-#X connect 57 0 56 0;
-#X connect 57 1 25 0;
+#X connect 37 0 13 0;
+#X connect 38 0 13 0;
+#X connect 39 0 13 0;
+#X connect 48 0 51 0;
+#X connect 48 1 50 1;
+#X connect 48 2 22 1;
+#X connect 49 1 22 2;
+#X connect 50 0 22 0;
+#X connect 51 0 50 0;
+#X connect 51 1 24 0;
+#X connect 52 0 1 0;
+#X connect 54 0 1 0;
+#X connect 55 0 1 0;
+#X connect 56 0 25 1;
+#X connect 57 0 25 2;
+#X connect 58 0 1 0;
+#X connect 59 0 1 0;
+#X connect 60 0 5 0;
diff --git a/msd/filet.pd b/msd/filet.pd
index e6f55fa..c307f66 100644
--- a/msd/filet.pd
+++ b/msd/filet.pd
@@ -10,7 +10,6 @@
#X obj 46 188 + 1;
#X msg 297 77 -1;
#X obj 46 211 t f f;
-#X obj 150 323 pack f f;
#X obj 46 50 inlet;
#X obj 297 28 select reset;
#X obj 297 5 inlet;
@@ -24,7 +23,6 @@
#X obj 176 278 + \$2;
#X obj 46 234 mod \$6;
#X obj 176 234 div \$6;
-#X text 445 35 x0 y0 xstep ystep M N;
#X obj 414 314 - 1;
#X obj 357 297 mod \$6;
#X obj 474 300 div \$6;
@@ -43,15 +41,19 @@
#X obj 46 257 * \$3;
#X obj 176 256 * \$4;
#X msg 335 468 link fil \$1 \$2 10 10;
-#X msg 54 359 mass filet 1 10 \$1 \$2 0;
+#X obj 150 323 pack f f 50;
+#X obj 228 269 loadbang;
+#X obj 230 300 f \$7;
+#X msg 54 359 mass filet 1 \$3 \$1 \$2 0;
+#X text 325 106 Filet abstraction : x0 y0 stepx stepy ny nx M;
#X connect 1 0 5 0;
-#X connect 1 0 40 0;
+#X connect 1 0 38 0;
#X connect 2 0 5 1;
-#X connect 2 0 26 0;
+#X connect 2 0 24 0;
#X connect 3 0 6 0;
#X connect 4 0 7 0;
#X connect 5 0 4 1;
-#X connect 5 0 19 0;
+#X connect 5 0 18 0;
#X connect 6 2 1 0;
#X connect 6 3 2 0;
#X connect 6 3 9 0;
@@ -59,48 +61,50 @@
#X connect 8 0 7 1;
#X connect 8 0 10 0;
#X connect 9 0 7 1;
-#X connect 9 0 17 1;
-#X connect 10 0 23 0;
-#X connect 10 1 24 0;
-#X connect 11 0 44 0;
-#X connect 12 0 15 0;
-#X connect 13 0 9 0;
-#X connect 13 0 31 0;
-#X connect 14 0 13 0;
+#X connect 9 0 16 1;
+#X connect 10 0 22 0;
+#X connect 10 1 23 0;
+#X connect 11 0 14 0;
+#X connect 12 0 9 0;
+#X connect 12 0 29 0;
+#X connect 13 0 12 0;
+#X connect 14 0 15 0;
+#X connect 14 1 4 0;
#X connect 15 0 16 0;
-#X connect 15 1 4 0;
#X connect 16 0 17 0;
-#X connect 17 0 18 0;
-#X connect 18 0 17 1;
-#X connect 18 0 34 0;
-#X connect 19 0 16 1;
-#X connect 20 0 32 0;
-#X connect 21 0 11 0;
-#X connect 22 0 11 1;
-#X connect 23 0 41 0;
-#X connect 24 0 42 0;
-#X connect 26 0 20 1;
-#X connect 27 0 20 0;
-#X connect 28 0 35 0;
-#X connect 29 0 30 1;
-#X connect 30 0 43 0;
-#X connect 31 0 1 0;
-#X connect 31 1 2 0;
-#X connect 32 0 33 0;
-#X connect 33 0 30 0;
-#X connect 34 0 27 0;
-#X connect 34 1 29 0;
-#X connect 34 1 33 1;
-#X connect 34 2 28 0;
-#X connect 34 3 39 0;
-#X connect 34 3 38 1;
-#X connect 35 0 37 0;
-#X connect 36 0 43 0;
-#X connect 37 0 38 0;
-#X connect 38 0 36 0;
-#X connect 39 0 36 1;
-#X connect 40 0 35 1;
-#X connect 41 0 21 0;
-#X connect 42 0 22 0;
-#X connect 43 0 0 0;
-#X connect 44 0 0 0;
+#X connect 17 0 16 1;
+#X connect 17 0 32 0;
+#X connect 18 0 15 1;
+#X connect 19 0 30 0;
+#X connect 20 0 42 0;
+#X connect 21 0 42 1;
+#X connect 22 0 39 0;
+#X connect 23 0 40 0;
+#X connect 24 0 19 1;
+#X connect 25 0 19 0;
+#X connect 26 0 33 0;
+#X connect 27 0 28 1;
+#X connect 28 0 41 0;
+#X connect 29 0 1 0;
+#X connect 29 1 2 0;
+#X connect 30 0 31 0;
+#X connect 31 0 28 0;
+#X connect 32 0 25 0;
+#X connect 32 1 27 0;
+#X connect 32 1 31 1;
+#X connect 32 2 26 0;
+#X connect 32 3 37 0;
+#X connect 32 3 36 1;
+#X connect 33 0 35 0;
+#X connect 34 0 41 0;
+#X connect 35 0 36 0;
+#X connect 36 0 34 0;
+#X connect 37 0 34 1;
+#X connect 38 0 33 1;
+#X connect 39 0 20 0;
+#X connect 40 0 21 0;
+#X connect 41 0 0 0;
+#X connect 42 0 45 0;
+#X connect 43 0 44 0;
+#X connect 44 0 42 2;
+#X connect 45 0 0 0;