Merged latest Pixi dev build.

Author: photonstorm

build/config.php

@@ -76,6 +76,9 @@
     <script src="$path/src/pixi/textures/BaseTexture.js"></script>
     <script src="$path/src/pixi/textures/Texture.js"></script>
     <script src="$path/src/pixi/textures/RenderTexture.js"></script>
+    <script src="$path/src/pixi/filters/AbstractFilter.js"></script>
+    <script src="$path/src/pixi/filters/AsciiFilter.js"></script>
+    <script src="$path/src/pixi/filters/TwistFilter.js"></script>
 
     <script src="$path/src/Phaser.js"></script>
     <script src="$path/src/utils/Utils.js"></script>

src/pixi/display/Sprite.js

@@ -64,7 +64,7 @@ PIXI.Sprite = function(texture)
      * @type Number
      * @default 0xFFFFFF
      */
-    this.tint = 0xFFFFFF;// * Math.random();
+    this.tint = 0xFFFFFF;
 
     /**
      * The blend mode to be applied to the sprite
@@ -75,6 +75,16 @@ PIXI.Sprite = function(texture)
      */
     this.blendMode = PIXI.blendModes.NORMAL;
 
+
+    /**
+     * The shader that will be used to render the texture to the stage.
+     *
+     * @property shader
+     * @type PIXI.AbstractFilter
+     * @default null
+     */
+    this.shader = null;
+
     if(texture.baseTexture.hasLoaded)
     {
         this.onTextureUpdate();
@@ -86,6 +96,7 @@ PIXI.Sprite = function(texture)
     }
 
     this.renderable = true;
+
 };
 
 // constructor
@@ -292,10 +303,8 @@ PIXI.Sprite.prototype._renderWebGL = function(renderSession)
         {
             this.children[i]._renderWebGL(renderSession);
         }
+        
     }
-
-   
-    //TODO check culling  
 };
 
 /**

src/pixi/extras/Strip.js

@@ -125,7 +125,7 @@ PIXI.Strip.prototype._renderStrip = function(renderSession)
     gl.uniformMatrix3fv(shader.translationMatrix, false, this.worldTransform.toArray(true));
     gl.uniform2f(shader.projectionVector, projection.x, -projection.y);
     gl.uniform2f(shader.offsetVector, -offset.x, -offset.y);
-    gl.uniform1f(shader.alpha, 1);
+    gl.uniform1f(shader.alpha, this.worldAlpha);
 
     if(!this.dirty)
     {
@@ -143,7 +143,7 @@ PIXI.Strip.prototype._renderStrip = function(renderSession)
         // check if a texture is dirty..
         if(this.texture.baseTexture._dirty[gl.id])
         {
-            this.renderSession.renderer.updateTexture(this.texture.baseTexture);
+            renderSession.renderer.updateTexture(this.texture.baseTexture);
         }
         else
         {

src/pixi/extras/TilingSprite.js

@@ -381,7 +381,7 @@ PIXI.TilingSprite.prototype.generateTilingTexture = function(forcePowerOfTwo)
 {
     if (!this.texture.baseTexture.hasLoaded) return;
 
-    var texture = this.texture;
+    var texture = this.originalTexture || this.texture;
     var frame = texture.frame;
     var targetWidth, targetHeight;
 
@@ -458,5 +458,9 @@ PIXI.TilingSprite.prototype.generateTilingTexture = function(forcePowerOfTwo)
     }
 
     this.refreshTexture = false;
+    
+    this.originalTexture = this.texture;
+    this.texture = this.tilingTexture;
+    
     this.tilingTexture.baseTexture._powerOf2 = true;
 };

src/pixi/filters/AbstractFilter.js

@@ -44,3 +44,17 @@ PIXI.AbstractFilter = function(fragmentSrc, uniforms)
     */
     this.fragmentSrc = fragmentSrc || [];
 };
+
+PIXI.AbstractFilter.prototype.syncUniforms = function()
+{
+    for(var i=0,j=this.shaders.length; i<j; i++)
+    {
+        this.shaders[i].dirty = true;
+    }
+};
+/*
+PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
+{
+    // TODO :)
+};
+*/

src/pixi/renderers/canvas/CanvasRenderer.js

@@ -131,6 +131,8 @@ PIXI.CanvasRenderer = function(width, height, options)
         roundPixels: false
     };
 
+    this.mapBlendModes();
+    
     this.resize(width, height);
 
     if("imageSmoothingEnabled" in this.context)
@@ -166,17 +168,20 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
         this.context.fillStyle = "black";
         this.context.clear();
     }
