Skip to content

Commit 209fff1

Browse files
committed
add changes for game on, now camera and video works together
1 parent cbf2824 commit 209fff1

File tree

1 file changed

+41
-5
lines changed

1 file changed

+41
-5
lines changed

Scripts/videoScript.js

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,33 @@
1-
21
function renderVideos() {
3-
// * Camera gets in the back of video
2+
3+
if (resultsReady) {
4+
// DoTextHiperpoesia();
5+
// console.log(rnnSub);
6+
7+
//cuadradito para acentuar subtitulos
8+
fill(0, 95);
9+
rect(0, windowHeight - 160, windowWidth, 200);
10+
11+
DoText();
12+
// talk();
13+
14+
15+
if (writingOutput) {
16+
writer = createWriter(month() + "/" + day() + "/" + year() + "_" + 'latinPage' + "_" + ".txt"); // texto en donde escribir
17+
}
18+
19+
renderCamera(); // FUNCIONA PERO SIN TEXTO
20+
21+
22+
}
23+
24+
25+
// // * Camera gets in the back of video
426
if (cameraVideo) { //under video
527
// console.log('camera VIdeo');
6-
renderCamera()
28+
// renderCamera(); // no tiene texto
729
}
30+
831
if (playSimpleVideo) {
932
// console.log('playing simple video');
1033
image(videos[0].play(), 0, 0, width, height); //size and position of video // COMENTED FOR PIXELS // CHECK ALL THIS
@@ -36,9 +59,23 @@ function renderVideos() {
3659
if (randomFrameEffect) { // plays pixel + random
3760
pixelEffect();
3861
randomFrame();
62+
63+
// * Camera gets in the back of video
64+
// if (cameraVideo) { //under video
65+
// // console.log('camera VIdeo');
66+
// renderCamera();
67+
// }
68+
69+
3970
} else {
4071
pixelEffect();
4172
//camera video positioned here is also behind video
73+
74+
// // * Camera gets in the back of video
75+
// if (cameraVideo) { //under video
76+
// // console.log('camera VIdeo');
77+
// renderCamera();
78+
// }
4279
}
4380
} else {
4481
if (randomFrameEffect) {
@@ -230,5 +267,4 @@ function videoOver() {
230267
videos[whichVideo].pause(); // esto estaba comentado
231268

232269
stage = 1;
233-
}
234-
270+
}

0 commit comments

Comments
 (0)