Bladeren bron

kpofmedia correction

reorder corners so they are consistent
Etienne Landon 8 jaren geleden
bovenliggende
commit
abc44b9107
3 gewijzigde bestanden met toevoegingen van 135 en 121 verwijderingen
  1. 100 87
      kpofmedia.pd
  2. 35 34
      kpofsource.pd
  3. BIN
      media/grid.png

+ 100 - 87
kpofmedia.pd

@@ -1,4 +1,4 @@
-#N canvas 459 204 965 433 10;
+#N canvas 850 542 965 433 10;
 #X declare -path kollabs;
 #X obj 61 72 cnv 15 198 31 empty empty empty 20 12 0 14 -233017 -66577
 0;
@@ -39,35 +39,36 @@
 #X restore 27 149 pd storage_&_osc;
 #X obj 14 242 cnv 15 360 60 empty empty creation_arguments: 3 8 0 12
 -191407 -1 0;
-#X obj 402 114 poftranslate;
-#X obj 402 158 pofscale 1 1;
-#X obj 402 136 pofrotate;
-#N canvas 168 161 507 632 corners 0;
+#N canvas 1094 315 507 632 corners 0;
 #X obj 58 568 outlet;
-#X obj 58 88 r /kpof/\$1/corner/top/left/x;
-#X obj 83 112 r /kpof/\$1/corner/top/left/y;
-#X obj 91 200 r /kpof/\$1/corner/top/right/x;
-#X obj 116 224 r /kpof/\$1/corner/top/right/y;
-#X obj 142 323 r /kpof/\$1/corner/bottom/right/x;
-#X obj 167 350 r /kpof/\$1/corner/bottom/right/y;
-#X obj 201 445 r /kpof/\$1/corner/bottom/left/x;
-#X obj 226 472 r /kpof/\$1/corner/bottom/left/y;
-#X msg 58 160 corner 3 \$1 \$2;
-#X msg 91 283 corner 2 \$1 \$2;
-#X msg 142 406 corner 1 \$1 \$2;
-#X msg 201 519 corner 0 \$1 \$2;
-#X obj 58 134 Line2 100;
-#X obj 91 249 Line2 100;
-#X obj 142 379 Line2 100;
-#X obj 201 496 Line2 100;
+#X obj 58 28 r /kpof/\$1/corner/top/left/x;
+#X obj 79 52 r /kpof/\$1/corner/top/left/y;
+#X obj 91 151 r /kpof/\$1/corner/top/right/x;
+#X obj 116 175 r /kpof/\$1/corner/top/right/y;
+#X obj 142 273 r /kpof/\$1/corner/bottom/right/x;
+#X obj 167 300 r /kpof/\$1/corner/bottom/right/y;
+#X obj 201 425 r /kpof/\$1/corner/bottom/left/x;
+#X obj 226 452 r /kpof/\$1/corner/bottom/left/y;
+#X msg 58 120 corner 0 \$1 \$2;
+#X msg 91 239 corner 1 \$1 \$2;
+#X msg 142 366 corner 2 \$1 \$2;
+#X msg 201 519 corner 3 \$1 \$2;
+#X obj 58 94 pack f f;
+#X obj 91 219 pack f f;
+#X obj 142 345 pack f f;
+#X obj 201 496 pack f f;
+#X obj 79 74 t b f;
+#X obj 116 195 t b f;
+#X obj 167 324 t b f;
+#X obj 226 472 t b f;
 #X connect 1 0 13 0;
-#X connect 2 0 13 1;
+#X connect 2 0 17 0;
 #X connect 3 0 14 0;
-#X connect 4 0 14 1;
+#X connect 4 0 18 0;
 #X connect 5 0 15 0;
-#X connect 6 0 15 1;
+#X connect 6 0 19 0;
 #X connect 7 0 16 0;
-#X connect 8 0 16 1;
+#X connect 8 0 20 0;
 #X connect 9 0 0 0;
 #X connect 10 0 0 0;
 #X connect 11 0 0 0;
@@ -76,35 +77,43 @@
 #X connect 14 0 10 0;
 #X connect 15 0 11 0;
 #X connect 16 0 12 0;
-#X restore 528 295 pd corners;
-#X obj 702 114 poftranslate;
-#X obj 702 158 pofscale 1 1;
-#X obj 702 136 pofrotate;
+#X connect 17 0 13 0;
+#X connect 17 1 13 1;
+#X connect 18 0 14 0;
+#X connect 18 1 14 1;
+#X connect 19 0 15 0;
+#X connect 19 1 15 1;
+#X connect 20 0 16 0;
+#X connect 20 1 16 1;
+#X restore 527 295 pd corners;
 #X obj 459 262 r /kpof/\$1/media/1;
 #X obj 702 214 pofcolor 1 1 1 1;
 #X obj 402 214 pofcolor 1 1 1 1;
 #X text 19 261 1st: module ID \, needs to be unique \; 2nd: storage
 domain;
 #X obj 158 145 s pd-cfg_\$1;
