Explorar el Código

made kpofwindow parameters global

titi-rpi hace 8 años
padre
commit
901ef35cc5
Se han modificado 2 ficheros con 20 adiciones y 18 borrados
  1. 5 4
      kpofUIbutton.pd
  2. 15 14
      kpofwin.pd

+ 5 - 4
kpofUIbutton.pd

@@ -1,4 +1,4 @@
-#N canvas 574 52 1295 963 10;
+#N canvas 572 52 1295 963 10;
 #X declare -path kollabs;
 #X obj 61 72 cnv 15 198 31 empty empty empty 20 12 0 14 -233017 -66577
 0;
@@ -36,7 +36,7 @@ domain;
 #X connect 4 0 5 0;
 #X connect 6 0 4 0;
 #X restore 268 36 pd \$0-init;
-#N canvas 976 482 768 540 \$0-storage_&_osc 0;
+#N canvas 974 481 768 540 \$0-storage_&_osc 0;
 #X obj 39 21 ds_reg \$2 /kpof/\$1/state;
 #X obj 39 111 ds_reg \$2 /kpof/\$1/rotate;
 #X obj 39 131 ds_reg \$2 /kpof/\$1/size;
@@ -67,6 +67,7 @@ domain;
 #X obj 339 251 osc_bi \$2 /kpof/\$1/color/off;
 #X obj 39 301 ds_reg \$2 /kpof/\$1/image;
 #X obj 339 301 osc_bi \$2 /kpof/\$1/image;
+#X obj 339 381 osc_bi \$2 /kpof/\$1/selected;
 #X restore 269 64 pd \$0-storage_&_osc;
 #X obj 272 119 s pd-\$0-cfg_\$1;
 #N canvas 359 743 464 161 \$0-cfg_\$1 0;
@@ -75,7 +76,7 @@ domain;
 #X obj 9 2 cnv 15 190 80 empty empty POSITIONING 5 8 0 14 -233017 -66577
 0;
 #X obj 26 25 nbx 5 14 -1e+37 1e+37 0 0 /kpof/\$1/translate/X /kpof/\$1/translate/X
-X -10 7 0 10 -262144 -1 -1 0 256;
+X -10 7 0 10 -262144 -1 -1 -115 256;
 #X obj 26 42 nbx 5 14 -1e+37 1e+37 0 0 /kpof/\$1/translate/Y /kpof/\$1/translate/Y
 Y -10 7 0 10 -262144 -1 -1 -35 256;
 #X obj 26 59 nbx 5 14 -1e+37 1e+37 0 0 /kpof/\$1/translate/Z /kpof/\$1/translate/Z
@@ -89,7 +90,7 @@ ratio -30 7 0 10 -262144 -1 -1 1.25 256;
 #X obj 9 85 cnv 15 80 70 empty empty MODE 5 8 0 14 -233017 -66577 0
 ;
 #X obj 15 111 vradio 15 1 0 2 /kpof/\$1/mode /kpof/\$1/mode empty 0
--8 0 10 -262144 -1 -1 0;
+-8 0 10 -262144 -1 -1 1;
 #X text 32 125 switch;
 #X text 32 110 toggle;
 #X obj 92 85 cnv 15 107 70 empty empty TEXT 5 8 0 14 -233017 -66577

+ 15 - 14
kpofwin.pd

@@ -1,6 +1,6 @@
-#N canvas 72 296 1053 726 10;
+#N canvas 68 294 1053 726 10;
 #X declare -path kollabs;
-#N canvas 269 161 768 272 storage_&_osc 0;
+#N canvas 265 159 768 272 storage_&_osc 0;
 #X obj 369 10 osc_r \$1 /kpofwin/window/x;
 #X obj 369 31 osc_r \$1 /kpofwin/window/y;
 #X obj 370 51 osc_r \$1 /kpofwin/normalizedtexcoords;
@@ -12,22 +12,23 @@
 #X obj 369 180 osc_r \$1 /kpofwin/background/R;
 #X obj 369 201 osc_r \$1 /kpofwin/background/G;
 #X obj 370 221 osc_r \$1 /kpofwin/background/B;
