Merge branch 'crhallberg-keyreleased'

Author: lauren mccarthy

README.md

@@ -9,7 +9,7 @@ p5.js is a new interpretation, not an emulation or port, and it is in active dev
 
 ##p5.js library
 
-You can [download here](http://p5js.org/get-started) or use `lib/p5.js` for the less stable, newest version.
+You can [download here](http://p5js.org/download) or use `lib/p5.js` for the less stable, newest version.
 
 ##Documentation
 
@@ -31,6 +31,7 @@ This project developed out of a Fellowship with the Processing Foundation explor
 
 
 ##Development
+
 See the [contribute section](http://p5js.org/contribute) to get started and check out the [development](https://github.com/lmccart/p5.js/wiki/Development) wiki page for details.
 
 

lib/p5.js

@@ -89,7 +89,7 @@ var core = function (require, shim, constants) {
     var constants = constants;
     var p5 = function (sketch, node) {
       this._setupDone = false;
-      this._pixelDensity =2;// window.devicePixelRatio || 1;
+      this._pixelDensity = window.devicePixelRatio || 1;
       this._startTime = new Date().getTime();
       this._userNode = node;
       this._curElement = null;
@@ -1020,7 +1020,7 @@ var p5Image = function (require, core, filters) {
       var currBlend = this.drawingContext.globalCompositeOperation;
       var scaleFactor = 1;
       if (p5Image instanceof p5.Graphics) {
-        scaleFactor = p5Image._pixelDensity;
+        scaleFactor = p5Image._pInst._pixelDensity;
       }
       var copyArgs = [
           p5Image,
@@ -2976,6 +2976,12 @@ var inputkeyboard = function (require, core) {
       var keyReleased = this.keyReleased || window.keyReleased;
       this._setProperty('isKeyPressed', false);
       this._setProperty('keyIsPressed', false);
+      var key = String.fromCharCode(e.which);
+      if (!key) {
+        key = e.which;
+      }
+      this._setProperty('key', key);
+      this._setProperty('keyCode', e.which);
       if (typeof keyReleased === 'function') {
         keyReleased(e);
       }

lib/p5.min.js

@@ -9,12 +9,12 @@ define(function (require) {
   'use strict';
 
   var p5 = require('core');
-  
+
   /**
    * The boolean system variable keyIsPressed is true if any key is pressed
    * and false if no keys are pressed.
    *
-   * @property keyIsPressed   
+   * @property keyIsPressed
    * @example
    * <div>
    * <code>
@@ -32,7 +32,7 @@ define(function (require) {
    */
   p5.prototype.isKeyPressed = false;
   p5.prototype.keyIsPressed = false; // khan
-   
+
   /**
    * The system variable key always contains the value of the most recent
    * key on the keyboard that was typed. To get the proper capitalization, it
@@ -54,21 +54,21 @@ define(function (require) {
 
    /**
    * The keyPressed() function is called once every time a key is pressed. The
-   * keyCode for the key that was pressed is stored in the keyCode variable. 
+   * keyCode for the key that was pressed is stored in the keyCode variable.
    * <br><br>
    * For non-ASCII keys, use the keyCode variable. You can check if the keyCode
-   * equals BACKSPACE, DELETE, ENTER, RETURN, TAB, ESCAPE, SHIFT, CONTROL, 
+   * equals BACKSPACE, DELETE, ENTER, RETURN, TAB, ESCAPE, SHIFT, CONTROL,
    * OPTION, ALT, UP_ARROW, DOWN_ARROW, LEFT_ARROW, RIGHT_ARROW.
    * <br><br>
    * For ASCII keys that was pressed is stored in the key variable. However, it
    * does not distinguish between uppercase and lowercase. For this reason, it
    * is recommended to use keyTyped() to read the key variable, in which the
    * case of the variable will be distinguished.
    * <br><br>
-   * Because of how operating systems handle key repeats, holding down a key 
-   * may cause multiple calls to keyTyped() (and keyReleased() as well). The 
-   * rate of repeat is set by the operating system and how each computer is 
-   * configured. 
+   * Because of how operating systems handle key repeats, holding down a key
+   * may cause multiple calls to keyTyped() (and keyReleased() as well). The
+   * rate of repeat is set by the operating system and how each computer is
+   * configured.
    *
    * @method keyPressed
    * @example
@@ -146,6 +146,12 @@ define(function (require) {
     var keyReleased = this.keyReleased || window.keyReleased;
     this._setProperty('isKeyPressed', false);
     this._setProperty('keyIsPressed', false);
+    var key = String.fromCharCode(e.which);
+    if (!key) {
+      key = e.which;
+    }
+    this._setProperty('key', key);
+    this._setProperty('keyCode', e.which);
     if (typeof keyReleased === 'function') {
       keyReleased(e);
     }
@@ -156,10 +162,10 @@ define(function (require) {
    * action keys such as Ctrl, Shift, and Alt are ignored. The most recent
    * key pressed will be stored in the key variable.
    * <br><br>
-   * Because of how operating systems handle key repeats, holding down a key 
-   * will cause multiple calls to keyTyped(), the rate is set by the operating 
-   * system and how each computer is configured. 
-   * 
+   * Because of how operating systems handle key repeats, holding down a key
+   * will cause multiple calls to keyTyped(), the rate is set by the operating
+   * system and how each computer is configured.
+   *
    * @method keyTyped
    * @example
    * <div>

src/input/keyboard.js

@@ -12,7 +12,9 @@ define(function(require) {
   /**
    * Creates a canvas element in the document, and sets the dimensions of it
    * in pixels. This method should be called only once at the start of setup.
-   * <br>
+   * Calling createCanvas more than once in a sketch will result in very
+   * unpredicable behavior. If you want more more than one drawing canvas
+   * you could use createGraphics (hidden by default but it can be shown).<br>
    * The system variables width and height are set by the parameters passed
    * to this function. If createCanvas() is not used, the window will be
    * given a default size of 100x100 pixels.