浏览代码

update rpi

titi-rpi 8 年之前
父节点
当前提交
e105b2d152
共有 3 个文件被更改,包括 162 次插入57 次删除
  1. 147 56
      interface.pd
  2. 14 0
      interface.presets
  3. 1 1
      kpof

+ 147 - 56
interface.pd

@@ -1,13 +1,34 @@
-#N canvas 1099 324 727 637 10;
+#N canvas 898 152 916 824 10;
 #X declare -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 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 obj 56 12 declare -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;
 #X obj 466 163 kpoffilm;
-#X symbolatom 210 551 10 0 0 0 - - -, f 10;
-#X msg 208 574 \; /kpof/button1/text \$1;
+#X symbolatom 53 668 10 0 0 0 - - -, f 10;
+#X msg 51 691 \; /kpof/button1/text \$1;
 #N canvas 864 433 865 570 numpad 0;
 #N canvas 808 559 936 410 numpad-logic 0;
 #X obj 334 257 r /numpad/selected;
@@ -60,11 +81,9 @@
 #X connect 2 0 5 0;
 #X connect 3 0 4 0;
 #X connect 4 0 1 0;
-#X restore 288 355 pd numpad;
+#X restore 246 607 pd numpad;
 #X obj 182 192 pofhead;
-#X msg 411 320 dont_capture 1;
-#X obj 382 358 poftouch 800 480;
-#X obj 182 284 t a a a a a a a a a a;
+#X obj 452 358 poftouch 800 480;
 #N canvas 1 52 450 300 lightmask 0;
 #X obj 46 195 pofrect 800 480;
 #X floatatom 263 115 5 0 0 0 - - -, f 5;
@@ -83,31 +102,30 @@
 #X connect 6 0 0 0;
 #X coords 0 -1 1 1 86 35 1 100 100;
 #X restore 118 344 pd lightmask;
-#X obj 500 384 route up down;
-#X obj 500 406 unpack f f f;
-#X obj 544 426 unpack f f f;
-#X obj 500 448 -;
-#X obj 404 551 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 570 486 unpack f f f;
+#X obj 614 506 unpack f f f;
+#X obj 570 528 -;
+#X obj 480 496 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
-#X floatatom 539 452 5 0 0 0 - - -, f 5;
-#X obj 500 470 t f f;
-#X obj 500 554 moses 0;
-#X obj 580 487 abs;
-#X obj 503 578 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+#X floatatom 609 532 5 0 0 0 - - -, f 5;
+#X obj 570 550 t f f;
+#X obj 570 634 moses 0;
+#X obj 650 567 abs;
+#X obj 543 658 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
-#X obj 549 576 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+#X obj 619 656 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
-#X obj 500 530 spigot;
-#X text 559 470 if slide enough;
-#X obj 545 600 s R-slide;
-#X obj 499 620 s L-slide;
-#X obj 580 510 > 100;
+#X obj 570 610 spigot;
+#X text 629 550 if slide enough;
+#X obj 615 680 s R-slide;
+#X obj 569 700 s L-slide;
+#X obj 650 590 > 100;
 #X obj 182 264 pofscale;
 #X obj 270 191 r /fromkpofwin;
 #X obj 272 256 / 800;
 #X obj 270 233 unpack f f;
 #X obj 270 213 route window;
-#N canvas 973 67 819 453 transport 0;
+#N canvas 969 65 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;
@@ -125,42 +143,115 @@
 #X connect 2 3 5 0;
 #X connect 2 4 3 0;
 #X connect 3 0 4 0;
-#X restore 263 386 pd transport;
-#X obj 266 318 t a a;
+#X restore 221 638 pd transport;
+#X obj 224 570 t a a;
 #X msg 463 73 \; /ds/UI/loadfile ../../interface.presets \; /ds/UI/scene/current
 0;
-#X obj 75 244 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 75 244 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 75 264 s RPI-TOUCH;
+#X obj 481 279 r RPI-touch;
+#X obj 451 300 * 2;
+#X msg 481 320 dont_capture 1;
+#X obj 570 384 route up down move;
+#X obj 650 433 == 0;
+#X obj 611 459 spigot 1;
+#X obj 757 426 spigot 0;
+#X obj 757 448 spigot 1;
+#X obj 757 470 t a b;
+#X msg 788 495 0;
+#X msg 717 433 1;
+#X floatatom 684 526 5 0 0 0 - - -, f 5;
+#X obj 683 456 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+1;
+#X obj 650 410 r RPI-TOUCH;
+#X obj 810 404 r RPI-TOUCH;
+#X obj 182 284 t a a a;
+#X obj 211 446 t a a a a a;
+#X obj 212 394 poftranslate;
+#X obj 304 477 poftranslate;
+#X obj 304 499 t a a a;
+#X obj 303 524 kpofUIslider light UI;
+#X floatatom 328 418 5 0 0 0 - - -, f 5;
+#X obj 245 304 hradio 15 1 0 3 empty empty empty 0 -8 0 10 -262144
+-1 -1 0;
+#X msg 245 346 \$1 500;
+#X obj 245 368 line;
+#X obj 245 324 * -800;
+#X obj 635 631 print;
+#X obj 280 739;
+#X obj 479 690 f;
+#X obj 479 712 + 1;
+#X obj 528 693 f;
+#X obj 528 715 - 1;
+#X floatatom 476 739 5 0 0 0 - - -, f 5;
 #X connect 6 0 7 0;