-#N canvas 47 675 413 151 cfg_\$1 0;
+#N canvas 82 863 413 151 cfg_\$1 1;
 #X obj 2 2 cnv 15 170 145 empty empty QUAD 20 12 0 14 -233017 -66577
 0;
-#X obj 21 92 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/top/left/x
-/kpof/\$1/corner/top/left/x x -10 7 0 10 -261234 -1 -1 0 256;
-#X obj 21 108 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/top/left/y
-/kpof/\$1/corner/top/left/y y -10 7 0 10 -261234 -1 -1 0 256;
-#X obj 98 92 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/top/right/x
-/kpof/\$1/corner/top/right/x x -10 7 0 10 -261234 -1 -1 0 256;
-#X obj 98 108 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/top/right/y
-/kpof/\$1/corner/top/right/y y -10 7 0 10 -261234 -1 -1 0 256;
-#X obj 21 56 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/bottom/left/x
-/kpof/\$1/corner/bottom/left/x x -10 7 0 10 -261234 -1 -1 0 256;
-#X obj 21 72 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/bottom/left/y
-/kpof/\$1/corner/bottom/left/y y -10 7 0 10 -261234 -1 -1 0 256;
-#X obj 98 56 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/bottom/right/x
-/kpof/\$1/corner/bottom/right/x x -10 7 0 10 -261234 -1 -1 0 256;
-#X obj 98 72 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/bottom/right/y
-/kpof/\$1/corner/bottom/right/y y -10 7 0 10 -261234 -1 -1 0 256;
+#X obj 21 52 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/top/left/x
+/kpof/\$1/corner/top/left/x x -10 7 0 10 -261234 -1 -1 -368 256;
+#X obj 21 68 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/top/left/y
+/kpof/\$1/corner/top/left/y y -10 7 0 10 -261234 -1 -1 -342 256;
+#X obj 98 52 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/top/right/x
+/kpof/\$1/corner/top/right/x x -10 7 0 10 -261234 -1 -1 200 256;
+#X obj 98 68 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/top/right/y
+/kpof/\$1/corner/top/right/y y -10 7 0 10 -261234 -1 -1 -200 256;
+#X obj 21 98 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/bottom/left/x
+/kpof/\$1/corner/bottom/left/x x -10 7 0 10 -261234 -1 -1 -200 256
+;
+#X obj 21 114 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/bottom/left/y
+/kpof/\$1/corner/bottom/left/y y -10 7 0 10 -261234 -1 -1 200 256;
+#X obj 98 98 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/bottom/right/x
+/kpof/\$1/corner/bottom/right/x x -10 7 0 10 -261234 -1 -1 200 256
+;
+#X obj 98 114 nbx 5 14 -10000 10000 0 0 /kpof/\$1/corner/bottom/right/y
+/kpof/\$1/corner/bottom/right/y y -10 7 0 10 -261234 -1 -1 200 256
+;
 #X text 14 32 corners position;
 #X obj 179 2 cnv 15 190 145 empty empty MEDIA&MIX 20 12 0 14 -233017
 -66577 0;
@@ -113,13 +122,13 @@ domain;
 #X obj 268 36 bng 15 250 50 0 /kpof/\$1/media/2/openpanel empty player_2
 17 7 0 10 -262144 -1 -1;
 #X obj 197 80 vsl 15 60 0 1 0 0 /kpof/\$1/alpha/1 /kpof/\$1/alpha/1
-alpha1 -10 -9 0 10 -262144 -1 -1 0 0;
+alpha1 -10 -9 0 10 -262144 -1 -1 5900 0;
 #X obj 247 80 vsl 15 60 0 1 0 0 /kpof/\$1/alpha/2 /kpof/\$1/alpha/2
 alpha2 -10 -9 0 10 -262144 -1 -1 0 0;
 #X obj 297 80 vsl 15 60 0 2000 0 0 /kpof/\$1/fadetime /kpof/\$1/fadetime
 time -10 -9 0 10 -262144 -1 -1 0 0;
 #X obj 332 85 vradio 15 1 0 3 /kpof/\$1/fademode /kpof/\$1/fademode
-mode 0 -8 0 10 -262144 -1 -1 2;
+mode 0 -8 0 10 -262144 -1 -1 1;
 #X coords 0 0 1 1 155 300 0;
 #X restore 158 167 pd cfg_\$1;
 #N canvas 361 127 598 647 medias&folders 0;
