Bläddra i källkod

improved corner control with touchpad

titi-rpi 8 år sedan
förälder
incheckning
b9c9a20d3e
4 ändrade filer med 269 tillägg och 105 borttagningar
  1. 121 7
      chat.pd
  2. 87 44
      interface.pd
  3. 60 53
      interface.presets
  4. 1 1
      kpof

+ 121 - 7
chat.pd

@@ -1,4 +1,4 @@
-#N canvas 898 270 1001 740 10;
+#N canvas 896 269 1001 740 10;
 #X declare -path kollabs;
 #X declare -path kollabs;
 #X declare -path kollabs;
@@ -83,14 +83,130 @@
 #X obj 583 310 list prepend send;
 #X obj 583 332 list trim;
 #X obj 307 324 kpofquad testquad;
-#X obj 559 526 print;
+#X obj 654 528 print;
 #X msg 479 41 \; /ds/0/loadfile ../../chat.presets \; /ds/0/scene/current
 0 \; /kpofwin/fullscreen 1;
 #X obj 582 445 route scene play quad movie;
 #X obj 213 33 kpofwin 0;
-#X obj 650 501 unpack f f;
-#X obj 650 523 s /kpof/testquad/corner/top/left/x;
-#X obj 717 543 s /kpof/testquad/corner/top/left/y;
+#N canvas 351 69 839 632 dragcorners 0;
+#X obj 93 145 route TL;
+#X obj 96 99 inlet;
+#X obj 93 348 s /kpof/testquad/corner/top/left/x;
+#X obj 93 273 +;
+#X obj 129 231 r /kpof/testquad/corner/top/left/x;
+#X obj 144 193 unpack f f;
+#X obj 93 167 route up;
+#X obj 111 253 f;
+#X obj 93 189 bang;
+#X obj 143 293 +;
+#X obj 161 273 f;
+#X obj 74 231 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 143 368 s /kpof/testquad/corner/top/left/y;
+#X obj 179 251 r /kpof/testquad/corner/top/left/y;
+#X obj 452 286 +;
+#X obj 503 206 unpack f f;
+#X obj 452 180 route up;
+#X obj 470 266 f;
+#X obj 452 202 bang;
+#X obj 502 306 +;
+#X obj 520 286 f;
+#X obj 433 244 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 452 158 route TR;
+#X obj 488 244 r /kpof/testquad/corner/top/right/x;
+#X obj 539 265 r /kpof/testquad/corner/top/right/y;
+#X obj 472 355 s /kpof/testquad/corner/top/right/x;
+#X obj 502 381 s /kpof/testquad/corner/top/right/y;
+#X obj 151 474 unpack f f;
+#X obj 100 448 route up;
+#X obj 118 534 f;
+#X obj 100 470 bang;
+#X obj 150 574 +;
+#X obj 168 554 f;
+#X obj 459 567 +;
+#X obj 510 487 unpack f f;
+#X obj 459 461 route up;
+#X obj 477 547 f;
+#X obj 459 483 bang;
+#X obj 509 587 +;
+#X obj 527 567 f;
+#X obj 440 525 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 100 426 route BL;
+#X obj 459 439 route BR;
+#X obj 136 512 r /kpof/testquad/corner/bottom/left/x;
+#X obj 186 532 r /kpof/testquad/corner/bottom/left/y;
+#X obj 495 525 r /kpof/testquad/corner/bottom/right/x;
+#X obj 546 546 r /kpof/testquad/corner/bottom/right/y;
+#X obj 100 629 s /kpof/testquad/corner/bottom/left/x;
+#X obj 150 649 s /kpof/testquad/corner/bottom/left/y;
+#X obj 479 636 s /kpof/testquad/corner/bottom/right/x;
+#X obj 509 662 s /kpof/testquad/corner/bottom/right/y;
+#X obj 100 574 +;
+#X obj 94 504 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X connect 0 0 6 0;
+#X connect 0 1 22 0;
+#X connect 1 0 0 0;
+#X connect 3 0 2 0;
+#X connect 4 0 7 1;
+#X connect 5 0 3 0;
+#X connect 5 1 9 0;
+#X connect 6 0 8 0;
+#X connect 6 1 5 0;
+#X connect 7 0 3 1;
+#X connect 8 0 7 0;
+#X connect 8 0 10 0;
+#X connect 8 0 11 0;
+#X connect 9 0 12 0;
+#X connect 10 0 9 1;
+#X connect 13 0 10 1;
+#X connect 14 0 25 0;
+#X connect 15 0 14 0;
+#X connect 15 1 19 0;
+#X connect 16 0 18 0;
+#X connect 16 1 15 0;
+#X connect 17 0 14 1;
+#X connect 18 0 17 0;
+#X connect 18 0 20 0;
+#X connect 18 0 21 0;
+#X connect 19 0 26 0;
+#X connect 20 0 19 1;
+#X connect 22 0 16 0;
+#X connect 22 1 41 0;
+#X connect 23 0 17 1;
+#X connect 24 0 20 1;
+#X connect 27 0 51 0;
+#X connect 27 1 31 0;
+#X connect 28 0 30 0;
+#X connect 28 1 27 0;
+#X connect 29 0 51 1;
+#X connect 30 0 29 0;
+#X connect 30 0 32 0;
+#X connect 30 0 52 0;
+#X connect 31 0 48 0;
+#X connect 32 0 31 1;
+#X connect 33 0 49 0;
+#X connect 34 0 33 0;
+#X connect 34 1 38 0;
+#X connect 35 0 37 0;
+#X connect 35 1 34 0;
+#X connect 36 0 33 1;
+#X connect 37 0 36 0;
+#X connect 37 0 39 0;
+#X connect 37 0 40 0;
+#X connect 38 0 50 0;
+#X connect 39 0 38 1;
+#X connect 41 0 28 0;
+#X connect 41 1 42 0;
+#X connect 42 0 35 0;
+#X connect 43 0 29 1;
+#X connect 44 0 32 1;
+#X connect 45 0 36 1;
+#X connect 46 0 39 1;
+#X connect 51 0 47 0;
+#X restore 596 567 pd dragcorners;
 #X connect 2 0 17 0;
 #X connect 3 0 29 0;
 #X connect 5 0 4 0;
