瀏覽代碼

replaced old light system

Etienne Landon 7 年之前
父節點
當前提交
178d82627a
共有 2 個文件被更改,包括 40 次插入139 次删除
  1. 7 6
      extra/simpleLight.pd
  2. 33 133
      main.pd

+ 7 - 6
extra/simpleLight.pd

@@ -1,10 +1,10 @@
-#N canvas 134 190 604 683 10;
-#X obj 1 14 cnv 15 235 50 empty \$0-selectedtrack Light 5 7 0 14 -166441
+#N canvas 128 55 604 672 10;
+#X obj 1 14 cnv 15 158 50 empty \$0-selectedtrack Light 5 7 0 14 -166441
 -262144 0;
-#X obj 6 50 hsl 140 10 0 100 0 0 \$0-value%-snd \$0-value%-rcv empty
--2 -8 0 10 -99865 -257985 -1 3475 1;
+#X obj 10 50 hsl 140 10 0 100 0 0 \$0-value%-snd \$0-value%-rcv empty
+-2 -8 0 10 -99865 -257985 -1 0 1;
 #X obj 3 31 nbx 5 14 -1e+37 1e+37 0 0 empty empty % 60 7 0 10 -262144
--1 -1 25 256;
+-1 -1 0 256;
 #X msg 57 75 set \$1;
 #X obj 22 207 s toGrada;
 #X obj 22 115 t b f;
@@ -20,8 +20,9 @@
 #X connect 3 0 2 0;
 #X connect 5 0 11 0;
 #X connect 5 1 6 1;
+#X connect 6 0 4 0;
 #X connect 7 0 1 0;
 #X connect 8 0 6 0;
 #X connect 10 0 7 0;
 #X connect 11 0 8 0;
-#X coords 0 0 1 1 237 65 1 0 0;
+#X coords 0 0 1 1 160 65 1 0 0;

+ 33 - 133
main.pd

@@ -1,12 +1,4 @@
-#N canvas 1 129 977 492 10;
-#X declare -path extra/evt/data -path extra/evt/data -path extra/evt/ev-in
--path extra/evt/ev-main -path extra/evt/ev-pano -path extra/evt/ev-pro
--path extra/evt/libs/gil -path extra/evt/libs/kollabs -path extra/evt/media
--path extra/evt/ev-glsl;
-#X declare -stdpath zexy -lib zexy -lib Gem -stdpath maxlib -stdpath
-iemlib -stdpath ggee -stdpath hcs -stdpath moonlib -path extra -path
-extra/PdTl -path extra/AutoPreset;
-#X declare -path extra/Fraise -path extra/tof;
+#N canvas 47 180 977 340 10;
 #N canvas 55 86 1178 687 VIDEO 0;
 #X obj 4 7 cnv 15 400 350 empty empty empty 20 12 0 14 -261682 -66577
 0;
@@ -178,8 +170,8 @@ uses scene "0" of "ev_example_panoramic_preset.txt".;
 #X connect 86 0 51 0;
 #X connect 87 0 57 0;
 #X coords 0 -1 1 1 200 90 1 500 100;
-#X restore 109 169 pd VIDEO;
-#N canvas 652 79 689 657 Fraise 1;
+#X restore 109 17 pd VIDEO;
+#N canvas 650 70 689 657 Fraise 0;
 #X obj 21 38 pied/pied 0 41424;
 #X obj 21 112 fruit/fruit 1 dimmer1 10 dimmer1;
 #X obj 21 160 fruit/fruit 1 dimmer2 11 dimmer2;
@@ -212,7 +204,7 @@ uses scene "0" of "ev_example_panoramic_preset.txt".;
 #X obj 206 537 fruit/send dimmer2;
 #X msg 287 445 1 65535;
 #X obj 125 277 * 655.35;
