Merge pull request #1470 from mindofmatthew/texture-error

Lauren McCarthy · web-flow · commit b8c04ebb19d6 · 2016-06-17T13:32:43.000+10:00
Console error in texture()
diff --git a/src/webgl/material.js b/src/webgl/material.js
@@ -118,7 +118,8 @@ p5.prototype.texture = function(){
       textureData = args[0].canvas;
     }
     //if param is a video
-    else if (args[0] instanceof p5.MediaElement){
+    else if (typeof p5.MediaElement !== 'undefined' &&
+            args[0] instanceof p5.MediaElement){
       if(!args[0].loadedmetadata) {return;}
       textureData = args[0].elt;
     }
@@ -133,7 +134,8 @@ p5.prototype.texture = function(){
   }
   else {
     if(args[0] instanceof p5.Graphics ||
-      args[0] instanceof p5.MediaElement){
+      (typeof p5.MediaElement !== 'undefined' &&
+      args[0] instanceof p5.MediaElement)){
       textureData = args[0].elt;
     }
     else if(args[0] instanceof p5.Image){

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ p5.prototype.texture = function(){`
`118`	`118`	`textureData = args[0].canvas;`
`119`	`119`	`}`
`120`	`120`	`//if param is a video`
`121`		`- else if (args[0] instanceof p5.MediaElement){`
	`121`	`+ else if (typeof p5.MediaElement !== 'undefined' &&`
	`122`	`+ args[0] instanceof p5.MediaElement){`
`122`	`123`	`if(!args[0].loadedmetadata) {return;}`
`123`	`124`	`textureData = args[0].elt;`
`124`	`125`	`}`
`@@ -133,7 +134,8 @@ p5.prototype.texture = function(){`
`133`	`134`	`}`
`134`	`135`	`else {`
`135`	`136`	`if(args[0] instanceof p5.Graphics \|\|`
`136`		`- args[0] instanceof p5.MediaElement){`
	`137`	`+ (typeof p5.MediaElement !== 'undefined' &&`
	`138`	`+ args[0] instanceof p5.MediaElement)){`
`137`	`139`	`textureData = args[0].elt;`
`138`	`140`	`}`
`139`	`141`	`else if(args[0] instanceof p5.Image){`