From 38d0b9fa378e1b1da79ca25ce72f91f39107d265 Mon Sep 17 00:00:00 2001 From: Thomas O Fredericks Date: Tue, 8 Dec 2009 20:20:24 +0000 Subject: Updating gems svn path=/trunk/abstractions/mtl/; revision=12823 --- examples/gems-fft~.pd | 26 ++++++++-------- examples/gems-movies_with_sound~.pd | 42 ++++++++++++------------- examples/gems-scope~.pd | 61 +++++++++++++++++++------------------ gemsCropMap-help.pd | 22 ++++++------- gemsCuber-help.pd | 34 ++++++++++----------- gemsCuber.pd | 10 +++--- gemsImages-help.pd | 31 ++++++++++--------- gemsLoop-help.pd | 11 ++++--- gemsMouse-help.pd | 24 +++++++-------- gemsMouse.pd | 39 +++++++++--------------- gemsWheel-help.pd | 27 ++++++++-------- 11 files changed, 161 insertions(+), 166 deletions(-) diff --git a/examples/gems-fft~.pd b/examples/gems-fft~.pd index ae63fb3..d3acee5 100644 --- a/examples/gems-fft~.pd +++ b/examples/gems-fft~.pd @@ -1,11 +1,11 @@ -#N canvas 353 122 523 473 10; +#N canvas 1586 197 523 473 10; #X declare -lib Gem; #X declare -lib Gem; #X text -7 -41 Description: FFT spectral graphical analysis; #X obj -4 7 gemhead; #X obj 57 111 t f f; #X msg 145 281 \$1 0.5 1; -#X obj 283 -21 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +#X obj 283 -21 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; #X obj -4 66 mtl/gemsDuplicate 128; #X obj 57 90 tof/increment; @@ -70,38 +70,38 @@ #X obj 284 126 adc~; #X text 201 56 <- read a soundfile; #X text 319 124 <- talk into your mic; -#X obj -4 39 mtl/gemsFit fill 0.9; #X obj -4 331 translateXYZ 0 0 0; -#X obj 249 259 maxlib/scale 0 100 0.001 1; #X obj 374 -34 import Gem; #X obj 252 159 mtl/out~; #X text -9 -24 Authors: Alexandre Quessy and TOF; -#X connect 1 0 25 0; +#X obj -4 39 mtl/gemsStretch; +#X obj 248 259 maxlib/scale 0 100 0.001 1; +#X connect 1 0 29 0; #X connect 2 0 12 0; #X connect 2 1 9 0; #X connect 3 0 7 0; #X connect 4 0 10 0; -#X connect 5 0 26 0; +#X connect 5 0 25 0; #X connect 5 1 6 0; #X connect 5 2 6 1; #X connect 6 0 2 0; #X connect 7 0 8 1; #X connect 8 0 13 0; #X connect 9 0 14 0; -#X connect 11 0 26 1; +#X connect 11 0 25 1; #X connect 12 0 11 0; #X connect 14 0 17 0; -#X connect 14 0 27 0; +#X connect 14 0 30 0; #X connect 15 0 16 0; #X connect 16 0 3 0; #X connect 17 0 15 0; #X connect 18 0 9 1; -#X connect 18 0 29 0; -#X connect 18 0 29 1; +#X connect 18 0 27 0; +#X connect 18 0 27 1; #X connect 19 0 21 0; #X connect 20 0 19 0; #X connect 21 0 18 0; #X connect 22 0 9 1; -#X connect 25 0 5 0; -#X connect 26 0 8 0; -#X connect 27 0 13 2; +#X connect 25 0 8 0; +#X connect 29 0 5 0; +#X connect 30 0 13 2; diff --git a/examples/gems-movies_with_sound~.pd b/examples/gems-movies_with_sound~.pd index e7c032f..6087598 100644 --- a/examples/gems-movies_with_sound~.pd +++ b/examples/gems-movies_with_sound~.pd @@ -1,13 +1,12 @@ -#N canvas 809 145 441 494 10; +#N canvas 1108 267 509 574 10; #X declare -lib Gem; #X declare -lib Gem; -#X obj 23 59 gemhead; +#X obj 23 39 gemhead; #X obj 23 398 pix_texture; -#X obj 23 450 square; -#X obj 236 60 tgl 15 0 empty empty empty 0 -6 0 10 -262144 -1 -1 1 +#X obj 23 466 square; +#X obj 236 60 tgl 15 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 1; #X obj 236 84 mtl/gemsWin /dimen 320 320; -#X obj 23 424 mtl/gemsFit window; #X obj 180 295 mtl/out~; #X obj 43 91 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; @@ -25,20 +24,21 @@ #X text 22 10 How to play a movie synchronized to a soundfile.; #X obj 180 228 mtl/player~ 1; #X obj 328 61 import Gem; -#X connect 0 0 12 0; -#X connect 1 0 5 0; +#X obj 23 64 mtl/gemsStretch; +#X connect 0 0 20 0; +#X connect 1 0 2 0; #X connect 3 0 4 0; -#X connect 5 0 2 0; -#X connect 7 0 8 0; -#X connect 8 0 9 1; -#X connect 9 0 1 0; -#X connect 10 0 14 0; -#X connect 11 0 9 3; -#X connect 12 0 9 0; -#X connect 12 1 11 0; -#X connect 13 0 17 0; -#X connect 14 0 13 0; -#X connect 17 0 19 0; -#X connect 19 0 6 0; -#X connect 19 1 6 1; -#X connect 19 2 11 0; +#X connect 6 0 7 0; +#X connect 7 0 8 1; +#X connect 8 0 1 0; +#X connect 9 0 13 0; +#X connect 10 0 8 3; +#X connect 11 0 8 0; +#X connect 11 1 10 0; +#X connect 12 0 16 0; +#X connect 13 0 12 0; +#X connect 16 0 18 0; +#X connect 18 0 5 0; +#X connect 18 1 5 1; +#X connect 18 2 10 0; +#X connect 20 0 11 0; diff --git a/examples/gems-scope~.pd b/examples/gems-scope~.pd index 21391db..7388f20 100644 --- a/examples/gems-scope~.pd +++ b/examples/gems-scope~.pd @@ -1,4 +1,5 @@ -#N canvas 571 140 629 386 10; +#N canvas 1128 332 629 386 10; +#X declare -lib Gem; #X declare -lib Gem; #X obj 440 26 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; @@ -87,44 +88,44 @@ #X text 352 111 Draw mode; #X obj 43 347 mtl/gemsLines 800; #X obj 42 4 gemhead; -#X obj 42 295 mtl/gemsFit window; #X obj 441 151 osc~; #X floatatom 441 127 5 0 0 0 - - -; #X obj 442 182 *~; #X obj 494 166 osc~ 1; -#X obj 41 254 rotate 0 1 1 1; -#X obj 41 210 color; -#X obj 57 86 iemlib/modulo_counter 360; +#X obj 41 284 rotate 0 1 1 1; +#X obj 41 240 color; +#X obj 57 116 iemlib/modulo_counter 360; #X obj 221 25 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; -#X obj 58 112 t f f; -#X obj 58 181 mtl/hsvToRgb; -#X obj 57 140 / 360; -#X msg 57 160 \$1 1 1; -#X obj 41 39 t a b b; +#X obj 58 142 t f f; +#X obj 58 211 mtl/hsvToRgb; +#X obj 57 170 / 360; +#X msg 57 190 \$1 1 1; +#X obj 41 69 t a b b; #X obj 440 46 mtl/gemsWin /dimen 640 480; #X obj 221 49 mtl/gemsFeedback 0.9 -0.1; #X floatatom 497 134 5 0 0 0 - - -; #X obj 544 11 import Gem; -#X connect 0 0 20 0; +#X obj 41 36 mtl/gemsStretch; +#X connect 0 0 19 0; #X connect 1 0 4 1; #X connect 2 0 1 1; -#X connect 5 0 19 0; -#X connect 6 0 4 0; -#X connect 7 0 9 0; -#X connect 8 0 7 0; -#X connect 9 0 1 2; -#X connect 10 0 9 1; -#X connect 11 0 6 0; -#X connect 12 0 11 0; -#X connect 13 0 15 0; -#X connect 14 0 21 0; -#X connect 15 0 17 0; -#X connect 15 1 11 1; -#X connect 16 0 12 1; -#X connect 17 0 18 0; -#X connect 18 0 16 0; -#X connect 19 0 12 0; -#X connect 19 1 13 0; -#X connect 19 2 1 0; -#X connect 22 0 10 0; +#X connect 5 0 23 0; +#X connect 6 0 8 0; +#X connect 7 0 6 0; +#X connect 8 0 1 2; +#X connect 9 0 8 1; +#X connect 10 0 4 0; +#X connect 11 0 10 0; +#X connect 12 0 14 0; +#X connect 13 0 20 0; +#X connect 14 0 16 0; +#X connect 14 1 10 1; +#X connect 15 0 11 1; +#X connect 16 0 17 0; +#X connect 17 0 15 0; +#X connect 18 0 11 0; +#X connect 18 1 12 0; +#X connect 18 2 1 0; +#X connect 21 0 9 0; +#X connect 23 0 18 0; diff --git a/gemsCropMap-help.pd b/gemsCropMap-help.pd index df2a915..4885ec7 100644 --- a/gemsCropMap-help.pd +++ b/gemsCropMap-help.pd @@ -17,7 +17,6 @@ #X obj 26 76 mtl/gemsWin /dimen 320 240; #X obj 26 193 mtl/gemsMovies; #X text 67 142 Load a movie; -#X obj 26 217 mtl/gemsFit window 0.8; #X msg 79 163 1; #X text 110 165 Play it; #N canvas 0 0 450 300 rotation 0; @@ -59,18 +58,19 @@ #X obj 26 312 mtl/gemsCropMap 8 6; #X text 23 24 tags: gems; #X obj 391 11 import Gem; +#X obj 26 217 mtl/gemsStretch; #X connect 0 0 12 0; #X connect 1 0 11 0; #X connect 2 0 6 0; #X connect 3 0 12 1; -#X connect 4 0 22 2; -#X connect 5 0 22 1; +#X connect 4 0 21 2; +#X connect 5 0 21 1; #X connect 10 0 2 0; -#X connect 12 0 14 0; -#X connect 14 0 22 0; -#X connect 15 0 12 2; -#X connect 17 0 10 1; -#X connect 17 1 10 2; -#X connect 18 0 17 0; -#X connect 20 0 18 0; -#X connect 22 0 10 0; +#X connect 12 0 24 0; +#X connect 14 0 12 2; +#X connect 16 0 10 1; +#X connect 16 1 10 2; +#X connect 17 0 16 0; +#X connect 19 0 17 0; +#X connect 21 0 10 0; +#X connect 24 0 21 0; diff --git a/gemsCuber-help.pd b/gemsCuber-help.pd index db21241..9f50e83 100644 --- a/gemsCuber-help.pd +++ b/gemsCuber-help.pd @@ -1,4 +1,4 @@ -#N canvas 620 70 553 565 10; +#N canvas 1234 256 553 565 10; #X declare -lib Gem; #X declare -lib Gem; #X obj 19 78 gemhead; @@ -29,31 +29,31 @@ #X obj 193 93 mtl/gemsWin /dimen 320 240 /lighting 1; #X text 15 30 tags: gems; #X text 14 14 Description: Builds a cube out of duplicated geos.; -#X obj 356 206 world_light; #X obj 356 145 gemhead; -#X obj 19 407 mtl/gemsCuber; #X text 164 443 z repetitions (minimum of 1); -#X obj 19 137 mtl/gemsFit window 0.7; -#X obj 16 477 colorRGB; #X text 144 477 Outlet 2: relative x of geos being rendered; #X text 143 492 Outlet 3: relative y of geos being rendered; #X text 146 510 Outlet 4: relative z of geos being rendered; #X obj 453 11 import Gem; +#X obj 19 407 mtl/gemsCuber 2 2 2; +#X obj 356 251 world_light; +#X obj 16 477 colorRGB 1 1 1 1; +#X obj 19 137 mtl/gemsStretch; #X connect 0 0 2 0; #X connect 1 0 14 0; -#X connect 2 0 21 0; -#X connect 3 0 19 3; -#X connect 4 0 19 0; +#X connect 2 0 26 0; +#X connect 3 0 23 3; +#X connect 4 0 23 0; #X connect 5 0 4 2; #X connect 5 0 4 1; #X connect 7 0 5 0; #X connect 8 0 7 0; -#X connect 9 0 19 2; -#X connect 10 0 19 1; -#X connect 18 0 17 0; -#X connect 19 0 22 0; -#X connect 19 1 22 1; -#X connect 19 2 22 2; -#X connect 19 3 22 3; -#X connect 21 0 4 0; -#X connect 22 0 13 0; +#X connect 9 0 23 2; +#X connect 10 0 23 1; +#X connect 17 0 24 0; +#X connect 23 0 25 0; +#X connect 23 1 25 1; +#X connect 23 2 25 2; +#X connect 23 3 25 3; +#X connect 25 0 13 0; +#X connect 26 0 4 0; diff --git a/gemsCuber.pd b/gemsCuber.pd index 2405f9f..695c0e6 100644 --- a/gemsCuber.pd +++ b/gemsCuber.pd @@ -1,6 +1,6 @@ #N canvas 12 32 1022 686 10; #X obj 49 154 separator; -#X obj 53 276 separator; +#X obj 45 256 separator; #X obj 403 664 outlet; #X obj 406 128 f; #X obj 403 29 inlet; @@ -10,7 +10,7 @@ #X obj 551 16 inlet; #X text 557 1 num Y; #X obj 49 128 repeat 1; -#X obj 53 250 repeat 1; +#X obj 45 230 repeat 1; #X obj 144 17 inlet; #X obj 188 568 expr (1/$f2)*($f1*2+1)-1; #X obj 465 484 /; @@ -31,7 +31,7 @@ #X obj 66 409 t a b; #X obj 60 358 repeat 1; #X obj 51 179 t a b b; -#X obj 55 300 t a b b; +#X obj 47 280 t a b b; #X obj 721 31 inlet; #X text 722 8 num z; #X obj 721 129 f; @@ -46,7 +46,7 @@ #X obj 578 94 tof/argument 2 1; #X obj 750 111 tof/argument 3 1; #X obj 120 209 tof/increment; -#X obj 106 324 tof/increment; +#X obj 132 321 tof/increment; #X obj 113 433 tof/increment; #X obj 559 653 outlet; #X obj 651 656 outlet; @@ -96,8 +96,10 @@ #X connect 29 1 48 0; #X connect 30 0 28 0; #X connect 31 0 11 0; +#X connect 31 1 47 1; #X connect 31 2 46 0; #X connect 32 0 30 0; +#X connect 32 1 48 1; #X connect 32 2 47 0; #X connect 33 0 35 0; #X connect 35 0 36 0; diff --git a/gemsImages-help.pd b/gemsImages-help.pd index f813cdf..fcfb7c8 100644 --- a/gemsImages-help.pd +++ b/gemsImages-help.pd @@ -1,16 +1,13 @@ #N canvas 656 22 540 465 10; +#X declare -lib Gem; #X obj 21 179 gemhead; -#X obj 27 38 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 +#X obj 22 65 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; #X obj 161 188 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X floatatom 103 147 5 0 0 0 - - -; -#X text 109 22 Description: Multiple images handler. The images do -not need to be the same dimension.; -#X obj 27 61 mtl/gemsWin /dimen 640 480; +#X obj 22 88 mtl/gemsWin /dimen 640 480; #X obj 22 210 mtl/gemsImages; -#X obj 25 329 mtl/gemsFit window; -#X obj 25 373 rectangle 1; #X text 138 144 Select a previously loaded image; #X text 186 184 Open a panel to select an image; #X obj 198 232 openpanel; @@ -18,12 +15,16 @@ not need to be the same dimension.; -1 -1; #X text 200 253 Add an image; #X obj 25 284 pix_texture; -#X connect 0 0 6 0; -#X connect 1 0 5 0; -#X connect 2 0 6 1; -#X connect 3 0 6 1; -#X connect 6 0 14 0; -#X connect 7 0 8 0; -#X connect 11 0 6 1; -#X connect 12 0 11 0; -#X connect 14 0 7 0; +#X text 85 17 Description: Multiple images handler.; +#X text 83 37 tags: gems; +#X obj 26 327 mtl/gemsScaleToPix size; +#X obj 26 369 square; +#X connect 0 0 5 0; +#X connect 1 0 4 0; +#X connect 2 0 5 1; +#X connect 3 0 5 1; +#X connect 5 0 11 0; +#X connect 8 0 5 1; +#X connect 9 0 8 0; +#X connect 11 0 14 0; +#X connect 14 0 15 0; diff --git a/gemsLoop-help.pd b/gemsLoop-help.pd index 4414ff5..8b7b9ec 100644 --- a/gemsLoop-help.pd +++ b/gemsLoop-help.pd @@ -1,6 +1,7 @@ #N canvas 533 102 521 605 10; #X declare -lib Gem; -#X obj 98 103 gemhead; +#X declare -lib Gem; +#X obj 98 76 gemhead; #X obj 140 169 bng 15 250 50 0 empty empty load_movie 0 -6 0 8 -262144 -1 -1; #X obj 160 358 tgl 15 0 empty empty REC 0 -6 0 8 -258699 -262144 -1 @@ -21,11 +22,11 @@ speed playback and seek function.; #X obj 98 409 mtl/gemsLoop 32; #X msg 215 185 1; #X obj 98 562 rectangle; -#X obj 98 509 mtl/gemsFit window; #X text 204 410 Argument: maximum number of frames.; #X text 9 42 tags: gems; #X obj 444 15 import Gem; -#X connect 0 0 12 0; +#X obj 98 122 mtl/gemsStretch; +#X connect 0 0 19 0; #X connect 1 0 12 1; #X connect 2 0 13 1; #X connect 3 0 15 0; @@ -33,9 +34,9 @@ speed playback and seek function.; #X connect 8 0 13 2; #X connect 9 0 13 3; #X connect 12 0 13 0; -#X connect 13 0 16 0; +#X connect 13 0 3 0; #X connect 13 1 4 0; #X connect 13 2 5 0; #X connect 13 3 6 0; #X connect 14 0 12 2; -#X connect 16 0 3 0; +#X connect 19 0 12 0; diff --git a/gemsMouse-help.pd b/gemsMouse-help.pd index 1a89d6f..db93a4f 100644 --- a/gemsMouse-help.pd +++ b/gemsMouse-help.pd @@ -1,17 +1,16 @@ #N canvas 1 57 545 398 10; #X declare -lib Gem; +#X declare -lib Gem; #X obj 17 91 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1 ; -#X msg 17 350 5.13333 -0.15; +#X msg 17 350 -4.63333 2.33333; #X msg 71 297 0 1.06667 -0.166667; #X msg 118 235 0 1.3 0.533333; #X msg 150 182 0 1.3 0.533333; #X text 195 265 left button: state(up/down) X Y; #X text 240 209 middle button: state(up/down) X Y; #X text 281 156 right button: state(up/down) X Y; -#X text 106 130 First inlet is a scaling factor.; #X obj 16 109 mtl/gemsWin; -#X obj 17 133 mtl/gemsMouse; #X obj 17 320 cyclone/prepend set; #X obj 71 267 cyclone/prepend set; #X obj 118 209 cyclone/prepend set; @@ -22,12 +21,13 @@ GEM window. The coordinates match the coordinates of the GEM world. ; #X obj 441 17 import Gem; -#X connect 0 0 9 0; -#X connect 10 0 11 0; -#X connect 10 1 12 0; -#X connect 10 2 13 0; -#X connect 10 3 14 0; -#X connect 11 0 1 0; -#X connect 12 0 2 0; -#X connect 13 0 3 0; -#X connect 14 0 4 0; +#X obj 17 133 mtl/gemsMouse; +#X connect 0 0 8 0; +#X connect 9 0 1 0; +#X connect 10 0 2 0; +#X connect 11 0 3 0; +#X connect 12 0 4 0; +#X connect 17 0 9 0; +#X connect 17 1 10 0; +#X connect 17 2 11 0; +#X connect 17 3 12 0; diff --git a/gemsMouse.pd b/gemsMouse.pd index 2b87298..6ccbdbe 100644 --- a/gemsMouse.pd +++ b/gemsMouse.pd @@ -29,11 +29,7 @@ #X obj 864 432 t b b f; #X msg 685 477 1; #X msg 875 483 2; -#X obj 637 36 inlet scale; #X obj 498 621 zexy/demultiplex 0 1 2; -#X obj 149 517 / 1; -#X obj 261 500 / 1; -#X obj 170 455 t b b f f; #X obj 75 223 value GEMSW; #X obj 187 227 value GEMSH; #X obj 27 121 r GEMS; @@ -43,11 +39,11 @@ #X connect 3 0 5 1; #X connect 4 0 1 1; #X connect 4 1 3 0; -#X connect 5 0 32 0; +#X connect 5 0 6 0; #X connect 6 0 12 0; #X connect 7 0 9 0; #X connect 8 0 4 0; -#X connect 9 0 33 0; +#X connect 9 0 6 1; #X connect 10 0 16 0; #X connect 10 1 17 0; #X connect 10 2 22 0; @@ -56,16 +52,16 @@ #X connect 12 0 11 0; #X connect 12 1 15 1; #X connect 14 0 13 0; -#X connect 15 0 31 0; +#X connect 15 0 30 0; #X connect 16 0 1 0; #X connect 17 0 7 0; #X connect 18 0 19 0; -#X connect 19 0 35 0; -#X connect 19 1 36 0; +#X connect 19 0 31 0; +#X connect 19 1 32 0; #X connect 22 0 15 0; #X connect 22 1 23 0; #X connect 22 2 14 1; -#X connect 23 0 31 1; +#X connect 23 0 30 1; #X connect 24 0 20 0; #X connect 25 0 21 0; #X connect 26 0 15 0; @@ -74,18 +70,11 @@ #X connect 27 0 15 0; #X connect 27 1 29 0; #X connect 27 2 25 1; -#X connect 28 0 31 1; -#X connect 29 0 31 1; -#X connect 30 0 34 0; -#X connect 31 0 14 0; -#X connect 31 1 24 0; -#X connect 31 2 25 0; -#X connect 32 0 6 0; -#X connect 33 0 6 1; -#X connect 34 0 32 0; -#X connect 34 1 33 0; -#X connect 34 2 32 1; -#X connect 34 3 33 1; -#X connect 35 0 0 0; -#X connect 36 0 0 1; -#X connect 37 0 19 0; +#X connect 28 0 30 1; +#X connect 29 0 30 1; +#X connect 30 0 14 0; +#X connect 30 1 24 0; +#X connect 30 2 25 0; +#X connect 31 0 0 0; +#X connect 32 0 0 1; +#X connect 33 0 19 0; diff --git a/gemsWheel-help.pd b/gemsWheel-help.pd index 256acdf..1a0337d 100644 --- a/gemsWheel-help.pd +++ b/gemsWheel-help.pd @@ -1,6 +1,7 @@ #N canvas 554 265 594 457 10; #X declare -lib Gem; -#X obj 44 104 gemhead; +#X declare -lib Gem; +#X obj 45 91 gemhead; #X floatatom 147 247 5 0 0 1 duplications - -; #X obj 313 78 tgl 15 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 1; @@ -11,7 +12,6 @@ #X obj 47 156 rotateXYZ; #X obj 155 87 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1; -#X obj 46 198 mtl/gemsFit window; #X obj 313 117 mtl/gemsWin; #X msg 124 333 \$1 1 1; #X obj 51 386 color; @@ -24,19 +24,20 @@ #X obj 51 421 circle; #X obj 46 267 mtl/gemsWheel 4; #X obj 494 16 import Gem; -#X connect 0 0 7 0; -#X connect 1 0 19 1; -#X connect 2 0 10 0; +#X obj 43 118 mtl/gemsStretch; +#X connect 0 0 20 0; +#X connect 1 0 18 1; +#X connect 2 0 9 0; #X connect 3 0 8 0; #X connect 4 0 6 0; #X connect 5 0 7 3; #X connect 6 0 5 0; -#X connect 7 0 9 0; +#X connect 7 0 18 0; #X connect 8 0 4 0; -#X connect 9 0 19 0; -#X connect 11 0 16 0; -#X connect 12 0 18 0; -#X connect 13 0 11 0; -#X connect 16 0 12 1; -#X connect 19 0 12 0; -#X connect 19 1 13 0; +#X connect 10 0 15 0; +#X connect 11 0 17 0; +#X connect 12 0 10 0; +#X connect 15 0 11 1; +#X connect 18 0 11 0; +#X connect 18 1 12 0; +#X connect 20 0 7 0; -- cgit v1.2.1