-#X obj 302 172 bng 15 250 50 0 empty empty connect 17 7 0 10 -258699
+#X obj 302 172 bng 15 250 50 0 empty empty connect 17 7 0 10 -24198
 -1 -262144;
 #X obj 402 137 route 0 1;
 #X msg 402 159 color 13;
@@ -267,8 +259,7 @@ uses scene "0" of "ev_example_panoramic_preset.txt".;
 #X connect 37 0 41 0;
 #X connect 43 0 19 0;
 #X coords 0 -1 1 1 85 60 1 300 150;
-#X restore 17 199 pd Fraise;
-#X obj 17 266 tlLight \$0-Master light1 Song 3;
+#X restore 17 47 pd Fraise;
 #N canvas 519 217 660 300 buttons 0;
 #X obj 41 14 r button1;
 #X obj 34 129 s light1-val;
@@ -361,18 +352,7 @@ uses scene "0" of "ev_example_panoramic_preset.txt".;
 #X connect 41 0 44 0;
 #X connect 44 0 43 0;
 #X connect 46 0 2 0;
-#X restore 18 156 pd buttons;
-#X obj 493 266 tlLight \$0-Master light3 Song 5;
-#X obj 255 332 tlLight \$0-Master light6 Song 8;
-#X obj 731 398 tlLight \$0-Master light12 Song 14;
-#X obj 493 398 tlLight \$0-Master light11 Song 13;
-#X obj 731 332 tlLight \$0-Master light8 Song 10;
-#X obj 255 266 tlLight \$0-Master light2 Song 4;
-#X obj 17 332 tlLight \$0-Master light5 Song 7;
-#X obj 493 332 tlLight \$0-Master light7 Song 9;
-#X obj 17 398 tlLight \$0-Master light9 Song 11;
-#X obj 255 398 tlLight \$0-Master light10 Song 12;
-#X obj 731 266 tlLight \$0-Master light4 Song 6;
+#X restore 18 16 pd buttons;
 #N canvas 154 456 1060 519 mediaplayers 0;
 #X obj 66 194 pix_film;
 #X msg 90 222 1;
@@ -494,23 +474,23 @@ uses scene "0" of "ev_example_panoramic_preset.txt".;
 #X connect 54 0 49 0;
 #X connect 55 0 49 0;
 #X coords 0 -1 1 1 250 90 1 400 100;
-#X restore 328 170 pd mediaplayers;
-#N canvas 22 498 1059 647 sequencer 1;
+#X restore 328 18 pd mediaplayers;
+#N canvas 20 80 1059 647 sequencer 0;
 #X obj 382 172 text define -k conduite;
 #A set scene entree \; sound 0 \; light1-val 0 0 \; light2-val 0 0
 \; light3-val 0 0 \; light4-val 0 0 \; light5-val 0 0 \; light6-val
 0 0 \; light7-val 0 0 \; light8-val 0 0 \; light9-val 0 0 \; light10-val
 0 0 \; light11-val 0 0 \; light12-val 0 0 \; 0 \; 1000 \; scene fadeout_tableaux
