From e166e8943388389bb4fc2927aac8758387c42846 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Tue, 30 Mar 2004 01:56:16 +0000 Subject: PiDiP 0.12.13 svn path=/trunk/externals/pidip/; revision=1508 --- doc/help-pdp_dice.pd | 4 +- doc/help-pdp_ffmpeg~.pd | 69 ++++++++++++----------- doc/help-pdp_fqt.pd | 38 ++++++------- doc/help-pdp_imgloader.pd | 2 +- doc/help-pdp_ocanvas.pd | 140 +++++++++++++++++++++++----------------------- doc/help-pdp_shape.pd | 81 ++++++++++++++++----------- doc/rs_pdp_live~.pd | 62 ++++++++++++-------- 7 files changed, 215 insertions(+), 181 deletions(-) (limited to 'doc') diff --git a/doc/help-pdp_dice.pd b/doc/help-pdp_dice.pd index e1882c8..2afdc65 100644 --- a/doc/help-pdp_dice.pd +++ b/doc/help-pdp_dice.pd @@ -1,9 +1,9 @@ #N canvas 84 12 712 664 10; -#X obj 263 378 pdp_xv; +#X obj 203 379 pdp_xv; #X obj 268 64 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 123 136 loop \$1; -#X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 +#X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 370 44 open \$1; #X obj 369 20 openpanel; diff --git a/doc/help-pdp_ffmpeg~.pd b/doc/help-pdp_ffmpeg~.pd index a61ed57..dd0819a 100644 --- a/doc/help-pdp_ffmpeg~.pd +++ b/doc/help-pdp_ffmpeg~.pd @@ -19,7 +19,6 @@ -1; #X msg 465 106 stop; #X msg 550 137 open /dev/video; -#X obj 282 199 pdp_yqt; #X obj 606 530 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 606 582 pdp_control; @@ -27,8 +26,7 @@ #X floatatom 606 643 5 0 0 0 - - -; #X obj 606 614 route pdp_drop; #X text 82 562 written by Yves Degoyon (ydegoyon@free.fr); -#X text 579 359 Set and open the feed; -#X msg 316 359 feed http://localhost:8090/feed1.ffm; +#X text 631 358 Set and open the feed; #X floatatom 193 439 5 0 0 0 - - -; #X text 241 440 Streaming status; #X floatatom 229 462 5 0 0 0 - - -; @@ -44,7 +42,6 @@ time; #X text 78 598 NOTE : although there is an experimental audio support here \,; #X text 78 611 you'd better stream with mp3cast~ because; -#X obj 193 413 pdp_ffmpeg~; #X text 81 547 pdp_ffmeg~ : streams video & audio towards an ffmpeg server; #X obj 620 284 pdp_xv; @@ -59,44 +56,50 @@ server; #X obj 548 223 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X msg 674 285 close; -#X msg 318 415 feed http://www.xicnet.com:8090/feed1.ffm; +#X msg 317 358 feed http://online.loeil.org:8090/feed1.ffm; +#X msg 318 415 feed http://localhost:8090/feed1.ffm; +#X obj 193 413 pdp_ffmpeg~; +#X floatatom 306 505 5 0 0 0 - - -; +#X text 352 505 Emission framerate; +#X obj 282 199 pdp_yqt; #X connect 0 0 9 0; -#X connect 1 0 15 0; +#X connect 1 0 49 0; #X connect 2 0 1 0; -#X connect 3 0 15 0; +#X connect 3 0 49 0; #X connect 4 0 3 0; #X connect 5 0 4 0; #X connect 6 0 9 1; #X connect 7 0 9 0; #X connect 8 0 6 0; -#X connect 9 0 15 0; +#X connect 9 0 49 0; #X connect 10 0 36 0; -#X connect 10 0 39 0; +#X connect 10 0 46 0; #X connect 11 0 10 0; #X connect 12 0 11 0; #X connect 13 0 11 0; #X connect 14 0 10 0; -#X connect 15 0 36 0; -#X connect 15 0 39 0; -#X connect 15 4 43 0; -#X connect 15 4 36 0; -#X connect 15 5 43 0; -#X connect 15 5 36 1; -#X connect 16 0 18 0; -#X connect 17 0 20 0; -#X connect 18 0 17 0; -#X connect 20 0 19 0; -#X connect 23 0 36 0; -#X connect 29 0 36 0; -#X connect 36 0 24 0; -#X connect 36 1 26 0; -#X connect 36 2 31 0; -#X connect 39 1 38 0; -#X connect 40 0 39 1; -#X connect 41 0 36 0; -#X connect 41 1 36 1; -#X connect 43 1 42 1; -#X connect 43 1 42 0; -#X connect 45 0 43 1; -#X connect 46 0 38 0; -#X connect 47 0 36 0; +#X connect 15 0 17 0; +#X connect 16 0 19 0; +#X connect 17 0 16 0; +#X connect 19 0 18 0; +#X connect 27 0 46 0; +#X connect 36 1 35 0; +#X connect 37 0 36 1; +#X connect 38 0 46 0; +#X connect 38 1 46 1; +#X connect 40 1 39 1; +#X connect 40 1 39 0; +#X connect 42 0 40 1; +#X connect 43 0 35 0; +#X connect 44 0 46 0; +#X connect 45 0 46 0; +#X connect 46 0 22 0; +#X connect 46 1 24 0; +#X connect 46 2 29 0; +#X connect 46 3 47 0; +#X connect 49 0 36 0; +#X connect 49 0 46 0; +#X connect 49 4 40 0; +#X connect 49 4 46 0; +#X connect 49 5 40 0; +#X connect 49 5 46 1; diff --git a/doc/help-pdp_fqt.pd b/doc/help-pdp_fqt.pd index 0f997a6..73ec897 100644 --- a/doc/help-pdp_fqt.pd +++ b/doc/help-pdp_fqt.pd @@ -10,27 +10,27 @@ #X obj 323 68 hsl 300 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 1; #X obj 257 135 metro 70; -#X obj 558 272 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +#X obj 558 398 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; -#X obj 558 324 pdp_control; -#X msg 558 297 thread \$1; -#X floatatom 558 385 5 0 0 0 - - -; -#X obj 558 356 route pdp_drop; -#X floatatom 264 257 5 0 0 0 - - -; -#X floatatom 295 282 5 0 0 0 - - -; -#X text 315 257 Number of frames decoded; -#X text 344 281 Total number of frames; -#X text 81 360 pdp_fqt : fast quicktime movie reader; -#X text 81 377 ( frames are cached in memory and no audio decoding +#X obj 558 450 pdp_control; +#X msg 558 423 thread \$1; +#X floatatom 558 511 5 0 0 0 - - -; +#X obj 558 482 route pdp_drop; +#X floatatom 264 383 5 0 0 0 - - -; +#X floatatom 295 408 5 0 0 0 - - -; +#X text 315 383 Number of frames decoded; +#X text 344 407 Total number of frames; +#X text 81 486 pdp_fqt : fast quicktime movie reader; +#X text 81 503 ( frames are cached in memory and no audio decoding ); -#X floatatom 317 164 5 0 0 0 - - -; -#X text 368 164 Frame command; -#X obj 316 183 t b f; -#X text 81 394 written by Yves Degoyon; -#X obj 218 293 pdp_xv; -#X floatatom 328 304 5 0 0 0 - - -; -#X text 373 304 Frame rate; -#X obj 225 222 pdp_fqt; +#X floatatom 317 290 5 0 0 0 - - -; +#X text 368 290 Frame command; +#X obj 316 309 t b f; +#X text 81 520 written by Yves Degoyon; +#X obj 218 419 pdp_xv; +#X floatatom 328 430 5 0 0 0 - - -; +#X text 373 430 Frame rate; +#X obj 225 348 pdp_fqt; #X connect 0 0 7 0; #X connect 1 0 26 0; #X connect 2 0 1 0; diff --git a/doc/help-pdp_imgloader.pd b/doc/help-pdp_imgloader.pd index 3a0787b..49afe7d 100644 --- a/doc/help-pdp_imgloader.pd +++ b/doc/help-pdp_imgloader.pd @@ -39,7 +39,7 @@ #X text 27 241 load ; #X text 28 228 Load an image ( types supported by imlib2 ); #X obj 469 279 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 --1 -1 0 1; +-1 -1 10200 1; #X text 468 262 Blending factor; #X text 491 364 Unhide ; #X text 439 340 Hide ; diff --git a/doc/help-pdp_ocanvas.pd b/doc/help-pdp_ocanvas.pd index 8c034c0..8d9c989 100644 --- a/doc/help-pdp_ocanvas.pd +++ b/doc/help-pdp_ocanvas.pd @@ -1,9 +1,8 @@ -#N canvas 121 0 828 668 10; -#X obj 234 469 pdp_xv; +#N canvas 507 -5 828 668 10; #X obj 227 100 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 123 139 loop \$1; -#X obj 124 117 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 +#X obj 124 117 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 119 80 open \$1; #X obj 118 56 openpanel; @@ -34,7 +33,7 @@ overlay; #X obj 470 99 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 366 138 loop \$1; -#X obj 367 116 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 +#X obj 367 116 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 362 79 open \$1; #X obj 361 55 openpanel; @@ -81,92 +80,93 @@ overlay; #X msg 173 540 select \$1 \$2; #X msg 279 539 drag \$1 \$2; #X msg 367 538 unselect; -#X msg 101 452 cursor 1; #X msg 82 341 offset 2 320 0; #X msg 81 365 offset 3 256 240; #X obj 134 258 pdp_scale 320 240; #X obj 307 255 pdp_scale 320 240; #X obj 496 254 pdp_scale 320 240; -#X msg 83 393 dim 640 480; -#X obj 234 432 pdp_ocanvas 640 480 3; #X obj 234 497 route press drag release; #X msg 546 428 average \$1; #X obj 629 429 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X text 544 451 Average sources at intersections; #X text 544 463 ( default = 0 ); -#X obj 101 423 pdp_trigger b p; -#X connect 0 0 74 0; +#X msg 104 476 cursor 0; +#X obj 224 425 pdp_ocanvas 640 480 3; +#X obj 234 469 pdp_xv; +#X msg 96 417 dim 640 480; +#X obj 228 449 pdp_scale 320 240; +#X msg 105 446 cursor 1; +#X connect 0 0 7 0; #X connect 1 0 8 0; -#X connect 2 0 9 0; -#X connect 3 0 2 0; -#X connect 4 0 9 0; +#X connect 2 0 1 0; +#X connect 3 0 8 0; +#X connect 4 0 3 0; #X connect 5 0 4 0; -#X connect 6 0 5 0; +#X connect 6 0 7 0; #X connect 7 0 8 0; -#X connect 8 0 9 0; -#X connect 9 0 69 0; -#X connect 10 0 69 0; +#X connect 8 0 67 0; +#X connect 9 0 67 0; +#X connect 10 0 9 0; #X connect 11 0 10 0; -#X connect 12 0 11 0; -#X connect 13 0 11 0; -#X connect 14 0 16 0; -#X connect 15 0 18 0; -#X connect 16 0 15 0; -#X connect 18 0 17 0; -#X connect 20 0 9 1; +#X connect 12 0 10 0; +#X connect 13 0 15 0; +#X connect 14 0 17 0; +#X connect 15 0 14 0; +#X connect 17 0 16 0; +#X connect 19 0 8 1; +#X connect 23 0 30 0; #X connect 24 0 31 0; -#X connect 25 0 32 0; -#X connect 26 0 25 0; -#X connect 27 0 32 0; +#X connect 25 0 24 0; +#X connect 26 0 31 0; +#X connect 27 0 26 0; #X connect 28 0 27 0; -#X connect 29 0 28 0; +#X connect 29 0 30 0; #X connect 30 0 31 0; -#X connect 31 0 32 0; -#X connect 32 0 70 0; -#X connect 33 0 70 0; +#X connect 31 0 68 0; +#X connect 32 0 68 0; +#X connect 33 0 32 0; #X connect 34 0 33 0; -#X connect 35 0 34 0; -#X connect 36 0 34 0; -#X connect 37 0 32 1; +#X connect 35 0 33 0; +#X connect 36 0 31 1; +#X connect 37 0 44 0; #X connect 38 0 45 0; -#X connect 39 0 46 0; -#X connect 40 0 39 0; -#X connect 41 0 46 0; +#X connect 39 0 38 0; +#X connect 40 0 45 0; +#X connect 41 0 40 0; #X connect 42 0 41 0; -#X connect 43 0 42 0; +#X connect 43 0 44 0; #X connect 44 0 45 0; -#X connect 45 0 46 0; -#X connect 46 0 71 0; -#X connect 47 0 71 0; +#X connect 45 0 69 0; +#X connect 46 0 69 0; +#X connect 47 0 46 0; #X connect 48 0 47 0; -#X connect 49 0 48 0; -#X connect 50 0 48 0; -#X connect 51 0 46 1; -#X connect 55 0 61 0; -#X connect 56 0 55 0; -#X connect 57 0 58 0; -#X connect 58 0 55 0; -#X connect 58 1 55 1; -#X connect 61 0 73 0; -#X connect 62 0 67 0; -#X connect 62 0 68 0; -#X connect 62 0 72 0; -#X connect 63 0 73 0; -#X connect 64 0 73 0; -#X connect 65 0 73 0; -#X connect 66 0 0 0; -#X connect 67 0 73 0; -#X connect 68 0 73 0; -#X connect 69 0 73 1; -#X connect 70 0 73 2; -#X connect 71 0 73 3; -#X connect 72 0 0 0; -#X connect 73 0 79 0; -#X connect 74 0 63 0; -#X connect 74 1 64 0; -#X connect 74 2 65 0; -#X connect 75 0 73 0; -#X connect 76 0 75 0; -#X connect 79 0 66 0; -#X connect 79 1 0 0; +#X connect 49 0 47 0; +#X connect 50 0 45 1; +#X connect 54 0 60 0; +#X connect 55 0 54 0; +#X connect 56 0 57 0; +#X connect 57 0 54 0; +#X connect 57 1 54 1; +#X connect 60 0 76 0; +#X connect 61 0 65 0; +#X connect 61 0 66 0; +#X connect 62 0 76 0; +#X connect 63 0 76 0; +#X connect 64 0 76 0; +#X connect 65 0 76 0; +#X connect 66 0 76 0; +#X connect 67 0 76 1; +#X connect 68 0 76 2; +#X connect 69 0 76 3; +#X connect 70 0 62 0; +#X connect 70 1 63 0; +#X connect 70 2 64 0; +#X connect 71 0 76 0; +#X connect 72 0 71 0; +#X connect 75 0 77 0; +#X connect 76 0 79 0; +#X connect 77 0 70 0; +#X connect 78 0 77 0; +#X connect 79 0 77 0; +#X connect 80 0 77 0; diff --git a/doc/help-pdp_shape.pd b/doc/help-pdp_shape.pd index 0721f09..16a31fe 100644 --- a/doc/help-pdp_shape.pd +++ b/doc/help-pdp_shape.pd @@ -4,22 +4,22 @@ #X msg 34 125 loop \$1; #X obj 35 103 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1 ; -#X msg 244 41 open \$1; -#X obj 243 17 openpanel; -#X obj 228 0 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 +#X msg 27 56 open \$1; +#X obj 26 32 openpanel; +#X obj 11 15 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; -#X floatatom 190 96 5 0 0 0 - - -; +#X floatatom 168 83 5 0 0 0 - - -; #X msg 99 62 stop; -#X obj 197 65 hsl 300 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 +#X obj 175 52 hsl 300 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 1; #X obj 131 132 metro 70; #X obj 126 164 pdp_yqt; -#X obj 242 152 pdp_v4l; -#X obj 251 122 metro 70; -#X obj 296 88 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 +#X obj 245 134 pdp_v4l; +#X obj 254 104 metro 70; +#X obj 299 70 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; -#X msg 253 89 stop; -#X msg 338 120 open /dev/video; +#X msg 256 71 stop; +#X msg 341 102 open /dev/video; #X obj 567 476 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 567 528 pdp_control; @@ -28,30 +28,30 @@ #X obj 567 560 route pdp_drop; #X text 85 514 written by Yves Degoyon ( ydegoyon@free.fr ); #X obj 127 417 pdp_xv; -#X msg 292 303 rgb \$1 \$2 \$3; -#X obj 391 303 pack f f f; -#X floatatom 573 302 5 0 0 0 - - -; -#X text 584 321 R; -#X floatatom 622 303 5 0 0 0 - - -; -#X floatatom 670 304 5 0 0 0 - - -; -#X text 681 321 B; -#X obj 522 303 t b f; -#X text 631 321 G; -#X obj 474 303 t b f; +#X msg 326 273 rgb \$1 \$2 \$3; +#X obj 425 273 pack f f f; +#X floatatom 607 272 5 0 0 0 - - -; +#X text 618 291 R; +#X floatatom 656 273 5 0 0 0 - - -; +#X floatatom 700 273 5 0 0 0 - - -; +#X text 711 290 B; +#X obj 556 273 t b f; +#X text 662 291 G; +#X obj 508 273 t b f; #X obj 128 467 route press drag release; -#X msg 292 187 pick \$1 \$2; -#X text 383 186 Pick the color of the shape; -#X msg 291 215 detect \$1 \$2; -#X text 389 215 Detect a shape of that color; -#X msg 292 240 tolerance \$1; -#X floatatom 389 242 5 0 0 0 - - -; +#X msg 271 171 pick \$1 \$2; +#X text 362 170 Pick the color of the shape; +#X msg 291 194 detect \$1 \$2; +#X text 389 194 Detect a shape of that color; +#X msg 304 218 tolerance \$1; +#X floatatom 401 220 5 0 0 0 - - -; #X text 86 498 pdp_shape : shape recognition object; -#X text 433 242 Set tolerance ( default = 20 ); -#X text 294 323 Set the color of the shape; -#X msg 293 270 paint \$1; -#X obj 363 271 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +#X text 445 220 Set tolerance ( default = 20 ); +#X text 328 293 Set the color of the shape; +#X msg 317 247 paint \$1; +#X obj 387 248 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; -#X text 388 270 Paint option ( default = off ); +#X text 412 247 Paint option ( default = off ); #X floatatom 325 399 5 0 0 0 - - -; #X floatatom 286 417 5 0 0 0 - - -; #X floatatom 375 399 5 0 0 0 - - -; @@ -61,11 +61,18 @@ #X text 259 416 Y1; #X text 259 439 Y2; #X text 332 426 Coordinates of detected shape; -#X obj 397 346 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +#X obj 440 311 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; -#X msg 295 346 luminosity \$1; -#X text 425 345 Use luminosity ( default = on ); +#X msg 338 311 luminosity \$1; +#X text 468 310 Use luminosity ( default = on ); #X obj 127 361 pdp_shape; +#X msg 45 401 cursor 1; +#X obj 431 339 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 +1; +#X msg 352 337 shape \$1; +#X text 459 338 Draw shape option ( default = on ); +#X obj 504 369 loadbang; +#X msg 469 370 1; #X connect 0 0 9 0; #X connect 1 0 10 0; #X connect 2 0 1 0; @@ -111,3 +118,9 @@ #X connect 58 2 47 0; #X connect 58 3 48 0; #X connect 58 4 49 0; +#X connect 59 0 22 0; +#X connect 60 0 61 0; +#X connect 61 0 58 0; +#X connect 63 0 64 0; +#X connect 64 0 55 0; +#X connect 64 0 60 0; diff --git a/doc/rs_pdp_live~.pd b/doc/rs_pdp_live~.pd index a112ed5..387d943 100644 --- a/doc/rs_pdp_live~.pd +++ b/doc/rs_pdp_live~.pd @@ -1,13 +1,13 @@ #N canvas 168 29 842 529 10; #X text 460 551 written by Yves Degoyon (ydegoyon@free.fr); -#X floatatom 226 441 5 0 0 0 - - -; -#X text 272 440 Streaming status; -#X floatatom 221 419 5 0 0 0 - - -; +#X floatatom 223 475 5 0 0 0 - - -; +#X text 269 474 Streaming status; +#X floatatom 244 453 5 0 0 0 - - -; #X obj 36 449 pdp_xv; -#X text 550 79 Connect to a live stream; +#X text 611 77 Connect to a live stream; #X text 325 118 Disconnect from the current stream; #X msg 247 116 disconnect; -#X text 270 420 Number of video frames decoded; +#X text 293 454 Number of video frames decoded; #X text 457 527 ( at least from ffserver ); #X text 23 547 NOTE : as for pdp_ffmpeg~ \, transmitting audio; #X text 22 565 with the video stream produces some unsteady sound; @@ -20,7 +20,6 @@ #X obj 146 486 outlet~; #X text 387 342 ([-20 \, 20 ] default : 0 ); #X text 390 329 Set the priority of decoding thread; -#X obj 65 60 block~ 4096; #X msg 247 225 connect \$1; #X text 460 513 pdp_live~ : decodes a live video stream; #X text 458 539 and reads most common files ( avi \, mpg \, .... ) @@ -33,23 +32,42 @@ #X obj 317 298 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X text 348 298 Activate decoding of audio ( default : off ); -#X obj 113 390 pdp_live~; #X obj 247 200 makefilename file://%s; #X msg 9 388 autocreate 1; -#X msg 246 78 connect http://www.xicnet.com:8000/cruzados.mpg; -#X connect 7 0 30 0; -#X connect 13 0 30 0; +#X msg 246 78 connect http://www.hackitectura.net:8090/test2.mpg; +#X msg 244 52 connect http://localhost:8090/test1.mpg; +#X obj 65 61 block~ 1024; +#X obj 322 261 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 +1; +#X msg 248 259 thread \$1; +#X obj 113 374 pdp_live~; +#X obj 378 259 loadbang; +#X msg 343 259 1; +#X text 449 259 Activate threading ( default : on ); +#X floatatom 260 430 5 0 0 0 - - -; +#X text 306 430 Reception framerate; +#X text 333 411 End of stream reached; +#X floatatom 287 409 5 0 0 0 - - -; +#X connect 7 0 36 0; +#X connect 13 0 36 0; #X connect 14 0 13 0; -#X connect 21 0 30 0; -#X connect 25 0 26 0; -#X connect 26 0 31 0; -#X connect 27 0 30 0; -#X connect 28 0 27 0; +#X connect 20 0 36 0; +#X connect 24 0 25 0; +#X connect 25 0 29 0; +#X connect 26 0 36 0; +#X connect 27 0 26 0; +#X connect 29 0 20 0; #X connect 30 0 4 0; -#X connect 30 1 16 0; -#X connect 30 2 17 0; -#X connect 30 3 1 0; -#X connect 30 4 3 0; -#X connect 31 0 21 0; -#X connect 32 0 4 0; -#X connect 33 0 30 0; +#X connect 31 0 36 0; +#X connect 32 0 36 0; +#X connect 34 0 35 0; +#X connect 35 0 36 0; +#X connect 36 0 4 0; +#X connect 36 1 16 0; +#X connect 36 2 17 0; +#X connect 36 3 1 0; +#X connect 36 4 3 0; +#X connect 36 5 40 0; +#X connect 36 6 43 0; +#X connect 37 0 38 0; +#X connect 38 0 34 0; -- cgit v1.2.1