Quellcode durchsuchen

added corner selection around touchpad

with group logic
Etienne Landon vor 8 Jahren
Ursprung
Commit
b5274d4e1b
3 geänderte Dateien mit 189 neuen und 126 gelöschten Zeilen
  1. 64 58
      interface.pd
  2. 124 67
      interface.presets
  3. 1 1
      kpof

+ 64 - 58
interface.pd

@@ -1,32 +1,11 @@
-#N canvas 262 114 916 877 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 kollabs;
+#N canvas 592 137 916 829 10;
 #X declare -path pof-lcd -lib pof -path kpof;
 #X obj 56 36 kollabs/ds_logic UI;
 #X obj 56 61 kollabs/ds_gui UI;
 #X obj 214 33 kpofwin UI;
 #X obj 404 24 poffonts font1 ./media/vera.ttf 40;
-#N canvas 854 428 865 570 numpad 0;
-#N canvas 729 555 936 410 numpad-logic 0;
+#N canvas 852 427 865 570 numpad 0;
+#N canvas 727 554 936 410 numpad-logic 0;
 #X obj 334 257 r /numpad/selected;
 #X obj 275 331 text define -k numpad;
 #A set np1 \; np2 \; np3 \; np4 \; np5 \; np6 \; np7 \; np8 \; np9
@@ -87,7 +66,7 @@
 #X obj 46 151 poftranslate 0 0 2;
 #X obj 46 129 inlet;
 #X obj 106 123 hsl 75 10 0 1 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 148 1;
+-1 -1 0 1;
 #X obj 46 173 pofcolor 0 0 0 0;
 #X obj 103 -13 r /kpof/light/value;
 #X obj 227 197 s /kpof/light/value;
@@ -113,7 +92,7 @@
 #X obj 150 256 / 800;
 #X obj 148 233 unpack f f;
 #X obj 148 213 route window;
-#N canvas 961 61 819 453 transport 1;
+#N canvas 959 60 819 453 transport 1;
 #X obj 87 18 inlet;
 #X obj 87 40 kpoftransform tr-transf UI;
 #X obj 87 95 t a a a a a;
@@ -133,7 +112,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 1
+#X obj 704 155 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
 #X obj 704 175 s RPI-TOUCH;
 #X obj 60 286 t a a a;
@@ -141,7 +120,6 @@
 #X obj 157 549 t a a a;
 #X obj 157 571 kpofUIslider light UI;
 #X floatatom 181 508 5 0 0 0 - - -, f 5;
-#X obj 83 789 t a a a a;
 #N canvas 1 447 625 587 toucbgd 0;
 #X symbolatom 334 498 10 0 0 0 - - -, f 10;
 #X msg 332 521 \; /kpof/button1/text \$1;
@@ -244,10 +222,8 @@
 #X restore 106 307 pd toucbgd;
 #X text 257 531 SETTINGS;
 #X text 176 652 CONTROL;
-#X text 161 792 SCENE SETTINGS;
-#X obj 143 834 kpofUIpad cornersPad UI;
 #X obj 256 317 hradio 15 1 0 8 empty empty empty 0 -8 0 10 -262144
--1 -1 2;
+-1 -1 0;
 #X obj 153 362 r page-selector;
 #X obj 83 454 poftranslate;
 #X obj 153 428 line;
@@ -271,7 +247,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 540 127 1101 311 OSC-patch 1;
+#N canvas 538 126 1101 311 OSC-patch 1;
 #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;
@@ -288,8 +264,9 @@
 #X msg 322 69 symbol -;
 #X msg 392 89 symbol +;
 #X obj 742 28 r /kpof/cornersPad/touch;
-#X msg 809 100 send /kpof/0/corner/top/left/y \$1;
-#X msg 742 80 send quad \$1 \$2;
+#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 connect 1 0 3 0;
 #X connect 1 0 7 0;
 #X connect 5 0 6 0;
@@ -304,11 +281,42 @@
 #X connect 12 3 5 0;
 #X connect 13 0 10 0;
 #X connect 14 0 10 0;
-#X connect 15 0 17 0;
-#X connect 16 0 0 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 restore 534 441 pd OSC-patch;
 #X obj 713 427 r /kpof/cornersPad/touch;