-\; sequence test \; light9-val 0 5000 \; sound LACHOSEAVOIR7MNVRAIRenderedcut.wav
-\; video brouillardH26413AVRIL.mov \; 2000 \; scene video_brouillard
-\; 2000 \; scene depart_son \; 22000 \; sequence 0 \; scene dune_25%_16s
-\; light1-val 25 11000 \; light2-val 25 11000 \; 91000 \; scene dune_0%_5s
-\; light1-val 0 5000 \; light2-val 0 5000 \; 7000 \; scene video_papillon
-\; video PAPILLONJAUNEDEF13_2.mov \; 3000 \; scene papillon_45%_3s
-\; light3-val 43 3000 \; 49000 \; scene papillon_0%_1s \; light3-val
-0 0 \; 5000 \; scene tete_50%_3s \; light4-val 50 3000 \; 43000 \;
-scene tete_0%_1s \; light4-val 0 2000 \; 4000 \; scene par56_26%_2s
-\; light7-val 26 2000 \; 10000 \; scene video_mouches \; video Flee11avril_H264_02.mp4
+\; light9-val 0 5000 \; sound choseavoir13042017VRendered.wav \; video
+brouillardH26413AVRIL.mov \; 2000 \; scene video_brouillard \; 2000
+\; scene depart_son \; 22000 \; scene dune_25%_16s \; light1-val 25
+11000 \; light2-val 25 11000 \; 91000 \; scene dune_0%_5s \; light1-val
+0 5000 \; light2-val 0 5000 \; 7000 \; scene video_papillon \; video
+PAPILLONJAUNEDEF13_2.mov \; 3000 \; scene papillon_45%_3s \; light3-val
+43 3000 \; 49000 \; scene papillon_0%_1s \; light3-val 0 0 \; 5000
+\; scene tete_50%_3s \; light4-val 50 3000 \; 43000 \; scene tete_0%_1s
+\; light4-val 0 2000 \; 4000 \; scene par56_26%_2s \; light7-val 26
+2000 \; 10000 \; scene video_mouches \; video Flee11avril_H264_02.mp4
 \; 155000 \; scene par56_15%_19s \; light7-val 15 19000 \; 22000 \;
 scene signal_cri \; light7-val 0 0 \; 2000 \; scene cri_par56_80% \;
 light7-val 80 0 \; 2000 \; scene fin \; light7-val 0 0 \; light8-val
@@ -542,7 +522,7 @@ light7-val 80 0 \; 2000 \; scene fin \; light7-val 0 0 \; light8-val
 -1;
 #X obj 113 145 bng 15 250 50 0 cue empty cue 17 7 0 10 -262144 -1 -1
 ;
-#X obj 103 172 cnv 15 40 16 empty chrono 0:12 2 9 0 14 -233017 -66577
+#X obj 103 172 cnv 15 40 16 empty chrono 6:25 2 9 0 14 -233017 -66577
 0;
 #X obj 493 406 pack f f;
 #X obj 557 345 div 60;
@@ -657,97 +637,17 @@ light7-val 80 0 \; 2000 \; scene fin \; light7-val 0 0 \; light8-val
 #X connect 68 0 67 0;
 #X connect 69 0 53 0;
 #X coords 0 -1 1 1 250 90 1 100 100;