-#X connect 9 0 30 0;
-#X connect 10 0 11 0;
-#X connect 11 1 14 0;
-#X connect 12 0 13 0;
-#X connect 12 7 36 0;
-#X connect 12 9 11 0;
-#X connect 14 0 15 0;
-#X connect 14 1 16 0;
-#X connect 15 0 17 0;
-#X connect 16 0 17 1;
-#X connect 17 0 19 0;
-#X connect 17 0 20 0;
-#X connect 20 0 25 0;
-#X connect 20 1 22 0;
-#X connect 21 0 23 0;
-#X connect 21 0 28 0;
-#X connect 21 1 24 0;
-#X connect 21 1 27 0;
-#X connect 22 0 29 0;
-#X connect 25 0 21 0;
-#X connect 29 0 18 0;
-#X connect 29 0 25 1;
-#X connect 30 0 12 0;
-#X connect 31 0 34 0;
-#X connect 32 0 30 1;
-#X connect 32 0 30 2;
+#X connect 9 0 27 0;
+#X connect 10 1 40 0;
+#X connect 12 0 14 0;
+#X connect 13 0 14 1;
+#X connect 13 0 48 0;
+#X connect 14 0 16 0;
+#X connect 14 0 17 0;
+#X connect 17 0 22 0;
+#X connect 17 1 19 0;
+#X connect 18 0 20 0;
+#X connect 18 0 25 0;
+#X connect 18 1 21 0;
+#X connect 18 1 24 0;
+#X connect 19 0 26 0;
+#X connect 20 0 65 0;
+#X connect 21 0 67 0;
+#X connect 22 0 18 0;
+#X connect 22 0 63 0;
+#X connect 26 0 15 0;
+#X connect 26 0 22 1;
+#X connect 27 0 52 0;
+#X connect 28 0 31 0;
+#X connect 29 0 27 1;
+#X connect 29 0 27 2;
+#X connect 30 0 29 0;
+#X connect 31 0 30 0;
 #X connect 33 0 32 0;
-#X connect 34 0 33 0;
-#X connect 36 0 35 0;
-#X connect 36 1 8 0;
+#X connect 33 1 8 0;
+#X connect 35 0 36 0;
+#X connect 37 0 38 0;
 #X connect 38 0 39 0;
+#X connect 39 0 10 0;
+#X connect 40 0 12 0;
+#X connect 40 0 47 0;
+#X connect 40 1 42 0;
+#X connect 40 2 43 0;
+#X connect 41 0 42 1;
+#X connect 41 0 49 0;
+#X connect 42 0 13 0;
+#X connect 43 0 44 0;
+#X connect 44 0 45 0;
+#X connect 45 0 13 0;
+#X connect 45 1 46 0;
+#X connect 46 0 44 1;
+#X connect 47 0 44 1;
+#X connect 50 0 41 0;
+#X connect 51 0 43 1;
+#X connect 52 0 11 0;
+#X connect 52 1 54 0;
+#X connect 52 2 10 0;
+#X connect 53 2 33 0;
+#X connect 53 4 55 0;
+#X connect 54 0 53 0;
+#X connect 55 0 56 0;
+#X connect 56 0 57 0;
+#X connect 58 0 55 1;
+#X connect 59 0 62 0;
+#X connect 60 0 61 0;
+#X connect 61 0 54 1;
+#X connect 62 0 60 0;
+#X connect 65 0 66 0;
+#X connect 66 0 65 1;
+#X connect 66 0 67 1;
+#X connect 66 0 69 0;
+#X connect 67 0 68 0;
+#X connect 68 0 67 1;
+#X connect 68 0 65 1;
+#X connect 68 0 69 0;
+#X connect 69 0 59 0;

+ 14 - 0
interface.presets

@@ -17,6 +17,20 @@
 # SETTINGS
 # TABLES
 # DATA
+/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 1
+/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

+ 1 - 1
kpof

@@ -1 +1 @@
-Subproject commit b67408529dd0099cfb77241ed0298b9b34e085bc
+Subproject commit 41afcb804d2cf2c38a54262c36a6e8d3c039d5ea