-#X obj 41 13 ds_reg \$1 /kpofwin/window/x;
-#X obj 41 32 ds_reg \$1 /kpofwin/window/y;
-#X obj 39 51 ds_reg \$1 /kpofwin/normalizedtexcoords;
-#X obj 40 71 ds_reg \$1 /kpofwin/framerate;
-#X obj 40 92 ds_reg \$1 /kpofwin/cursor;
-#X obj 39 109 ds_reg \$1 /kpofwin/position/x;
-#X obj 40 134 ds_reg \$1 /kpofwin/position/y;
 #X obj 41 183 ds_reg \$1 /kpofwin/background/R;
 #X obj 41 202 ds_reg \$1 /kpofwin/background/G;
 #X obj 39 221 ds_reg \$1 /kpofwin/background/B;
+#X obj 41 13 ds_reg_global \$1 /kpofwin/window/x;
+#X obj 41 32 ds_reg_global \$1 /kpofwin/window/y;
+#X obj 39 51 ds_reg_global \$1 /kpofwin/normalizedtexcoords;
+#X obj 40 71 ds_reg_global \$1 /kpofwin/framerate;
+#X obj 40 92 ds_reg_global \$1 /kpofwin/cursor;
+#X obj 39 109 ds_reg_global \$1 /kpofwin/position/x;
+#X obj 40 134 ds_reg_global \$1 /kpofwin/position/y;
+#X obj 40 154 ds_reg_global \$1 /kpofwin/fullscreen;
 #X restore 249 84 pd storage_&_osc;
 #X obj 28 369 cnv 15 360 60 empty empty creation_arguments: 3 8 0 12
 -191407 -1 0;
 #X text 33 388 1st: module ID \, needs to be unique \; 2nd: storage
 domain;
-#N canvas 1019 576 413 151 cfg_\$1 0;
+#N canvas 1013 573 413 151 cfg_\$1 0;
 #X obj 2 2 cnv 15 170 145 empty empty QUAD 20 12 0 14 -233017 -66577
 0;
 #X obj 179 2 cnv 15 190 145 empty empty BACKGROUND 20 12 0 14 -233017
@@ -41,7 +42,7 @@ empty -10 -9 0 10 -4160 -1 -1 0 0;
 #X obj 15 38 tgl 15 0 /kpofwin/normalizedtexcoords /kpofwin/normalizedtexcoords
 normalizedtexcoords 17 7 0 10 -262144 -1 -1 0 1;
 #X obj 15 58 tgl 15 0 /kpofwin/cursor /kpofwin/cursor cursor 17 7 0
-10 -262144 -1 -1 1 1;
+10 -262144 -1 -1 0 1;
 #X coords 0 0 1 1 155 300 0;
 #X restore 312 258 pd cfg_\$1;
 #N canvas 923 238 450 300 init 0;
@@ -96,7 +97,7 @@ y -10 7 0 10 -261234 -1 -1 100 256;
 #X obj 80 131 nbx 5 14 0 10000 0 0 /kpofwin/window/x /kpofwin/window/x
 x -10 7 0 10 -261234 -1 -1 400 256;
 #X obj 80 147 nbx 5 14 0 10000 0 0 /kpofwin/window/y /kpofwin/window/y
-y -10 7 0 10 -261234 -1 -1 240 256;
+y -10 7 0 10 -261234 -1 -1 300 256;
 #X text 86 113 size;
 #X text 156 110 position;
 #X obj 83 171 nbx 5 14 0 10000 0 0 /kpofwin/framerate /kpofwin/framerate
@@ -109,7 +110,7 @@ fps -20 7 0 10 -261234 -1 -1 25 256;
 17 7 0 10 -262144 -1 -1;
 #X obj 514 91 pack f f f;
 #X obj 581 41 r /kpofwin/fullscreen;
-#X obj 612 88 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 612 88 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 749 452 pack f f f;
 #X obj 786 409 t b f;
@@ -125,7 +126,7 @@ fps -20 7 0 10 -261234 -1 -1 25 256;
 #X msg 838 73 0;
 #X msg 878 73 1;
 #X obj 68 101 tgl 15 0 /kpofwin/fullscreen /kpofwin/fullscreen fullscreen
-17 7 0 10 -262144 -1 -1 0 1;
+17 7 0 10 -262144 -1 -1 1 1;
 #X obj 838 101 s /kpofwin/fullscreen;
 #X obj 581 63 t b f;
 #X connect 9 0 10 0;