1 files changed, 257 insertions, 236 deletions
diff --git a/externals/gridflow/pd_examples/waves.pd b/externals/gridflow/pd_examples/waves.pd
index c9706ca4..14dd10e5 100644
--- a/externals/gridflow/pd_examples/waves.pd
+++ b/externals/gridflow/pd_examples/waves.pd
@@ -1,10 +1,8 @@
-#N canvas 366 97 753 590 10;
-#X obj 265 207 #greyscale_to_rgb;
-#X obj 251 350 # min 255;
-#X obj 271 5 loadbang;
-#X obj 211 25 fork;
-#X obj 251 389 #out x11;
-#X obj 313 409 print;
+#N canvas 461 0 783 699 10;
+#X obj 245 341 #greyscale_to_rgb;
+#X obj 167 66 loadbang;
+#X obj 107 85 fork;
+#X obj 241 497 print;
 #N canvas 23 304 369 368 mouse 0;
 #X text 109 189 coordinates;
 #X obj 56 189 outlet;
@@ -29,42 +27,41 @@
 #X connect 11 0 3 0;
 #X connect 11 1 12 0;
 #X connect 12 0 6 0;
-#X restore 251 428 pd mouse click/drag;
-#X obj 12 39 tgl 15 0 empty empty empty 0 -6 0 8 -241291 -1 -1 1 1
-;
-#N canvas 637 335 419 287 lighting 0;
-#X obj 56 243 outlet;
+#X restore 235 516 pd mouse click/drag;
+#X obj 10 49 tgl 15 0 empty empty empty 0 -6 0 8 -24198 -1 -1 0 1;
+#N canvas 637 335 413 236 lighting 0;
+#X obj 56 203 outlet;
 #X obj 17 9 inlet;
-#X obj 86 138 #outer & ( -1 0 0 );
-#X text 91 100 produce red/cyan from horiz differences;
-#X text 64 160 produce white/black from vertical differences;
-#X obj 56 199 #outer & ( -1 -1 0 );
-#X obj 56 222 # +;
+#X text 91 65 produce red/cyan from horiz differences;
+#X text 64 123 produce white/black from vertical differences;
+#X obj 56 177 # +;
 #X obj 108 10 #dim;
 #X obj 140 10 #export_list;
-#X obj 56 29 #redim ( );
 #X obj 56 9 t a a;
 #X obj 56 49 t a a;
 #X msg 141 30 \$1 \$2;
-#X obj 86 117 #convolve ( 1 2 # ) \, op ignore \, fold inv+;
-#X obj 56 177 #convolve ( 2 1 # ) \, op ignore \, fold inv+;
-#X connect 1 0 10 0;
-#X connect 2 0 6 1;
+#X obj 56 29 #redim ();
+#X obj 86 82 #convolve (1 2 #) \, op ignore \, fold inv+;
+#X obj 86 101 #outer & (-1 0 0);
+#X obj 56 139 #convolve (2 1 #) \, op ignore \, fold inv+;
+#X obj 56 158 #outer & (-1 -1 0);
+#X connect 1 0 7 0;
+#X connect 4 0 0 0;
 #X connect 5 0 6 0;
-#X connect 6 0 0 0;
-#X connect 7 0 8 0;
-#X connect 8 0 12 0;
-#X connect 9 0 11 0;
-#X connect 10 0 9 0;
-#X connect 10 1 7 0;
-#X connect 11 0 14 0;
-#X connect 11 1 13 0;
-#X connect 12 0 9 1;
-#X connect 13 0 2 0;
-#X connect 14 0 5 0;
-#X restore 216 242 pd lighting;
-#X obj 251 447 # / 2;
-#X msg 138 46 \$1 \$2 1 # 0;
+#X connect 6 0 9 0;
+#X connect 7 0 10 0;
+#X connect 7 1 5 0;
+#X connect 8 0 13 0;
+#X connect 8 1 11 0;
+#X connect 9 0 10 1;
+#X connect 10 0 8 0;
+#X connect 11 0 12 0;
+#X connect 12 0 4 1;
+#X connect 13 0 14 0;
+#X connect 14 0 4 0;
+#X restore 235 362 pd lighting;
+#X obj 235 535 # / 2;
+#X msg 107 104 \$1 \$2 1 # 0;
 #N canvas 137 251 392 303 finger 0;
 #X obj 149 39 #redim ( 4 2 );
 #X obj 71 16 inlet;