-#X restore 608 168 pd sequencer;
-#X obj 68 44 simpleLight 1;
-#N canvas 213 98 1078 646 oldTl 0;
-#N canvas 302 198 575 553 init 0;
-#X obj 182 172 bng 15 250 50 0 empty empty load 17 7 0 10 -4034 -1
--1;
-#X obj 224 172 bng 15 250 50 0 empty empty save 17 7 0 10 -258113 -1
--1;
-#X obj 12 159 loadbang;
-#X obj 280 153 apmaster \$0-Master;
-#X text 78 162 (autoload);
-#X obj 13 78 declare -path extra/evt/data -path extra/evt/data -path
-extra/evt/ev-in -path extra/evt/ev-main -path extra/evt/ev-pano -path
-extra/evt/ev-pro -path extra/evt/libs/gil -path extra/evt/libs/kollabs
--path extra/evt/media -path extra/evt/ev-glsl;
-#X text 423 39 PdTl;
-#X text 409 107 evt;
-#X obj 13 29 declare -stdpath zexy -lib zexy -lib Gem -stdpath maxlib
--stdpath iemlib -stdpath ggee -stdpath hcs -stdpath moonlib -path extra
--path extra/PdTl -path extra/AutoPreset;
-#X obj 13 7 declare -path extra/Fraise -path extra/tof;
-#X obj 447 199 loadbang;
-#X msg 447 221 \; pd dsp 1;
-#X obj 54 362 route loaded saved;
-#X symbolatom 54 428 0 0 0 0 - - -;
-#X obj 54 384 symbol;
-#X obj 146 383 symbol;
-#X msg 247 277 load;
-#X msg 284 277 save;
-#X obj 247 303 s \$0-Master-apmaster-rcv;
-#X obj 54 339 r \$0-Master-apmaster-snd;
-#X obj 12 234 apmasterfile \$0-Master extra/tl.preset;
-#X obj 12 181 delay 1000;
-#X obj 54 406 splitpath;
-#X obj 146 405 splitpath;
-#X symbolatom 187 433 10 0 0 0 - - -, f 10;
-#X connect 0 0 20 0;
-#X connect 1 0 20 1;
-#X connect 2 0 21 0;
-#X connect 10 0 11 0;
-#X connect 12 0 14 0;
-#X connect 12 1 15 0;
-#X connect 14 0 22 0;
-#X connect 15 0 23 0;
-#X connect 16 0 18 0;
-#X connect 17 0 18 0;
-#X connect 19 0 12 0;
-#X connect 21 0 20 0;
-#X connect 22 1 13 0;
-#X connect 23 1 24 0;
-#X coords 0 -1 1 1 85 40 1 180 150;
-#X restore 17 26 pd init;
-#X obj 272 12 tlSong15 \$0-Master Song;
-#X obj 10 223 tlTransport \$0-Master Song;
-#X obj 10 380 tlMovie \$0-Master movie Song 2;
-#X obj 10 284 tlSound \$0-Master sound Song 1;
-#N canvas 357 116 450 401 stuff 0;
-#X obj 37 157 unpack f f f f;
-#X floatatom 37 272 5 0 0 3 eventNum - -, f 5;
-#X floatatom 64 240 5 0 0 3 eventTime - -, f 5;
-#X floatatom 91 211 5 0 0 3 normalizedTime - -, f 5;
-#X floatatom 118 178 5 0 0 3 eventLength - -, f 5;
-#X obj 37 93 speedlim 50;
-#X obj 60 7 print;
-#X obj 39 -68 r \$0-Master-song-Song-snd;
-#X obj 39 -46 route 0;
-#X obj 128 -20 route 4;
-#X obj 128 2 route get;
-#X msg 128 24 \$1;
-#X obj 128 46 change;
-#X floatatom 62 319 5 0 0 0 - - -, f 5;
-#X obj 37 115 route i;
-#X floatatom 37 137 5 0 0 0 - - -, f 5;
-#X obj 91 137 print masterSongRCV;
-#X obj 130 315 print masterSongSND;
-#X obj 49 368 s 1003-Master-song-Song-rcv;
-#X msg 49 346 4 0 l \$1;
-#X obj 36 70 r \$0-Master-song-Song-rcv;
-#X connect 0 0 1 0;
-#X connect 0 1 2 0;
-#X connect 0 2 3 0;
-#X connect 0 3 4 0;
-#X connect 5 0 14 0;
-#X connect 7 0 8 0;
-#X connect 7 0 9 0;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 12 0;
-#X connect 13 0 19 0;
-#X connect 14 0 15 0;
-#X connect 19 0 18 0;
-#X restore 17 3 pd stuff;
-#X restore 18 177 pd oldTl;
-#X coords 0 492 1 491 85 60 0;
+#X restore 608 16 pd sequencer;
+#X obj 127 121 simpleLight 1;
+#X obj 288 121 simpleLight 1;
+#X obj 449 121 simpleLight 1;
+#X obj 610 121 simpleLight 1;
+#X obj 127 187 simpleLight 1;
+#X obj 288 187 simpleLight 1;
+#X obj 449 187 simpleLight 1;
+#X obj 610 187 simpleLight 1;
+#X obj 127 253 simpleLight 1;
+#X obj 288 253 simpleLight 1;
+#X obj 449 253 simpleLight 1;
+#X obj 610 253 simpleLight 1;
+#X coords 0 340 1 339 85 60 0;