+#N canvas 1030 427 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;
+#X obj 140 299 kpofUIbutton TL UI;
+#X obj 120 359 kpofUIbutton TR UI;
+#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;
+#A set TL \; TR \; BL \; BR \;;
+#X obj 255 62 extra/group-buttons TR corners;
+#X obj 255 82 extra/group-buttons BL corners;
+#X obj 255 102 extra/group-buttons BR corners;
+#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 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 restore 83 800 pd scene-settings;
 #X obj 713 449 print;
 #X connect 5 0 7 0;
 #X connect 7 0 16 0;
@@ -321,27 +329,25 @@
 #X connect 13 1 4 0;
 #X connect 14 0 15 0;
 #X connect 16 0 6 0;
-#X connect 16 1 29 0;
-#X connect 16 2 22 0;
-#X connect 17 0 49 0;
+#X connect 16 1 26 0;
+#X connect 16 2 21 0;
+#X connect 17 0 46 0;
 #X connect 17 2 13 0;
-#X connect 17 4 48 0;
+#X connect 17 4 45 0;
 #X connect 18 0 19 0;
-#X connect 20 0 48 1;
-#X connect 21 3 26 0;
-#X connect 27 0 32 0;
-#X connect 28 0 31 0;
-#X connect 29 0 17 0;
-#X connect 30 0 29 1;
-#X connect 31 0 33 0;
-#X connect 32 0 31 0;
-#X connect 33 0 30 0;
-#X connect 34 0 35 0;
-#X connect 41 0 42 0;
-#X connect 42 0 40 0;
-#X connect 46 0 47 0;
-#X connect 47 0 40 0;
-#X connect 48 0 18 0;
-#X connect 49 0 21 0;
-#X connect 50 0 40 0;
-#X connect 51 0 52 0;
+#X connect 20 0 45 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;

+ 124 - 67
interface.presets

@@ -1,4 +1,12 @@
 ======================== GLOBAL ========================
+/kpofwin/fullscreen 0
+/kpofwin/position/y 100
+/kpofwin/position/x 100
+/kpofwin/cursor 1
+/kpofwin/framerate 25
+/kpofwin/normalizedtexcoords 0
+/kpofwin/window/y 240
+/kpofwin/window/x 400
 /print/debug/state 0
 /print/datastream/state 0
 /print/errors/state 1
@@ -17,6 +25,87 @@
 # 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/BR/color/off 0.3 0.3 0.3 1
+/kpof/BR/translate/Z 0
+/kpof/BR/translate/Y 215
+/kpof/BR/translate/X 155
+/kpof/BR/text BR
+/kpof/BR/text/size 25
+/kpof/BR/color/border 0.5 0.5 0.5 1
+/kpof/BR/color/text 1 1 1 1
+/kpof/BR/color/on 0 0.4 0.6 1
+/kpof/BR/mode 0
+/kpof/BR/size/ratio 1.25
+/kpof/BR/size 1
+/kpof/BR/rotate 0
+/kpof/BR/state 1
+/kpof/light/color/off 0.3 0.3 0.3 1
+/kpof/light/translate/Z 0
+/kpof/light/translate/Y 0
+/kpof/light/translate/X 333
+/kpof/light/text light
+/kpof/light/text/size 25
+/kpof/light/color/border 0.5 0.5 0.5 1
+/kpof/light/color/text 1 1 1 1
+/kpof/light/color/on 0 0.4 0.6 1
+/kpof/light/mode 0
+/kpof/light/size/ratio 0.38
+/kpof/light/size 0.95
+/kpof/light/rotate -90
+/kpof/light/state 1
 /kpof/speed+/color/off 0.3 0.3 0.3 1
 /kpof/speed+/translate/Z 0
 /kpof/speed+/translate/Y -35
@@ -45,6 +134,41 @@
 /kpof/play/size 1
 /kpof/play/rotate 0
 /kpof/play/state 1