@@ -110,5 +226,3 @@
 #X connect 30 2 28 0;
 #X connect 30 2 32 0;
 #X connect 30 4 24 0;
-#X connect 32 0 33 0;
-#X connect 32 1 34 0;

+ 87 - 44
interface.pd

@@ -1,5 +1,32 @@
-#N canvas 592 137 916 829 10;
+#N canvas 300 152 916 829 10;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
 #X declare -path pof-lcd -lib pof -path kpof;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
+#X declare -path kollabs;
 #X obj 56 36 kollabs/ds_logic UI;
 #X obj 56 61 kollabs/ds_gui UI;
 #X obj 214 33 kpofwin UI;
@@ -92,7 +119,7 @@
 #X obj 150 256 / 800;
 #X obj 148 233 unpack f f;
 #X obj 148 213 route window;
-#N canvas 959 60 819 453 transport 1;
+#N canvas 957 59 819 453 transport 0;
 #X obj 87 18 inlet;
 #X obj 87 40 kpoftransform tr-transf UI;
 #X obj 87 95 t a a a a a;
@@ -112,7 +139,7 @@
 #X connect 3 0 4 0;
 #X restore 120 698 pd transport;
 #X obj 120 640 t a a;
-#X obj 704 155 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 704 155 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 704 175 s RPI-TOUCH;
 #X obj 60 286 t a a a;
@@ -231,8 +258,6 @@
 #X obj 256 337 - 1;
 #X obj 153 406 pack 0 300;
 #X obj 461 48 loadbang;
-#X msg 463 73 \; /ds/UI/loadfile ../../interface.presets \; /ds/UI/scene/current
-0 \; /kpofwin/fullscreen 1 \; RPI-TOUCH 1;
 #X obj 56 12 declare -path pof-lcd -lib pof -path kpof;
 #X obj 487 243 kollabs/ds_logic 0;
 #X obj 487 268 kollabs/ds_gui 0;
@@ -247,7 +272,7 @@
 #X msg 490 543 send /kpof/testquad/corner/top/left/x \$1;
 #X obj 157 527 poftranslate 800 0;
 #X obj 83 767 poftranslate -800 0;