@@ -365,21 +374,21 @@ mode 0 -8 0 10 -262144 -1 -1 2;
 #X connect 14 0 15 0;
 #X connect 17 0 16 0;
 #X restore 571 173 pd alpha;
-#N canvas 763 178 450 300 init 0;
+#N canvas 761 177 450 300 init 0;
 #X obj 98 76 loadbang;
 #X obj 98 98 list append \$1;
-#X msg 98 121 \; /kpof/\$1/corner/top/left/x -200 \; /kpof/\$1/corner/top/left/y
-200 \; /kpof/\$1/corner/top/right/x 200 \; /kpof/\$1/corner/top/right/y
-200 \; /kpof/\$1/corner/bottom/right/x 200 \; /kpof/\$1/corner/bottom/right/y
--200 \; /kpof/\$1/corner/bottom/left/x -200 \; /kpof/\$1/corner/bottom/left/y
--200 \; /kpof/\$1/fadetime 0 \; /kpof/\$1/alpha/1 0.5 \; /kpof/\$1/alpha/2
-0.5 \; /kpof/\$1/state 1;
 #X obj 173 74 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
 #X obj 102 37 declare -path kollabs;
+#X msg 98 121 \; /kpof/\$1/corner/top/left/x -200 \; /kpof/\$1/corner/top/left/y
+-200 \; /kpof/\$1/corner/top/right/x 200 \; /kpof/\$1/corner/top/right/y
+-200 \; /kpof/\$1/corner/bottom/right/x 200 \; /kpof/\$1/corner/bottom/right/y
+200 \; /kpof/\$1/corner/bottom/left/x -200 \; /kpof/\$1/corner/bottom/left/y
+200 \; /kpof/\$1/fadetime 0 \; /kpof/\$1/alpha/1 0.5 \; /kpof/\$1/alpha/2
+0.5 \; /kpof/\$1/state 1;
 #X connect 0 0 1 0;
-#X connect 1 0 2 0;
-#X connect 3 0 1 0;
+#X connect 1 0 4 0;
+#X connect 2 0 1 0;
 #X restore 26 121 pd init;
 #X obj 402 81 pofvisible 1;
 #X obj 402 43 r /kpof/\$1/state;
@@ -396,36 +405,40 @@ mode 0 -8 0 10 -262144 -1 -1 2;
 #X obj 702 370 pofquad 200 200;
 #X obj 759 346 pofquad 200 200;
 #X obj 759 251 r /kpof/\$1/media/2;
-#X obj 402 283 kpofsource;
 #X obj 702 275 kpofsource;
-#X connect 2 0 17 0;
+#X obj 402 283 kpofsource;
+#X obj 402 114 poftranslate;
+#X obj 402 158 pofscale 1 1;
+#X obj 402 136 pofrotate;
+#X obj 702 114 poftranslate;
+#X obj 702 158 pofscale 1 1;
+#X obj 702 136 pofrotate;
+#X connect 2 0 11 0;
 #X connect 3 0 2 0;
-#X connect 6 0 8 0;
-#X connect 7 0 15 0;
-#X connect 8 0 7 0;
-#X connect 9 0 26 0;
-#X connect 9 0 33 0;
-#X connect 9 0 34 0;
-#X connect 9 0 35 0;
-#X connect 10 0 12 0;
-#X connect 11 0 14 0;
-#X connect 12 0 11 0;
-#X connect 13 0 37 1;
-#X connect 14 0 38 0;
-#X connect 15 0 37 0;
-#X connect 20 0 15 4;
-#X connect 20 1 14 4;
-#X connect 22 0 6 0;
-#X connect 23 0 22 0;
-#X connect 24 0 10 0;
-#X connect 25 0 24 0;
-#X connect 30 0 31 0;
-#X connect 31 0 22 0;
-#X connect 31 1 24 0;
-#X connect 32 0 31 0;
-#X connect 36 0 38 1;
-#X connect 37 0 26 0;
-#X connect 37 1 33 0;
-#X connect 38 0 34 0;
-#X connect 38 1 35 0;
+#X connect 6 0 20 0;
+#X connect 6 0 27 0;
+#X connect 6 0 28 0;
+#X connect 6 0 29 0;
+#X connect 7 0 32 1;
+#X connect 8 0 31 0;
+#X connect 9 0 32 0;
+#X connect 14 0 9 4;
+#X connect 14 1 8 4;
+#X connect 16 0 9 0;
+#X connect 17 0 16 0;
+#X connect 18 0 8 0;
+#X connect 19 0 18 0;
+#X connect 24 0 25 0;
+#X connect 25 0 16 0;
+#X connect 25 1 18 0;
+#X connect 26 0 25 0;
+#X connect 30 0 31 1;
+#X connect 31 0 28 0;
+#X connect 31 1 29 0;
+#X connect 32 0 20 0;
+#X connect 32 1 27 0;
+#X connect 33 0 35 0;
+#X connect 35 0 34 0;
+#X connect 36 0 38 0;
+#X connect 38 0 37 0;
 #X coords 0 -1 1 1 200 50 1 60 55;