@@ -87,11 +84,10 @@
 #X connect 7 0 5 1;
 #X connect 9 0 6 0;
 #X connect 10 0 3 0;
-#X restore 292 519 pd finger;
-#X obj 245 25 s size;
-#X obj 251 370 #scale_by 2;
-#X obj 80 142 #store;
-#X obj 312 389 fps detailed;
+#X restore 206 634 pd finger;
+#X obj 141 85 s size;
+#X obj 235 438 #scale_by 2;
+#X obj 10 168 #store;
 #N canvas 53 323 453 223 wave 0;
 #X obj 26 20 inlet;
 #X obj 28 182 outlet;
@@ -103,7 +99,7 @@
 #X obj 28 158 # *>>8 242;
 #X text 105 159 amortizing by ~5.5%;
 #X obj 24 46 t a a;
-#X obj 54 81 #convolve ( 3 3 # 1 4 1 4 0 4 ) \, seed 8;
+#X obj 54 81 #convolve (3 3 # 1 4 1 4 0 4) \, seed 8;
 #X connect 0 0 9 0;
 #X connect 5 0 7 0;
 #X connect 6 0 5 0;
@@ -111,38 +107,33 @@
 #X connect 9 0 5 1;
 #X connect 9 1 10 0;
 #X connect 10 0 6 0;
-#X restore 80 203 pd wave equation;
-#X obj 249 515 t a;
-#X obj 117 122 t a;
-#X obj 251 330 # max 0;
-#X obj 265 188 # >> 1;
-#X obj 31 63 s metro;
-#X msg 211 5 240 320;
-#X text 441 19 Copyright (c) 2003 \, 2004 by Mathieu Bouchard;
-#X text 481 72 (Best complemented with a touchscreen);
-#X text 441 2 waves.pd;
-#X obj 376 141 vradio 15 1 0 3 empty empty empty 0 -6 0 8 -262144 -258699
--1 2;
-#X text 395 155 height greys;
-#X obj 298 103 vradio 15 1 0 2 empty empty empty 0 -6 0 8 -262144 -258699
+#X restore 10 206 pd wave equation;
+#X obj 162 634 t a;
+#X obj 107 123 t a;
+#X obj 245 317 # >> 1;
+#X obj 36 85 s metro;
+#X msg 107 66 240 320;
+#X text 491 65 (Best complemented with a touchscreen);
+#X obj 341 244 vradio 15 1 0 3 empty empty empty 0 -6 0 8 -262144 -258699
+-1 0;
+#X text 359 259 height greys;
+#X obj 294 205 vradio 15 1 0 2 empty empty empty 0 -6 0 8 -262144 -258699
 -1 0;
-#X text 317 102 plain;
-#X text 318 118 line-art;
-#X text 315 46 smooth;
-#X obj 296 46 vradio 15 1 0 2 empty empty empty 0 -6 0 8 -262144 -258699
+#X text 312 204 plain;
+#X text 312 220 line-art;
+#X text 309 153 smooth;
+#X obj 292 153 vradio 15 1 0 2 empty empty empty 0 -6 0 8 -262144 -258699
 -1 0;
-#X text 316 60 raw;
-#X obj 443 379 hradio 18 1 1 4 empty empty _1__2__3__4_ 0 -4 0 8 -262144
--258699 -1 1;
-#X text 441 354 scale by...;
-#X obj 443 400 + 1;
-#X obj 664 129 loadbang;
-#X obj 557 331 #in;
-#X obj 584 305 #camera_control;
-#X obj 558 284 spigot;
-#X obj 605 285 tgl 15 0 empty empty empty 18 8 0 8 -241291 -1 -62784
-1 1;
-#X obj 558 264 r metro;
+#X text 310 167 raw;
+#X obj 417 503 hradio 18 1 1 4 empty empty _1__2__3__4_ 0 -4 0 8 -262144
+-258699 -1 0;
+#X text 415 482 scale by...;
+#X obj 417 523 + 1;
+#X obj 573 105 loadbang;
+#X obj 573 276 spigot;
+#X obj 620 277 tgl 15 0 empty empty empty 18 8 0 8 -241291 -1 -62784
+0 1;
+#X obj 573 256 r metro;
 #N canvas 242 284 365 231 line-art 0;
 #X obj 32 123 # << 8;
 #X obj 32 37 inlet;