-#N canvas 538 126 1101 311 OSC-patch 1;
+#N canvas 534 124 1101 386 OSC-patch 0;
 #X obj 322 305 outlet;
 #X obj 105 25 r /osc/UI/out;
 #X msg 18 264 send /kpof/testquad/corner/top/left/x \$1;
@@ -255,7 +280,6 @@
 #X symbolatom 468 26 10 0 0 0 - - -, f 10;
 #X obj 529 70 list fromsymbol;
 #X obj 529 92 list split 2;
-#X obj 157 53 print osc;
 #X obj 569 113 - 48;
 #X msg 460 69 0;
 #X msg 322 151 send scene \$1;
@@ -263,31 +287,48 @@
 #X obj 322 47 route prev-sc next-sc blackout;
 #X msg 322 69 symbol -;
 #X msg 392 89 symbol +;
-#X obj 742 28 r /kpof/cornersPad/touch;
-#X obj 800 54 r /corners/selected;
-#X msg 742 100 send quad \$1 \$2 \$3;
-#X obj 741 79 pack f f s;
+#X obj 741 8 r /kpof/cornersPad/touch;
+#X obj 808 99 r /corners/selected;
+#X obj 741 119 pack f f s;
+#X obj 807 226 r /corners/selected;
+#X obj 710 251 pack f f s;
+#X obj 710 202 r /kpof/cornersPad/touch/up;
+#X msg 742 140 send quad \$3 \$1 \$2;
+#X msg 711 274 send quad \$3 up \$1 \$2;
+#X obj 710 224 list split 2;
+#X obj 157 53 print osc;
+#X obj 741 30 unpack f f;
+#X obj 741 52 * 10;
+#X obj 801 52 * 10;
 #X connect 1 0 3 0;
-#X connect 1 0 7 0;
 #X connect 5 0 6 0;
-#X connect 6 1 8 0;
-#X connect 8 0 10 0;
-#X connect 9 0 10 0;
-#X connect 10 0 0 0;
+#X connect 6 1 7 0;
+#X connect 7 0 9 0;
+#X connect 8 0 9 0;
+#X connect 9 0 0 0;
+#X connect 10 0 11 0;
 #X connect 11 0 12 0;
-#X connect 12 0 13 0;
-#X connect 12 1 14 0;
-#X connect 12 2 9 0;
-#X connect 12 3 5 0;
-#X connect 13 0 10 0;
-#X connect 14 0 10 0;
-#X connect 15 0 18 0;
-#X connect 16 0 18 2;
-#X connect 17 0 0 0;
-#X connect 18 0 17 0;
+#X connect 11 1 13 0;
+#X connect 11 2 8 0;
+#X connect 11 3 5 0;
+#X connect 12 0 9 0;
+#X connect 13 0 9 0;
+#X connect 14 0 24 0;
+#X connect 15 0 16 2;
+#X connect 16 0 20 0;
+#X connect 17 0 18 2;
+#X connect 18 0 21 0;
+#X connect 19 0 22 0;
+#X connect 20 0 0 0;
+#X connect 21 0 0 0;
+#X connect 22 0 18 0;
+#X connect 24 0 25 0;
+#X connect 24 1 26 0;
+#X connect 25 0 16 0;
+#X connect 26 0 16 1;
 #X restore 534 441 pd OSC-patch;
 #X obj 713 427 r /kpof/cornersPad/touch;
-#N canvas 1030 427 792 609 scene-settings 1;
+#N canvas 1026 425 792 609 scene-settings 1;
 #X obj 94 132 t a a a a;
 #X text 172 135 SCENE SETTINGS;
 #X obj 154 157 kpofUIpad cornersPad UI;
@@ -296,7 +337,6 @@
 #X obj 110 419 kpofUIbutton BL UI;
 #X obj 90 479 kpofUIbutton BR UI;
 #X obj 90 275 t a a a a;
-#X obj 109 215 kpoftransform corners;
 #X obj 94 70 inlet;
 #X obj 255 42 extra/group-buttons TL corners;
 #X obj 505 49 text define -k corners;
@@ -307,17 +347,21 @@
 #X obj 535 192 r /corners/selected;
 #X symbolatom 535 214 10 0 0 0 - - -, f 10;
 #X obj 539 121;
