Merge branch 'master' of github.com:processing/p5.js

Author: Lauren McCarthy

lib/addons/p5.dom.js

@@ -2935,7 +2935,10 @@
     this.setModified(true);
     return this;
   };
-  p5.MediaElement.prototype.get = p5.Renderer2D.prototype.get;
+  p5.MediaElement.prototype.get = function() {
+    this._ensureCanvas();
+    return p5.Renderer2D.prototype.get.apply(this, arguments);
+  };
   p5.MediaElement.prototype._getPixel = function() {
     if (this.loadedmetadata) {
       // wait for metadata

src/core/p5.Graphics.js

@@ -30,7 +30,7 @@ p5.Graphics = function(w, h, renderer, pInst) {
   var node = pInst._userNode || document.body;
   node.appendChild(this.canvas);
 
-  p5.Element.call(this, this.canvas, pInst, false);
+  p5.Element.call(this, this.canvas, pInst);
 
   // bind methods and props of p5 to the new object
   for (var p in p5.prototype) {

src/typography/p5.Font.js

@@ -164,7 +164,7 @@ p5.Font.prototype.textBounds = function(str, x, y, fontSize, opts) {
  * @param  {Object} [options] an (optional) object that can contain:
  *
  * <br>sampleFactor - the ratio of path-length to number of samples
- * (default=.25); higher values yield more points and are therefore
+ * (default=.1); higher values yield more points and are therefore
  * more precise
  *
  * <br>simplifyThreshold - if set to a non-zero value, collinear points will be

test/manual-test-examples/webgl/material/perPixelLighting/sketch.js

@@ -9,7 +9,7 @@ function setup() {
   noStroke();
 }
 
-var lights = [
+var lightsData = [
   { c: '#f00', t: 1.12, p: 1.91, r: 0.2 },
   { c: '#0f0', t: 1.21, p: 1.31, r: 0.2 },
   { c: '#00f', t: 1.37, p: 1.57, r: 0.2 },
@@ -24,11 +24,11 @@ function draw() {
 
   directionalLight(color('#111'), 1, 1, 1);
 
-  for (var i = 0; i < lights.length; i++) {
-    var light = lights[i];
+  for (var i = 0; i < lightsData.length; i++) {
+    var lightData = lightsData[i];
     pointLight(
-      color(light.c),
-      p5.Vector.fromAngles(t * light.t, t * light.p, width * 2)
+      color(lightData.c),
+      p5.Vector.fromAngles(t * lightData.t, t * lightData.p, width * 2)
     );
   }
 

test/unit/events/keyboard.js

@@ -1,4 +1,90 @@
 suite('Keyboard Events', function() {
+  var myp5;
+
+  setup(function(done) {
+    new p5(function(p) {
+      p.setup = function() {
+        myp5 = p;
+        done();
+      };
+    });
+  });
+
+  teardown(function() {
+    myp5.remove();
+  });
+
+  suite('p5.prototype.keyIsPressed', function() {
+    test('keyIsPressed should be a boolean', function() {
+      assert.isBoolean(myp5.keyIsPressed);
+    });
+
+    test('keyIsPressed should be true on key press', function() {
+      window.dispatchEvent(new KeyboardEvent('keydown'));
+      assert.strictEqual(myp5.keyIsPressed, true);
+    });
+
+    test('keyIsPressed should be false on key up', function() {
+      window.dispatchEvent(new KeyboardEvent('keyup'));
+      assert.strictEqual(myp5.keyIsPressed, false);
+    });
+  });
+
+  suite('p5.prototype.isKeyPressed', function() {
+    test('isKeyPressed should be a boolean', function() {
+      assert.isBoolean(myp5.isKeyPressed);
+    });
+
+    test('isKeyPressed should be true on key press', function() {
+      window.dispatchEvent(new KeyboardEvent('keydown'));
+      assert.strictEqual(myp5.isKeyPressed, true);
+    });
+
+    test('isKeyPressed should be false on key up', function() {
+      window.dispatchEvent(new KeyboardEvent('keyup'));
+      assert.strictEqual(myp5.isKeyPressed, false);
+    });
+  });
+
+  suite('p5.prototype.key', function() {
+    test('key should be a string', function() {
+      window.dispatchEvent(new KeyboardEvent('keydown', { key: 's' }));
+      assert.isString(myp5.key);
+    });
+
+    test('key should return the key pressed', function() {
+      window.dispatchEvent(new KeyboardEvent('keydown', { key: 'A' }));
+      assert.strictEqual(myp5.key, 'A');
+    });
+
+    test('key should return the key pressed', function() {
+      window.dispatchEvent(new KeyboardEvent('keydown', { key: '9' }));
+      assert.strictEqual(myp5.key, '9');
+    });
+
+    test('key should return the key pressed', function() {
+      window.dispatchEvent(new KeyboardEvent('keydown', { key: 'CapsLock' }));
+      assert.strictEqual(myp5.key, 'CapsLock');
+    });
+  });
+
+  suite('p5.prototype.keyCode', function() {
+    test('keyCode should be a number', function() {
+      window.dispatchEvent(new KeyboardEvent('keydown', { key: 's' }));
+      assert.isNumber(myp5.keyCode);
+    });
+
+    test('key should return the key pressed', function() {
+      window.dispatchEvent(new KeyboardEvent('keydown', { keyCode: 65 }));
+      assert.strictEqual(myp5.keyCode, 65);
+    });
+
+    test('key should return the key pressed', function() {
+      window.dispatchEvent(new KeyboardEvent('keydown', { keyCode: 20 }));
+      assert.strictEqual(myp5.keyCode, 20);
+    });
+  });
+
   suite('keyPressed', function() {
     test('keyPressed functions on multiple instances must run once', async function() {
       let sketchFn = function(sketch, resolve, reject) {
@@ -13,7 +99,50 @@ suite('Keyboard Events', function() {
       };
       let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
       await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new KeyboardEvent('keydown')); //dipatch a keyboard event to trigger the keyPressed functions
+      window.dispatchEvent(new KeyboardEvent('keydown')); //dispatch a keyboard event to trigger the keyPressed functions
+      sketches.end(); //resolve all sketches by calling their finish functions
+      let counts = await sketches.result; //get array holding number of times keyPressed was called. Rejected sketches also thrown here
+      assert.deepEqual(counts, [1, 1]); //check if every keyPressed function was called once
+    });
+  });
+
+  suite('keyReleased', function() {
+    test('keyReleased functions on multiple instances must run once', async function() {
+      let sketchFn = function(sketch, resolve, reject) {
+        let count = 0;
+
+        sketch.keyReleased = function() {
+          count += 1;
+        };
+
+        sketch.finish = function() {
+          resolve(count);
+        };
+      };
+      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
+      await sketches.setup; //wait for all sketches to setup
+      window.dispatchEvent(new KeyboardEvent('keyup')); //dispatch a keyboard event to trigger the keyReleased functions
+      sketches.end(); //resolve all sketches by calling their finish functions
+      let counts = await sketches.result; //get array holding number of times keyPressed was called. Rejected sketches also thrown here
+      assert.deepEqual(counts, [1, 1]); //check if every keyPressed function was called once
+    });
+  });
+
+  suite('keyTyped', function() {
+    test('keyTyped functions on multiple instances must run once', async function() {
+      let sketchFn = function(sketch, resolve, reject) {
+        let count = 0;
+        sketch.keyTyped = function() {
+          count += 1;
+        };
+
+        sketch.finish = function() {
+          resolve(count);
+        };
+      };
+      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
+      await sketches.setup; //wait for all sketches to setup
+      window.dispatchEvent(new KeyboardEvent('keypress', { key: 'A' })); //dispatch a keyboard event to trigger the keyTyped functions
       sketches.end(); //resolve all sketches by calling their finish functions
       let counts = await sketches.result; //get array holding number of times keyPressed was called. Rejected sketches also thrown here
       assert.deepEqual(counts, [1, 1]); //check if every keyPressed function was called once