@@ -159,181 +150,211 @@
 #X connect 5 0 6 0;
 #X connect 6 0 0 0;
 #X connect 7 0 5 0;
-#X restore 283 142 pd line-art;
-#X text 560 214 Background colour;
-#X text 625 285 enable video;
-#X msg 584 325 open r001.jpg \, bang;
-#X text 394 141 four-colour emboss;
-#X obj 142 402 tgl 15 0 empty empty empty 0 -6 0 8 -241291 -1 -1 1
+#X restore 260 243 pd line-art;
+#X text 628 129 Background colour;
+#X text 637 277 enable video;
+#X text 357 244 four-colour emboss;
+#X obj 325 562 tgl 15 1 empty empty empty 0 -6 0 8 -241291 -1 -1 1
 1;
-#X obj 88 377 r metro;
-#X obj 88 441 @! rand;
-#X msg 87 421 240 320;
-#X text 160 399 rain;
-#X text 558 3 bundled with GridFlow 0.7.7;
-#X obj 240 100 # >> 2;
-#X text 378 36 Originally made for Alexandre Castonguay's "DIGITALE"
+#X obj 278 542 r metro;
+#X text 342 561 rain;
+#X obj 235 204 # >> 2;
+#X text 388 36 Originally made for Alexandre Castonguay's "DIGITALE"
 ;
-#X text 495 53 But suitable for a lot more uses :-);
-#X msg 599 129 3 # 128;
-#X obj 557 154 #color;
-#X obj 239 121 shunt 2;
-#X obj 239 59 shunt 2;
-#X obj 403 486 nbx 5 14 -1e+37 1e+37 0 1 empty empty empty 0 -6 0 10
+#X text 505 50 But suitable for a lot more uses :-);
+#X msg 573 124 3 # 128;
+#X obj 573 143 #color;
+#X obj 235 223 shunt 2;
+#X obj 235 166 shunt 2;
+#X obj 349 618 nbx 5 14 -1e+37 1e+37 0 1 empty empty empty 0 -6 0 10
 -262131 -1 -1 2 256;
-#X obj 403 503 nbx 5 14 -1e+37 1e+37 0 1 empty empty empty 0 -6 0 10
+#X obj 349 632 nbx 5 14 -1e+37 1e+37 0 1 empty empty empty 0 -6 0 10
 -262131 -1 -1 2 256;
-#X obj 359 519 #pack 2;
-#X obj 216 291 # +;
-#X obj 332 302 #store;
-#X obj 421 236 shunt 2;
-#X obj 477 232 vradio 15 1 0 2 empty empty empty 0 -6 0 8 -262144 -258699
+#X obj 235 400 # +;
+#X obj 372 449 #store;
+#X obj 396 381 shunt 2;
+#X obj 452 376 vradio 15 1 0 2 empty empty empty 0 -6 0 8 -262144 -258699
 -1 0;
-#X text 495 230 plain;
-#X text 495 248 refraction;
-#X obj 216 263 t a;
+#X text 470 375 plain;
+#X text 470 392 refraction;
+#X obj 235 381 t a;
 #N canvas 203 363 443 300 heightmap2indexmap 0;
-#X obj 48 279 outlet;
+#X obj 48 220 outlet;
 #X obj 9 8 inlet;
-#X obj 48 159 # +;
+#X obj 48 143 # +;
 #X obj 100 9 #dim;
 #X obj 132 9 #export_list;
-#X obj 48 28 #redim ( );
 #X obj 48 8 t a a;
 #X obj 48 48 t a a;
