Skip to content

Commit c08e5bd

Browse files
author
Lauren McCarthy
committed
Merge pull request #296 from shiffman/example-fixes
Example fixes
2 parents 588e540 + 17794b5 commit c08e5bd

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

examples/addons/p5.dom/global/sketch.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ function setup() {
2424

2525
result = createElement("H1", "this is h1");
2626

27-
vid = createVideo('fingers.mov');
27+
vid = createVideo('../fingers.mov');
2828
vid.loop(true);
2929
vid.hide();
3030

3131
}
3232

3333
function draw() {
3434
background(95, 165, 26);
35-
video(vid, 10, 10, 80, 180);
35+
image(vid, 10, 10, 80, 180);
3636
};
3737

3838

examples/addons/p5.dom/video_circles/sketch.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ function setup() {
1010
}
1111

1212
function draw() {
13-
image(fingers, 0, 0);
14-
loadPixels();
1513
background(255);
14+
fingers.loadPixels();
1615
var stepSize = round(constrain(mouseX / 8, 6, 32));
1716
for (var y=0; y<height; y+=stepSize) {
1817
for (var x=0; x<width; x+=stepSize) {
1918
var i = y * width + x;
20-
var darkness = (255 - pixels[i][0]) / 255;
19+
var darkness = (255 - fingers.pixels[i*4]) / 255;
2120
var radius = stepSize * darkness;
2221
ellipse(x, y, radius, radius);
2322
}

examples/addons/p5.dom/video_pixels/sketch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function draw() {
1212

1313
fingers.loadPixels();
1414
for (var i=0; i<fingers.pixels.length/2; i++) {
15-
fingers.pixels[i][3] = random(255);
15+
fingers.pixels[i] = random(255);
1616
}
1717
fingers.updatePixels();
1818

0 commit comments

Comments
 (0)