Merge pull request #1913 from mlarghydracept/webgl-shape-texture

Immediate mode shapes with texturing

Author: lmccart

src/webgl/material.js

@@ -121,6 +121,7 @@ p5.prototype.texture = function(){
     args[i] = arguments[i];
   }
   var gl = this._renderer.GL;
+  this._renderer.drawMode = 'texture';
   var shaderProgram = this._renderer._getShader('lightVert',
     'lightTextureFrag');
   gl.useProgram(shaderProgram);

src/webgl/p5.RendererGL.Immediate.js

@@ -76,7 +76,7 @@ function(mode, isCurve, isBezier,isQuadratic, isContour, shapeKind){
     this.immediateMode.vertexPositions,
     this.immediateMode.vertexColors);
   if(mode){
-    if(this.drawMode === 'fill'){
+    if(this.drawMode === 'fill' || this.drawMode ==='texture'){
       switch(this.immediateMode.shapeMode){
         case constants.LINE_STRIP:
           this.immediateMode.shapeMode = constants.TRIANGLE_FAN;