-#X connect 0 2 8 0;
+#X obj 109 215 kpoftransform corners UI;
+#X obj 42 547 kpofUIslider;
+#X connect 0 2 17 0;
 #X connect 0 3 2 0;
 #X connect 7 0 6 0;
 #X connect 7 1 5 0;
 #X connect 7 2 4 0;
 #X connect 7 3 3 0;
-#X connect 8 0 7 0;
-#X connect 9 0 0 0;
-#X connect 15 0 16 0;
+#X connect 8 0 0 0;
+#X connect 14 0 15 0;
+#X connect 17 0 7 0;
 #X restore 83 800 pd scene-settings;
 #X obj 713 449 print;
+#X msg 463 73 \; RPI-TOUCH 1 \; /ds/UI/loadfile ../../interface.presets
+\; /ds/UI/scene/current 0 \; /kpofwin/fullscreen 1;
 #X connect 5 0 7 0;
 #X connect 7 0 16 0;
 #X connect 8 0 11 0;
@@ -331,23 +375,22 @@
 #X connect 16 0 6 0;
 #X connect 16 1 26 0;
 #X connect 16 2 21 0;
-#X connect 17 0 46 0;
+#X connect 17 0 45 0;
 #X connect 17 2 13 0;
-#X connect 17 4 45 0;
+#X connect 17 4 44 0;
 #X connect 18 0 19 0;
-#X connect 20 0 45 1;
+#X connect 20 0 44 1;
 #X connect 24 0 29 0;
-#X connect 25 0 28 0;
 #X connect 26 0 17 0;
 #X connect 27 0 26 1;
 #X connect 28 0 30 0;
 #X connect 29 0 28 0;
 #X connect 30 0 27 0;
-#X connect 31 0 32 0;
-#X connect 38 0 39 0;
-#X connect 39 0 37 0;
-#X connect 43 0 44 0;
-#X connect 44 0 37 0;
-#X connect 45 0 18 0;
-#X connect 46 0 49 0;
-#X connect 47 0 37 0;
+#X connect 31 0 50 0;
+#X connect 37 0 38 0;
+#X connect 38 0 36 0;
+#X connect 42 0 43 0;
+#X connect 43 0 36 0;
+#X connect 44 0 18 0;
+#X connect 45 0 48 0;
+#X connect 46 0 36 0;

+ 60 - 53
interface.presets

@@ -25,59 +25,13 @@
 # SETTINGS
 # TABLES
 # DATA
-/kpof/cornersPad/color/off 0.3 0.3 0.3 1
-/kpof/cornersPad/translate/Z 0
-/kpof/cornersPad/translate/Y 0
-/kpof/cornersPad/translate/X -154
-/kpof/cornersPad/color/border 0.5 0.5 0.5 1
-/kpof/cornersPad/color/text 1 1 1 1
-/kpof/cornersPad/color/on 0 0.4 0.6 1
-/kpof/cornersPad/size/ratio 1.25
-/kpof/cornersPad/size 4
-/kpof/cornersPad/rotate 0
-/kpof/cornersPad/state 1
-/kpof/TL/color/off 0.3 0.3 0.3 1
-/kpof/TL/translate/Z 0
-/kpof/TL/translate/Y -215
-/kpof/TL/translate/X -155
-/kpof/TL/text TL
-/kpof/TL/text/size 25
-/kpof/TL/color/border 0.5 0.5 0.5 1
-/kpof/TL/color/text 1 1 1 1
-/kpof/TL/color/on 0 0.4 0.6 1
-/kpof/TL/mode 0
-/kpof/TL/size/ratio 1.25
-/kpof/TL/size 1
-/kpof/TL/rotate 0
-/kpof/TL/state 1
-/kpof/TR/color/off 0.3 0.3 0.3 1
-/kpof/TR/translate/Z 0
-/kpof/TR/translate/Y -215
-/kpof/TR/translate/X 155
-/kpof/TR/text TR
-/kpof/TR/text/size 25
-/kpof/TR/color/border 0.5 0.5 0.5 1
-/kpof/TR/color/text 1 1 1 1
-/kpof/TR/color/on 0 0.4 0.6 1
-/kpof/TR/mode 0
-/kpof/TR/size/ratio 1.25
-/kpof/TR/size 1
-/kpof/TR/rotate 0
-/kpof/TR/state 1
-/kpof/BL/color/off 0.3 0.3 0.3 1
-/kpof/BL/translate/Z 0
-/kpof/BL/translate/Y 215
-/kpof/BL/translate/X -155
-/kpof/BL/text BL
-/kpof/BL/text/size 25
-/kpof/BL/color/border 0.5 0.5 0.5 1
-/kpof/BL/color/text 1 1 1 1
-/kpof/BL/color/on 0 0.4 0.6 1
-/kpof/BL/mode 0
-/kpof/BL/size/ratio 1.25
-/kpof/BL/size 1
-/kpof/BL/rotate 0
-/kpof/BL/state 1
+/kpof/corners/scale/Y 1
+/kpof/corners/scale/X 1
+/kpof/corners/translate/Z 0
+/kpof/corners/translate/Y 0
+/kpof/corners/translate/X -150
+/kpof/corners/rotate 0
+/kpof/corners/state 1
 /kpof/BR/color/off 0.3 0.3 0.3 1
 /kpof/BR/translate/Z 0
 /kpof/BR/translate/Y 215
