Merge pull request phaserjs#4700 from cristlee/master

add an optional textureData when initialize shader

Author: photonstorm

src/gameobjects/shader/Shader.js

@@ -77,6 +77,7 @@ var TransformMatrix = require('../components/TransformMatrix');
  * @param {number} [width=128] - The width of the Game Object.
  * @param {number} [height=128] - The height of the Game Object.
  * @param {string[]} [textures] - Optional array of texture keys to bind to the iChannel0...3 uniforms. The textures must already exist in the Texture Manager.
+ * @param {any} [textureData] - Additional texture data if you want to create shader with none NPOT textures.
  */
 var Shader = new Class({
 
@@ -96,7 +97,7 @@ var Shader = new Class({
 
     initialize:
 
-    function Shader (scene, key, x, y, width, height, textures)
+    function Shader (scene, key, x, y, width, height, textures, textureData)
     {
         if (x === undefined) { x = 0; }
         if (y === undefined) { y = 0; }
@@ -348,7 +349,7 @@ var Shader = new Class({
         this.setPosition(x, y);
         this.setSize(width, height);
         this.setOrigin(0.5, 0.5);
-        this.setShader(key, textures);
+        this.setShader(key, textures, textureData);
     },
 
     /**
@@ -469,10 +470,11 @@ var Shader = new Class({
      * 
      * @param {(string|Phaser.Display.BaseShader)} key - The key of the shader to use from the shader cache, or a BaseShader instance.
      * @param {string[]} [textures] - Optional array of texture keys to bind to the iChannel0...3 uniforms. The textures must already exist in the Texture Manager.
+     * @param {any} [textureData] - Additional texture data.
      * 
      * @return {this} This Shader instance.
      */
-    setShader: function (key, textures)
+    setShader: function (key, textures, textureData)
     {
         if (textures === undefined) { textures = []; }
 
@@ -538,7 +540,7 @@ var Shader = new Class({
         {
             if (textures[i])
             {
-                this.setSampler2D('iChannel' + i, textures[i], i);
+                this.setSampler2D('iChannel' + i, textures[i], i, textureData);
             }
         }
 

src/gameobjects/shader/ShaderFactory.js

@@ -22,13 +22,14 @@ var GameObjectFactory = require('../GameObjectFactory');
  * @param {number} [width=128] - The width of the Game Object.
  * @param {number} [height=128] - The height of the Game Object.
  * @param {string[]} [textures] - Optional array of texture keys to bind to the iChannel0...3 uniforms. The textures must already exist in the Texture Manager.
+ * @param {object} [textureData] - Optional additional texture data.
  *
  * @return {Phaser.GameObjects.Shader} The Game Object that was created.
  */
 if (typeof WEBGL_RENDERER)
 {
-    GameObjectFactory.register('shader', function (key, x, y, width, height, textures)
+    GameObjectFactory.register('shader', function (key, x, y, width, height, textures, textureData)
     {
-        return this.displayList.add(new Shader(this.scene, key, x, y, width, height, textures));
+        return this.displayList.add(new Shader(this.scene, key, x, y, width, height, textures, textureData));
     });
 }