-
-    if (!this.transparent && this.clearBeforeRender)
-    {
-        this.context.fillStyle = stage.backgroundColorString;
-        this.context.fillRect(0, 0, this.width , this.height);
-    }
-    else if (this.transparent && this.clearBeforeRender)
+    
+    if (this.clearBeforeRender)
     {
-        this.context.clearRect(0, 0, this.width, this.height);
+        if (this.transparent)
+        {
+            this.context.clearRect(0, 0, this.width, this.height);
+        }
+        else
+        {
+            this.context.fillStyle = stage.backgroundColorString;
+            this.context.fillRect(0, 0, this.width , this.height);
+        }
     }
-
+    
     this.renderDisplayObject(stage);
 
     // run interaction!

src/pixi/renderers/webgl/WebGLRenderer.js

@@ -315,7 +315,7 @@ PIXI.WebGLRenderer.prototype.resize = function(width, height)
  */
 PIXI.WebGLRenderer.prototype.updateTexture = function(texture)
 {
-    if(!texture.hasLoaded)return;
+    if(!texture.hasLoaded )return;
 
     var gl = this.gl;
 

src/pixi/renderers/webgl/shaders/PixiShader.js

@@ -39,6 +39,8 @@ PIXI.PixiShader = function(gl)
     * @property {number} textureCount - A local texture counter for multi-texture shaders.
     */
     this.textureCount = 0;
+    this.firstRun = true;
+    this.dirty = true;
 
     this.attributes = [];
 
@@ -289,7 +291,18 @@ PIXI.PixiShader.prototype.syncUniforms = function()
             if (uniform._init)
             {
                 gl.activeTexture(gl['TEXTURE' + this.textureCount]);
-                gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id] || PIXI.createWebGLTexture( uniform.value.baseTexture, gl));
+
+                if(uniform.value.baseTexture._dirty[gl.id])
+                {
+                    PIXI.defaultRenderer.updateTexture(uniform.value.baseTexture);
+                }
+                else
+                {
+                    // bind the current texture
+                    gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id]);
+                }
+
+             //   gl.bindTexture(gl.TEXTURE_2D, uniform.value.baseTexture._glTextures[gl.id] || PIXI.createWebGLTexture( uniform.value.baseTexture, gl));
                 gl.uniform1i(uniform.uniformLocation, this.textureCount);
                 this.textureCount++;
             }
@@ -323,7 +336,7 @@ PIXI.PixiShader.prototype.destroy = function()
 PIXI.PixiShader.defaultVertexSrc = [
     'attribute vec2 aVertexPosition;',
     'attribute vec2 aTextureCoord;',
-    'attribute vec2 aColor;',
+    'attribute vec4 aColor;',
 
     'uniform vec2 projectionVector;',
     'uniform vec2 offsetVector;',

src/pixi/renderers/webgl/utils/WebGLFilterManager.js

@@ -114,9 +114,9 @@ PIXI.WebGLFilterManager.prototype.pushFilter = function(filterBlock)
 
     // update projection
     // now restore the regular shader..
-    this.renderSession.shaderManager.setShader(this.defaultShader);
-    gl.uniform2f(this.defaultShader.projectionVector, filterArea.width/2, -filterArea.height/2);
-    gl.uniform2f(this.defaultShader.offsetVector, -filterArea.x, -filterArea.y);
+    // this.renderSession.shaderManager.setShader(this.defaultShader);
+    //gl.uniform2f(this.defaultShader.projectionVector, filterArea.width/2, -filterArea.height/2);
+    //gl.uniform2f(this.defaultShader.offsetVector, -filterArea.x, -filterArea.y);
 
     gl.colorMask(true, true, true, true);
     gl.clearColor(0,0,0, 0);
@@ -299,10 +299,10 @@ PIXI.WebGLFilterManager.prototype.popFilter = function()
     // apply!
     this.applyFilterPass(filter, filterArea, sizeX, sizeY);
 
-    // now restore the regular shader..
-    this.renderSession.shaderManager.setShader(this.defaultShader);
-    gl.uniform2f(this.defaultShader.projectionVector, sizeX/2, -sizeY/2);
-    gl.uniform2f(this.defaultShader.offsetVector, -offsetX, -offsetY);
+    // now restore the regular shader.. should happen automatically now..
+   // this.renderSession.shaderManager.setShader(this.defaultShader);
+ //   gl.uniform2f(this.defaultShader.projectionVector, sizeX/2, -sizeY/2);
+ //   gl.uniform2f(this.defaultShader.offsetVector, -offsetX, -offsetY);
 
     // return the texture to the pool
     this.texturePool.push(texture);

src/pixi/renderers/webgl/utils/WebGLShaderManager.js

@@ -19,6 +19,8 @@ PIXI.WebGLShaderManager = function()
         this.attribState[i] = false;
     }
 
+    this.stack = [];
+    
     //this.setContext(gl);
     // the final one is used for the rendering strips
 };