@@ -92,6 +46,59 @@
 /kpof/BR/size 1
 /kpof/BR/rotate 0
 /kpof/BR/state 1
+/kpof/BL/color/off 0.3 0.3 0.3 1
+/kpof/BL/translate/Z 0
+/kpof/BL/translate/Y 215
+/kpof/BL/translate/X -155
+/kpof/BL/text BL
+/kpof/BL/text/size 25
+/kpof/BL/color/border 0.5 0.5 0.5 1
+/kpof/BL/color/text 1 1 1 1
+/kpof/BL/color/on 0 0.4 0.6 1
+/kpof/BL/mode 0
+/kpof/BL/size/ratio 1.25
+/kpof/BL/size 1
+/kpof/BL/rotate 0
+/kpof/BL/state 1
+/kpof/TR/color/off 0.3 0.3 0.3 1
+/kpof/TR/translate/Z 0
+/kpof/TR/translate/Y -215
+/kpof/TR/translate/X 155
+/kpof/TR/text TR
+/kpof/TR/text/size 25
+/kpof/TR/color/border 0.5 0.5 0.5 1
+/kpof/TR/color/text 1 1 1 1
+/kpof/TR/color/on 0 0.4 0.6 1
+/kpof/TR/mode 0
+/kpof/TR/size/ratio 1.25
+/kpof/TR/size 1
+/kpof/TR/rotate 0
+/kpof/TR/state 1
+/kpof/TL/color/off 0.3 0.3 0.3 1
+/kpof/TL/translate/Z 0
+/kpof/TL/translate/Y -215
+/kpof/TL/translate/X -155
+/kpof/TL/text TL
+/kpof/TL/text/size 25
+/kpof/TL/color/border 0.5 0.5 0.5 1
+/kpof/TL/color/text 1 1 1 1
+/kpof/TL/color/on 0 0.4 0.6 1
+/kpof/TL/mode 0
+/kpof/TL/size/ratio 1.25
+/kpof/TL/size 1
+/kpof/TL/rotate 0
+/kpof/TL/state 1
+/kpof/cornersPad/color/off 0.3 0.3 0.3 1
+/kpof/cornersPad/translate/Z 0
+/kpof/cornersPad/translate/Y 0
+/kpof/cornersPad/translate/X -154
+/kpof/cornersPad/color/border 0.5 0.5 0.5 1
+/kpof/cornersPad/color/text 1 1 1 1
+/kpof/cornersPad/color/on 0 0.4 0.6 1
+/kpof/cornersPad/size/ratio 1.25
+/kpof/cornersPad/size 4
+/kpof/cornersPad/rotate 0
+/kpof/cornersPad/state 1
 /kpof/light/color/off 0.3 0.3 0.3 1
 /kpof/light/translate/Z 0
 /kpof/light/translate/Y 0

+ 1 - 1
kpof

@@ -1 +1 @@
-Subproject commit 4cba765949174f7ab51c8f5216e9f1876bacd416
+Subproject commit 8e72a8cafcfdcae52edeb125c7852af0bc40802d