-#X msg 133 29 \$1 \$2;
-#X obj 78 92 #outer & ( -1 0 );
-#X obj 48 137 #outer & ( 0 -1 );
-#X obj 48 251 # +;
-#X obj 73 251 #for ( 0 0 ) ( 240 320 ) ( 1 1 );
-#X obj 116 229 loadbang;
-#X obj 84 229 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+#X msg 132 28 \$1 \$2;
+#X obj 48 201 # +;
+#X obj 90 181 loadbang;
+#X obj 73 181 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
-#X obj 48 182 # >> 1;
-#X obj 48 115 #convolve ( 2 1 # ) \, op ignore \, fold inv+;
-#X obj 78 71 #convolve ( 1 2 # ) \, op ignore \, fold inv+;
-#X connect 1 0 6 0;
-#X connect 2 0 15 0;
+#X obj 48 162 # >> 1;
+#X obj 78 67 #convolve (1 2 #) \, op ignore \, fold inv+;
+#X obj 78 86 #outer & (-1 0);
+#X obj 48 105 #convolve (2 1 #) \, op ignore \, fold inv+;
+#X obj 48 124 #outer & (0 -1);
+#X obj 73 201 #for (0 0) (240 320) (1 1);
+#X obj 48 28 #redim ();
+#X connect 1 0 5 0;
+#X connect 2 0 11 0;
 #X connect 3 0 4 0;
-#X connect 4 0 8 0;
-#X connect 5 0 7 0;
-#X connect 6 0 5 0;
-#X connect 6 1 3 0;
-#X connect 7 0 16 0;
-#X connect 7 1 17 0;
-#X connect 8 0 5 1;
-#X connect 9 0 2 1;
-#X connect 10 0 2 0;
-#X connect 11 0 0 0;
-#X connect 12 0 11 1;
-#X connect 13 0 12 0;
-#X connect 14 0 12 0;
-#X connect 15 0 11 0;
-#X connect 16 0 10 0;
-#X connect 17 0 9 0;
-#X restore 332 281 pd heightmap2indexmap;
-#X obj 11 63 bng 15 250 50 0 empty empty empty 0 -6 0 8 -241291 -1
+#X connect 4 0 7 0;
+#X connect 5 0 17 0;
+#X connect 5 1 3 0;
+#X connect 6 0 14 0;
+#X connect 6 1 12 0;
+#X connect 7 0 17 1;
+#X connect 8 0 0 0;
+#X connect 9 0 16 0;
+#X connect 10 0 16 0;
+#X connect 11 0 8 0;
+#X connect 12 0 13 0;
+#X connect 13 0 2 1;
+#X connect 14 0 15 0;
+#X connect 15 0 2 0;
+#X connect 16 0 8 1;
+#X connect 17 0 6 0;
+#X restore 372 430 pd heightmap2indexmap;
+#X obj -8 82 bng 15 250 50 0 empty empty empty 0 -6 0 8 -24198 -1 -1
+;
+#X obj 372 411 spigot;
+#X text 359 274 no reflection;
+#X obj 235 286 shunt 3;
+#X obj 235 243 t a;
+#X obj 293 317 # put 0;
+#X obj 162 615 shunt 2;
+#X obj 206 596 shunt 2;
+#X obj 10 66 metro 33.3667;
+#X obj 10 187 shunt 2;
+#X text 80 188 freeze time;
+#X obj 63 188 tgl 15 0 empty empty empty 0 -6 0 8 -241291 -1 -1 0 1
+;
+#X obj 132 123 r feedback;
+#X obj 162 653 s feedback;
+#X obj 10 226 t a;
+#X obj -13 5 cnv 15 780 30 empty empty empty 20 12 0 14 -233017 -66577
+0;
+#X obj -15 671 cnv 15 780 30 empty empty empty 20 12 0 14 -200249 -66577
+0;
+#X text -7 679 GridFlow 0.8.0;
+#X text -7 679 GridFlow 0.8.0;
+#X text 0 4 waves.pd;
+#X obj 573 296 #camera;
+#X obj 555 276 bng 15 250 50 0 empty empty empty 0 -6 0 8 -24198 -1
 -1;