+/kpof/scroll/color/off 0.3 0.3 0.3 1
+/kpof/scroll/translate/Z 0
+/kpof/scroll/translate/Y 50
+/kpof/scroll/translate/X 0
+/kpof/scroll/text scroll
+/kpof/scroll/text/size 25
+/kpof/scroll/color/border 0.5 0.5 0.5 1
+/kpof/scroll/color/text 1 1 1 1
+/kpof/scroll/color/on 0 0.4 0.6 1
+/kpof/scroll/mode 0
+/kpof/scroll/size/ratio 1
+/kpof/scroll/size 0.8
+/kpof/scroll/rotate 0
+/kpof/scroll/state 1
+/kpof/speed-/color/off 0.3 0.3 0.3 1
+/kpof/speed-/translate/Z 0
+/kpof/speed-/translate/Y -35
+/kpof/speed-/translate/X -115
+/kpof/speed-/text speed-
+/kpof/speed-/text/size 25
+/kpof/speed-/color/border 0.5 0.5 0.5 1
+/kpof/speed-/color/text 1 1 1 1
+/kpof/speed-/color/on 0 0.4 0.6 1
+/kpof/speed-/mode 1
+/kpof/speed-/size/ratio 1.25
+/kpof/speed-/size 1
+/kpof/speed-/rotate 0
+/kpof/speed-/state 1
+/kpof/tr-transf/scale/Y 1
+/kpof/tr-transf/scale/X 1
+/kpof/tr-transf/translate/Z 0
+/kpof/tr-transf/translate/Y -115
+/kpof/tr-transf/translate/X 200
+/kpof/tr-transf/rotate 0
+/kpof/tr-transf/state 1
 /kpof/next-sc/color/off 0.3 0.3 0.3 1
 /kpof/next-sc/translate/Z 0
 /kpof/next-sc/translate/Y 150
@@ -213,66 +337,6 @@
 /kpof/np1/size 1
 /kpof/np1/rotate 0
 /kpof/np1/state 1
-/kpof/scroll/color/off 0.3 0.3 0.3 1
-/kpof/scroll/translate/Z 0
-/kpof/scroll/translate/Y 50
-/kpof/scroll/translate/X 0
-/kpof/scroll/text scroll
-/kpof/scroll/text/size 25
-/kpof/scroll/color/border 0.5 0.5 0.5 1
-/kpof/scroll/color/text 1 1 1 1
-/kpof/scroll/color/on 0 0.4 0.6 1
-/kpof/scroll/mode 0
-/kpof/scroll/size/ratio 1
-/kpof/scroll/size 0.8
-/kpof/scroll/rotate 0
-/kpof/scroll/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
-/kpof/light/translate/X 333
-/kpof/light/text light
-/kpof/light/text/size 25
-/kpof/light/color/border 0.5 0.5 0.5 1
-/kpof/light/color/text 1 1 1 1
-/kpof/light/color/on 0 0.4 0.6 1
-/kpof/light/mode 0
-/kpof/light/size/ratio 0.38
-/kpof/light/size 0.95
-/kpof/light/rotate -90
-/kpof/light/state 1
-/kpof/speed-/color/off 0.3 0.3 0.3 1
-/kpof/speed-/translate/Z 0
-/kpof/speed-/translate/Y -35
-/kpof/speed-/translate/X -115
-/kpof/speed-/text speed-
-/kpof/speed-/text/size 25
-/kpof/speed-/color/border 0.5 0.5 0.5 1
-/kpof/speed-/color/text 1 1 1 1
-/kpof/speed-/color/on 0 0.4 0.6 1
-/kpof/speed-/mode 1
-/kpof/speed-/size/ratio 1.25
-/kpof/speed-/size 1
-/kpof/speed-/rotate 0
-/kpof/speed-/state 1
-/kpof/tr-transf/scale/Y 1
-/kpof/tr-transf/scale/X 1
-/kpof/tr-transf/translate/Z 0
-/kpof/tr-transf/translate/Y -115
-/kpof/tr-transf/translate/X 200
-/kpof/tr-transf/rotate 0
-/kpof/tr-transf/state 1
 /kpof/np-transf/scale/link 1
 /kpof/np-transf/scale/Y 1.03
 /kpof/np-transf/scale/X 1.03
@@ -284,10 +348,3 @@
 /kpofwin/background/B 0
 /kpofwin/background/G 0
 /kpofwin/background/R 0
-/kpofwin/position/y 100
-/kpofwin/position/x 100
-/kpofwin/cursor 1
-/kpofwin/framerate 25
-/kpofwin/normalizedtexcoords 0
-/kpofwin/window/y 240
-/kpofwin/window/x 400

+ 1 - 1
kpof

@@ -1 +1 @@
-Subproject commit d0f2d99e587e98af9ebe8df0e96ac489f410feeb
+Subproject commit 4cba765949174f7ab51c8f5216e9f1876bacd416