Merge remote-tracking branch 'processing/master' into webgl-shape-texture

Author: mlarghydracept

src/image/loading_displaying.js

@@ -198,10 +198,8 @@ p5.prototype.image =
   var defH = img.height;
 
   if (img.elt && img.elt.videoWidth && !img.canvas) { // video no canvas
-    var actualW = img.elt.videoWidth;
-    var actualH = img.elt.videoHeight;
     defW = img.elt.videoWidth;
-    defH = img.elt.width*actualH/actualW;
+    defH = img.elt.videoHeight;
   }
 
   var _dx = dx;
@@ -222,11 +220,17 @@ p5.prototype.image =
   // and https://github.com/processing/p5.js/issues/1673
   var pd = 1;
 
-  if (img.elt && img.elt.videoWidth && img.elt.style.width && !img.canvas) {
-    pd = img.elt.videoWidth / parseInt(img.elt.style.width, 10);
-  }
-  else if (img.elt && img.elt.width && img.elt.style.width) {
-    pd = img.elt.width / parseInt(img.elt.style.width, 10);
+  if (img.elt && !img.canvas && img.elt.style.width) {
+    //if img is video and img.elt.size() has been used and
+    //no width passed to image()
+    if(img.elt.videoWidth && !dWidth){
+      pd = img.elt.videoWidth;
+    }
+    //all other cases
+    else {
+      pd = img.elt.width;
+    }
+    pd /= parseInt(img.elt.style.width, 10);
   }
 
   _sx *= pd;

src/webgl/material.js

@@ -13,7 +13,7 @@ var p5 = require('../core/core');
 /**
  * Normal material for geometry. You can view all
  * possible materials in this
- * <a href="https://http://p5js.org/examples/3d-materials.html">example</a>.
+ * <a href="https://p5js.org/examples/3d-materials.html">example</a>.
  * @method normalMaterial
  * @return {p5}                the p5 object
  * @example
@@ -42,7 +42,7 @@ p5.prototype.normalMaterial = function(){
 
 /**
  * Texture for geometry.  You can view other possible materials in this
- * <a href="https://http://p5js.org/examples/3d-materials.html">example</a>.
+ * <a href="https://p5js.org/examples/3d-materials.html">example</a>.
  * @method texture
  * @param {p5.Image | p5.MediaElement | p5.Graphics} tex 2-dimensional graphics
  *                    to render as texture
@@ -215,7 +215,7 @@ p5.RendererGL.prototype._bind = function(tex, data){
 /**
  * Ambient material for geometry with a given color. You can view all
  * possible materials in this
- * <a href="https://http://p5js.org/examples/3d-materials.html">example</a>.
+ * <a href="https://p5js.org/examples/3d-materials.html">example</a>.
  * @method  ambientMaterial
  * @param  {Number|Array|String|p5.Color} v1  gray value,
  * red or hue value (depending on the current color mode),
@@ -269,7 +269,7 @@ p5.prototype.ambientMaterial = function(v1, v2, v3, a) {
 /**
  * Specular material for geometry with a given color. You can view all
  * possible materials in this
- * <a href="https://http://p5js.org/examples/3d-materials.html">example</a>.
+ * <a href="https://p5js.org/examples/3d-materials.html">example</a>.
  * @method specularMaterial
  * @param  {Number|Array|String|p5.Color} v1  gray value,
  * red or hue value (depending on the current color mode),