-#X obj 332 228 spigot;
-#X text 397 170 no reflection;
-#X obj 239 167 shunt 3;
-#X obj 239 145 t a;
-#X obj 313 188 # put 0;
-#X obj 255 491 shunt 2;
-#X obj 325 493 shunt 2;
-#X obj 87 401 shunt 2;
-#X obj 31 39 metro 33.3667;
-#X obj 80 171 shunt 2;
-#X text 154 173 freeze time;
-#X obj 137 173 tgl 15 0 empty empty empty 0 -6 0 8 -241291 -1 -1 0
-1;
-#X obj 131 100 r feedback;
-#X obj 229 543 s feedback;
-#X obj 124 264 t a;
-#X obj 239 80 #convolve ( 2 2 # ) \, op ignore;
-#X obj 571 403 #yuv_to_rgb;
-#X text 500 501 pas de reflection \, + yuv;
-#X connect 0 0 70 0;
-#X connect 1 0 13 0;
-#X connect 2 0 22 0;
-#X connect 3 0 10 0;
-#X connect 3 1 12 0;
-#X connect 4 0 15 0;
-#X connect 4 0 6 0;
-#X connect 6 0 9 0;
-#X connect 6 1 79 0;
-#X connect 7 0 81 0;
-#X connect 8 0 70 0;
-#X connect 9 0 11 1;
-#X connect 10 0 18 0;
-#X connect 11 0 17 0;
-#X connect 13 0 4 0;
-#X connect 14 0 82 0;
-#X connect 15 0 5 0;
-#X connect 16 0 87 0;
-#X connect 17 0 86 0;
-#X connect 18 0 14 1;
-#X connect 18 0 60 0;
-#X connect 19 0 1 0;
-#X connect 20 0 0 0;
-#X connect 22 0 3 0;
-#X connect 26 0 75 1;
-#X connect 28 0 59 1;
-#X connect 32 0 60 1;
-#X connect 34 0 36 0;
-#X connect 36 0 9 1;
-#X connect 36 0 13 1;
-#X connect 37 0 57 0;
-#X connect 38 0 89 0;
-#X connect 39 0 38 0;
-#X connect 40 0 38 0;
-#X connect 41 0 40 1;
-#X connect 42 0 40 0;
-#X connect 43 0 76 0;
-#X connect 46 0 38 0;
-#X connect 48 0 78 1;
-#X connect 48 0 79 1;
-#X connect 48 0 80 1;
-#X connect 49 0 80 0;
-#X connect 50 0 11 1;
-#X connect 51 0 50 0;
-#X connect 54 0 59 0;
-#X connect 57 0 58 0;
-#X connect 58 0 66 0;
-#X connect 59 0 76 0;
-#X connect 59 1 43 0;
-#X connect 60 0 88 0;
-#X connect 60 1 59 0;
-#X connect 61 0 63 0;
-#X connect 62 0 63 1;
-#X connect 63 0 11 2;
-#X connect 64 0 19 0;
-#X connect 65 0 64 1;
-#X connect 66 0 64 1;
-#X connect 66 1 65 1;
-#X connect 67 0 66 1;
-#X connect 67 0 73 1;
-#X connect 70 0 64 0;
-#X connect 71 0 65 0;
-#X connect 72 0 21 0;
-#X connect 72 0 14 0;
-#X connect 73 0 71 0;
-#X connect 75 0 8 0;
-#X connect 75 1 20 0;
-#X connect 75 2 77 0;
-#X connect 76 0 75 0;
-#X connect 76 0 73 0;
-#X connect 77 0 0 0;
-#X connect 78 0 17 0;
-#X connect 78 1 11 0;
-#X connect 79 0 78 1;
-#X connect 80 1 51 0;
-#X connect 81 0 14 0;
-#X connect 81 0 21 0;
-#X connect 82 0 16 0;
-#X connect 82 1 87 0;
-#X connect 84 0 82 1;
-#X connect 85 0 18 0;
-#X connect 87 0 78 0;
-#X connect 88 0 54 0;
-#X connect 89 0 77 1;
+#X obj 573 315 spigot;
+#X obj 620 316 tgl 15 0 empty empty empty 18 8 0 8 -241291 -1 -62784
+0 1;
+#X text 637 315 test camera output;
+#X obj 10 85 t b;
+#X obj 278 561 spigot;
+#X obj 620 334 sel 0 1;
+#X msg 642 353 open window;
+#X obj 573 334 #out;
+#X msg 620 372 close;
+#X obj 241 478 fps detailed \, period 2;
+#X obj 574 226 #in;
+#X msg 574 207 load r001.jpg;
+#X obj 324 580 r size;
+#X obj 278 580 #store;
+#X obj 278 599 # rand;
+#X obj 235 457 #out window;
+#X obj 235 419 #clip;
+#X obj 235 185 #convolve (2 2 #) \, op ignore;
+#X obj 349 651 #pack 2;
+#X text 0 18 Copyright 2003 \, 2004 \, 2005 Mathieu Bouchard;
+#X connect 0 0 57 0;
+#X connect 1 0 18 0;
+#X connect 2 0 8 0;
+#X connect 2 1 10 0;
+#X connect 4 0 7 0;
+#X connect 4 1 66 0;
+#X connect 5 0 67 0;
+#X connect 6 0 57 0;
+#X connect 7 0 9 1;
+#X connect 8 0 15 0;
+#X connect 9 0 14 0;
+#X connect 11 0 96 0;
+#X connect 12 0 68 0;
+#X connect 13 0 73 0;
+#X connect 14 0 72 0;
+#X connect 15 0 12 1;
+#X connect 15 0 48 0;
+#X connect 16 0 0 0;
+#X connect 18 0 2 0;
+#X connect 20 0 62 1;
+#X connect 22 0 47 1;
+#X connect 26 0 48 1;
+#X connect 28 0 30 0;
+#X connect 30 0 7 1;
+#X connect 30 0 11 1;
+#X connect 31 0 45 0;
+#X connect 32 0 79 0;
+#X connect 33 0 32 1;
+#X connect 34 0 32 0;
+#X connect 35 0 63 0;
+#X connect 39 0 65 1;
+#X connect 39 0 66 1;
+#X connect 39 0 85 1;
+#X connect 40 0 85 0;
+#X connect 42 0 47 0;
+#X connect 45 0 46 0;
+#X connect 46 0 53 0;
+#X connect 47 0 63 0;
+#X connect 47 1 35 0;
+#X connect 48 0 98 0;
+#X connect 48 1 47 0;
+#X connect 49 0 99 0;
+#X connect 50 0 99 1;
+#X connect 51 0 97 0;
+#X connect 52 0 51 1;
+#X connect 53 0 51 1;
+#X connect 53 1 52 1;
+#X connect 54 0 53 1;
+#X connect 54 0 60 1;
+#X connect 57 0 51 0;
+#X connect 58 0 52 0;
+#X connect 59 0 84 0;
+#X connect 60 0 58 0;
+#X connect 62 0 6 0;
+#X connect 62 1 16 0;
+#X connect 62 2 64 0;
+#X connect 63 0 62 0;
+#X connect 63 0 60 0;
+#X connect 64 0 0 0;
+#X connect 65 0 14 0;
+#X connect 65 1 9 0;
+#X connect 66 0 65 1;
+#X connect 67 0 84 0;
+#X connect 68 0 13 0;
+#X connect 68 1 73 0;
+#X connect 70 0 68 1;
+#X connect 71 0 15 0;
+#X connect 73 0 65 0;
+#X connect 79 0 53 0;
+#X connect 79 0 81 0;
+#X connect 80 0 79 0;
+#X connect 81 0 88 0;
+#X connect 82 0 81 1;
+#X connect 82 0 86 0;
+#X connect 84 0 17 0;
+#X connect 84 0 12 0;
+#X connect 85 0 94 0;
+#X connect 86 0 89 0;
+#X connect 86 1 87 0;
+#X connect 87 0 88 0;
+#X connect 89 0 88 0;
+#X connect 90 0 3 0;
+#X connect 91 0 53 1;
+#X connect 92 0 91 0;
+#X connect 93 0 94 1;
+#X connect 94 0 95 0;
+#X connect 95 0 9 1;
+#X connect 96 0 4 0;
+#X connect 96 0 90 0;
+#X connect 97 0 11 0;
+#X connect 98 0 42 0;
+#X connect 99 0 9 2;