+ 35 - 34
kpofsource.pd

@@ -1,4 +1,4 @@
-#N canvas 641 94 718 486 10;
+#N canvas 634 91 718 486 10;
 #X obj 157 97 pofutil;
 #X obj 157 117 route dirbaseext;
 #X msg 157 75 dirbaseext /\$1;
@@ -9,12 +9,9 @@
 #X obj 157 140 route /img/ /vid/;
 #X obj 157 4 inlet file;
 #X obj 81 243 inlet head;
-#X obj 157 386 pofimage ./media/img/bikers.jpg tex;
-#X obj 379 388 poffilm tex;
-#X obj 194 355 pofvisible;
-#X obj 379 367 pofvisible;
-#X obj 157 410 outlet imghead;
-#X obj 379 413 outlet vidhead;
+#X obj 519 388 poffilm tex;
+#X obj 157 490 outlet imghead;
+#X obj 519 413 outlet vidhead;
 #X obj 352 194 list prepend;
 #X obj 352 245 t a b;
 #X obj 379 293 t f;
@@ -23,7 +20,7 @@
 #X msg 184 264 0;
 #X obj 194 330 == 0;
 #X text 404 294 0:image 1:video;
-#X obj 449 351 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 589 351 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
 #X obj 157 24 symbol;
 #X obj 121 7 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
@@ -32,36 +29,40 @@
 #X obj 157 50 t s b;
 #X msg 157 218 set \$1/../media/img/\$2.\$3;
 #X msg 352 217 load \$1/../media/vid/\$2.\$3 \, play 1;
+#X obj 519 367 pofvisible 0;
+#X obj 194 355 pofvisible 1;
+#X obj 157 436 pofimage /home/titi/work/dev/pd/Metalu-Licorne/media/img/media/img/bullet_hole_PNG6063.png
+tex;
 #X connect 0 0 1 0;
 #X connect 1 0 7 0;
 #X connect 2 0 0 0;
-#X connect 3 0 29 0;
+#X connect 3 0 26 0;
 #X connect 4 0 6 0;
 #X connect 5 0 4 0;
 #X connect 6 0 3 1;
-#X connect 6 0 16 1;
+#X connect 6 0 13 1;
 #X connect 7 0 3 0;
-#X connect 7 1 16 0;
-#X connect 8 0 25 0;
-#X connect 9 0 12 0;
-#X connect 9 0 13 0;
-#X connect 10 0 14 0;
-#X connect 11 0 15 0;
-#X connect 12 0 10 0;
-#X connect 13 0 11 0;
-#X connect 16 0 30 0;
-#X connect 17 0 11 0;
-#X connect 17 1 19 0;
-#X connect 18 0 13 0;
-#X connect 18 0 22 0;
-#X connect 19 0 18 0;
-#X connect 20 0 10 0;
-#X connect 20 1 21 0;
-#X connect 21 0 18 0;
-#X connect 22 0 12 0;
-#X connect 25 0 28 0;
-#X connect 26 0 25 0;
-#X connect 28 0 2 0;
-#X connect 28 1 5 0;
-#X connect 29 0 20 0;
-#X connect 30 0 17 0;
+#X connect 7 1 13 0;
+#X connect 8 0 22 0;
+#X connect 9 0 28 0;
+#X connect 9 0 29 0;
+#X connect 10 0 12 0;
+#X connect 13 0 27 0;
+#X connect 14 0 10 0;
+#X connect 14 1 16 0;
+#X connect 15 0 19 0;
+#X connect 15 0 28 0;
+#X connect 16 0 15 0;
+#X connect 17 0 30 0;
+#X connect 17 1 18 0;
+#X connect 18 0 15 0;
+#X connect 19 0 29 0;
+#X connect 22 0 25 0;
+#X connect 23 0 22 0;
+#X connect 25 0 2 0;
+#X connect 25 1 5 0;
+#X connect 26 0 17 0;
+#X connect 27 0 14 0;
+#X connect 28 0 10 0;
+#X connect 29 0 30 0;
+#X connect 30 0 11 0;

BIN
media/grid.png