Merge pull request #7395 from RandomGamingDev/setUniform-texture-slot-addition

Added ability to use setUniform for textures by texture slot rather than by p5.Texture

Author: davepagurek

src/webgl/p5.Shader.js

@@ -1326,12 +1326,30 @@ p5.Shader = class {
         }
         break;
       case gl.SAMPLER_2D:
-        gl.activeTexture(gl.TEXTURE0 + uniform.samplerIndex);
-        uniform.texture =
-          data instanceof p5.Texture ? data : this._renderer.getTexture(data);
-        gl.uniform1i(location, uniform.samplerIndex);
-        if (uniform.texture.src.gifProperties) {
-          uniform.texture.src._animateGif(this._renderer._pInst);
+        if (typeof data == 'number') {
+          if (
+            data < gl.TEXTURE0 ||
+            data > gl.TEXTURE31 ||
+            data !== Math.ceil(data)
+          ) {
+            console.log(
+              '🌸 p5.js says: ' +
+              'You\'re trying to use a number as the data for a texture.' +
+              'Please use a texture.'
+            );
+            return this;
+          }
+          gl.activeTexture(data);
+          gl.uniform1i(location, data);
+        }
+        else {
+          gl.activeTexture(gl.TEXTURE0 + uniform.samplerIndex);
+          uniform.texture =
+            data instanceof p5.Texture ? data : this._renderer.getTexture(data);
+          gl.uniform1i(location, uniform.samplerIndex);
+          if (uniform.texture.src.gifProperties) {
+            uniform.texture.src._animateGif(this._renderer._pInst);
+          }
         }
         break;
       //@todo complete all types