Updated to latest Pixi dev branch.

photonstorm · photonstorm · commit 86f972a76547 · 2014-07-03T10:49:58.000+01:00
diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js
@@ -253,19 +253,7 @@ PIXI.InteractionManager.prototype.update = function()
     // OPTIMISE - how often to check??
     if(this.dirty)
     {
-        this.dirty = false;
-
-        var len = this.interactiveItems.length;
-
-        for (i = 0; i < len; i++) {
-            this.interactiveItems[i].interactiveChildren = false;
-        }
-
-        this.interactiveItems = [];
-
-        if(this.stage.interactive)this.interactiveItems.push(this.stage);
-        // go through and collect all the objects that are interactive..
-        this.collectInteractiveSprite(this.stage, this.stage);
+        this.rebuildInteractiveGraph();
     }
 
     // loop through interactive objects!
@@ -317,6 +305,23 @@ PIXI.InteractionManager.prototype.update = function()
     }
 };
 
+PIXI.InteractionManager.prototype.rebuildInteractiveGraph = function()
+{
+    this.dirty = false;
+
+    var len = this.interactiveItems.length;
+
+    for (var i = 0; i < len; i++) {
+        this.interactiveItems[i].interactiveChildren = false;
+    }
+
+    this.interactiveItems = [];
+
+    if(this.stage.interactive)this.interactiveItems.push(this.stage);
+    // go through and collect all the objects that are interactive..
+    this.collectInteractiveSprite(this.stage, this.stage);
+};
+
 /**
  * Is called when the mouse moves across the renderer element
  *
@@ -326,6 +331,11 @@ PIXI.InteractionManager.prototype.update = function()
  */
 PIXI.InteractionManager.prototype.onMouseMove = function(event)
 {
+    if(this.dirty)
+    {
+        this.rebuildInteractiveGraph();
+    }
+
     this.mouse.originalEvent = event || window.event; //IE uses window.event
     // TODO optimize by not check EVERY TIME! maybe half as often? //
     var rect = this.interactionDOMElement.getBoundingClientRect();
@@ -356,6 +366,11 @@ PIXI.InteractionManager.prototype.onMouseMove = function(event)
  */
 PIXI.InteractionManager.prototype.onMouseDown = function(event)
 {
+    if(this.dirty)
+    {
+        this.rebuildInteractiveGraph();
+    }
+
     this.mouse.originalEvent = event || window.event; //IE uses window.event
 
     if(PIXI.AUTO_PREVENT_DEFAULT)this.mouse.originalEvent.preventDefault();
@@ -399,6 +414,11 @@ PIXI.InteractionManager.prototype.onMouseDown = function(event)
  */
 PIXI.InteractionManager.prototype.onMouseOut = function()
 {
+    if(this.dirty)
+    {
+        this.rebuildInteractiveGraph();
+    }
+
     var length = this.interactiveItems.length;
 
     this.interactionDOMElement.style.cursor = 'inherit';
@@ -430,6 +450,10 @@ PIXI.InteractionManager.prototype.onMouseOut = function()
  */
 PIXI.InteractionManager.prototype.onMouseUp = function(event)
 {
+    if(this.dirty)
+    {
+        this.rebuildInteractiveGraph();
+    }
 
     this.mouse.originalEvent = event || window.event; //IE uses window.event
 
@@ -553,6 +577,11 @@ PIXI.InteractionManager.prototype.hitTest = function(item, interactionData)
  */
 PIXI.InteractionManager.prototype.onTouchMove = function(event)
 {
+    if(this.dirty)
+    {
+        this.rebuildInteractiveGraph();
+    }
+
     var rect = this.interactionDOMElement.getBoundingClientRect();
     var changedTouches = event.changedTouches;
     var touchData;
@@ -589,6 +618,11 @@ PIXI.InteractionManager.prototype.onTouchMove = function(event)
  */
 PIXI.InteractionManager.prototype.onTouchStart = function(event)
 {
+    if(this.dirty)
+    {
+        this.rebuildInteractiveGraph();
+    }
+
     var rect = this.interactionDOMElement.getBoundingClientRect();
 
     if(PIXI.AUTO_PREVENT_DEFAULT)event.preventDefault();
@@ -645,6 +679,11 @@ PIXI.InteractionManager.prototype.onTouchStart = function(event)
  */
 PIXI.InteractionManager.prototype.onTouchEnd = function(event)
 {
+    if(this.dirty)
+    {
+        this.rebuildInteractiveGraph();
+    }
+    
     //this.mouse.originalEvent = event || window.event; //IE uses window.event
     var rect = this.interactionDOMElement.getBoundingClientRect();
     var changedTouches = event.changedTouches;
diff --git a/src/pixi/Pixi.js b/src/pixi/Pixi.js
@@ -59,18 +59,23 @@ PIXI.AUTO_PREVENT_DEFAULT = true;
 PIXI.RAD_TO_DEG = 180 / Math.PI;
 PIXI.DEG_TO_RAD = Math.PI / 180;
 
-PIXI.sayHello = function () 
+
+PIXI.dontSayHello = false;
+
+PIXI.sayHello = function (type) 
 {
+    if(PIXI.dontSayHello)return;
+
     if ( navigator.userAgent.toLowerCase().indexOf('chrome') > -1 )
     {
         var args = [
-            '%c %c %c Pixi.js ' + PIXI.VERSION + '  %c %c ' + ' http://pixjs.com  %c %c ♥%c♥%c♥ ',
-            'background: #ed2577',
-            'background: #ed2577',
-            'color: #ed2577; background: #0a0c1a;',
-            'background: #ed2577',
-            'background: #0a0c1a',
-            'background: #ed2577',
+            '%c %c %c Pixi.js ' + PIXI.VERSION + ' - ' + type + '  %c ' + ' %c ' + ' http://pixjs.com  %c %c ♥%c♥%c♥ ',
+            'background: #ff66a5',
+            'background: #ff66a5',
+            'color: #ff66a5; background: #030307;',
+            'background: #ff66a5',
+            'background: #ffc3dc',
+            'background: #ff66a5',
             'color: #ff2424; background: #fff',
             'color: #ff2424; background: #fff',
             'color: #ff2424; background: #fff'
@@ -84,6 +89,6 @@ PIXI.sayHello = function ()
     {
         console.log('Pixi.js ' + PIXI.VERSION + ' - http://pixjs.com');
     }
-};
 
-PIXI.sayHello();
+    PIXI.dontSayHello = true;
+};
diff --git a/src/pixi/core/Circle.js b/src/pixi/core/Circle.js
@@ -69,6 +69,17 @@ PIXI.Circle.prototype.contains = function(x, y)
     return (dx + dy <= r2);
 };
 
+/**
+* Returns the framing rectangle of the circle as a PIXI.Rectangle object
+*
+* @method getBounds
+* @return {Rectangle} the framing rectangle
+*/
+PIXI.Circle.prototype.getBounds = function()
+{
+    return new PIXI.Rectangle(this.x - this.radius, this.y - this.radius, this.width, this.height);
+};
+
 // constructor
 PIXI.Circle.prototype.constructor = PIXI.Circle;
 
diff --git a/src/pixi/core/Ellipse.js b/src/pixi/core/Ellipse.js
@@ -7,10 +7,10 @@
  *
  * @class Ellipse
  * @constructor
- * @param x {Number} The X coordinate of the upper-left corner of the framing rectangle of this ellipse
- * @param y {Number} The Y coordinate of the upper-left corner of the framing rectangle of this ellipse
- * @param width {Number} The overall width of this ellipse
- * @param height {Number} The overall height of this ellipse
+ * @param x {Number} The X coordinate of the center of the ellipse
+ * @param y {Number} The Y coordinate of the center of the ellipse
+ * @param width {Number} The half width of this ellipse
+ * @param height {Number} The half height of this ellipse
  */
 PIXI.Ellipse = function(x, y, width, height)
 {
@@ -85,7 +85,7 @@ PIXI.Ellipse.prototype.contains = function(x, y)
 */
 PIXI.Ellipse.prototype.getBounds = function()
 {
-    return new PIXI.Rectangle(this.x, this.y, this.width, this.height);
+    return new PIXI.Rectangle(this.x - this.width, this.y - this.height, this.width, this.height);
 };
 
 // constructor
diff --git a/src/pixi/display/DisplayObjectContainer.js b/src/pixi/display/DisplayObjectContainer.js
@@ -74,7 +74,7 @@ Object.defineProperty(PIXI.DisplayObjectContainer.prototype, 'height', {
  */
 PIXI.DisplayObjectContainer.prototype.addChild = function(child)
 {
-    this.addChildAt(child, this.children.length);
+    return this.addChildAt(child, this.children.length);
 };
 
 /**
@@ -98,6 +98,8 @@ PIXI.DisplayObjectContainer.prototype.addChildAt = function(child, index)
         this.children.splice(index, 0, child);
 
         if(this.stage)child.setStageReference(this.stage);
+
+        return child;
     }
     else
     {
diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js
@@ -160,7 +160,7 @@ PIXI.Sprite.prototype.onTextureUpdate = function()
     if(this._height)this.scale.y = this._height / this.texture.frame.height;
 
 
-    this.updateFrame = true;
+    //this.updateFrame = true;
 };
 
 /**
diff --git a/src/pixi/extras/Rope.js b/src/pixi/extras/Rope.js
@@ -167,5 +167,5 @@ PIXI.Rope.prototype.setTexture = function(texture)
 {
     // stop current texture
     this.texture = texture;
-    this.updateFrame = true;
+    //this.updateFrame = true;
 };
diff --git a/src/pixi/extras/TilingSprite.js b/src/pixi/extras/TilingSprite.js
@@ -130,7 +130,7 @@ Object.defineProperty(PIXI.TilingSprite.prototype, 'height', {
  */
 PIXI.TilingSprite.prototype.onTextureUpdate = function()
 {
-    this.updateFrame = true;
+    //this.updateFrame = true;
 };
 
 PIXI.TilingSprite.prototype.setTexture = function(texture)
diff --git a/src/pixi/primitives/Graphics.js b/src/pixi/primitives/Graphics.js
@@ -527,7 +527,7 @@ PIXI.Graphics.prototype.drawRoundedRect = function( x, y, width, height, radius
  * @param y {Number} The Y coordinate of the center of the circle
  * @param radius {Number} The radius of the circle
  */
-PIXI.Graphics.prototype.drawCircle = function( x, y, radius)
+PIXI.Graphics.prototype.drawCircle = function(x, y, radius)
 {
 
     if (!this.currentPath.points.length) this.graphicsData.pop();
@@ -546,12 +546,12 @@ PIXI.Graphics.prototype.drawCircle = function( x, y, radius)
  * Draws an ellipse.
  *
  * @method drawEllipse
- * @param x {Number} The X coordinate of the upper-left corner of the framing rectangle of this ellipse
- * @param y {Number} The Y coordinate of the upper-left corner of the framing rectangle of this ellipse
- * @param width {Number} The width of the ellipse
- * @param height {Number} The height of the ellipse
+ * @param x {Number} The X coordinate of the center of the ellipse
+ * @param y {Number} The Y coordinate of the center of the ellipse
+ * @param width {Number} The half width of the ellipse
+ * @param height {Number} The half height of the ellipse
  */
-PIXI.Graphics.prototype.drawEllipse = function( x, y, width, height)
+PIXI.Graphics.prototype.drawEllipse = function(x, y, width, height)
 {
 
     if (!this.currentPath.points.length) this.graphicsData.pop();
diff --git a/src/pixi/renderers/canvas/CanvasRenderer.js b/src/pixi/renderers/canvas/CanvasRenderer.js
@@ -15,7 +15,11 @@
  */
 PIXI.CanvasRenderer = function(width, height, view, transparent)
 {
-    PIXI.defaultRenderer = PIXI.defaultRenderer || this;
+    if(!PIXI.defaultRenderer)
+    {
+        PIXI.sayHello("Canvas");
+        PIXI.defaultRenderer = this;
+    }
 
     this.type = PIXI.CANVAS_RENDERER;
 
@@ -31,16 +35,6 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
      */
     this.clearBeforeRender = true;
 
-    /**
-     * If true Pixi will Math.floor() x/y values when rendering, stopping pixel interpolation.
-     * Handy for crisp pixel art and speed on legacy devices.
-     *
-     * @property roundPixels
-     * @type Boolean
-     * @default
-     */
-    this.roundPixels = false;
-
     /**
      * Whether the render view is transparent
      *
@@ -153,7 +147,14 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
         context: this.context,
         maskManager: this.maskManager,
         scaleMode: null,
-        smoothProperty: null
+        smoothProperty: null,
+
+        /**
+         * If true Pixi will Math.floor() x/y values when rendering, stopping pixel interpolation.
+         * Handy for crisp pixel art and speed on legacy devices.
+         *
+         */
+        roundPixels: false
     };
 
     if("imageSmoothingEnabled" in this.context)
diff --git a/src/pixi/renderers/webgl/WebGLRenderer.js b/src/pixi/renderers/webgl/WebGLRenderer.js
@@ -21,7 +21,11 @@ PIXI.glContexts = []; // this is where we store the webGL contexts for easy acce
  */
 PIXI.WebGLRenderer = function(width, height, view, transparent, antialias)
 {
-    if(!PIXI.defaultRenderer)PIXI.defaultRenderer = this;
+    if(!PIXI.defaultRenderer)
+    {
+        PIXI.sayHello('webGL');
+        PIXI.defaultRenderer = this;
+    }
 
     this.type = PIXI.WEBGL_RENDERER;
 
@@ -357,7 +361,7 @@ PIXI.WebGLRenderer.destroyTexture = function(texture)
  */
 PIXI.WebGLRenderer.updateTextureFrame = function(texture)
 {
-    texture.updateFrame = false;
+    //texture.updateFrame = false;
 
     // now set the uvs. Figured that the uv data sits with a texture rather than a sprite.
     // so uv data is stored on the texture itself
diff --git a/src/pixi/renderers/webgl/utils/WebGLGraphics.js b/src/pixi/renderers/webgl/utils/WebGLGraphics.js
@@ -58,9 +58,14 @@ PIXI.WebGLGraphics.renderGraphics = function(graphics, renderSession)//projectio
             gl.drawElements(gl.TRIANGLE_FAN, 4, gl.UNSIGNED_SHORT, ( webGLData.indices.length - 4 ) * 2 );
             
             renderSession.stencilManager.popStencil(graphics, webGLData, renderSession);
+            
+            this.last = webGLData.mode;
         }
         else
         {
+            webGLData = webGL.data[i];
+           
+
             renderSession.shaderManager.setShader( shader );//activatePrimitiveShader();
             shader = renderSession.shaderManager.primitiveShader;
             gl.uniformMatrix3fv(shader.translationMatrix, false, graphics.worldTransform.toArray(true));
@@ -72,7 +77,6 @@ PIXI.WebGLGraphics.renderGraphics = function(graphics, renderSession)//projectio
 
             gl.uniform1f(shader.alpha, graphics.worldAlpha);
             
-            webGLData = webGL.data[i];
 
             gl.bindBuffer(gl.ARRAY_BUFFER, webGLData.buffer);
 
@@ -82,13 +86,8 @@ PIXI.WebGLGraphics.renderGraphics = function(graphics, renderSession)//projectio
             // set the index buffer!
             gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, webGLData.indexBuffer);
             gl.drawElements(gl.TRIANGLE_STRIP,  webGLData.indices.length, gl.UNSIGNED_SHORT, 0 );
-
-         //   renderSession.shaderManager.deactivatePrimitiveShader();
         }
     }
-
-    // return to default shader...
-    //  PIXI.activateShader(PIXI.defaultShader);
 };
 
 /**
diff --git a/src/pixi/renderers/webgl/utils/WebGLShaderManager.js b/src/pixi/renderers/webgl/utils/WebGLShaderManager.js
diff --git a/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js b/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js
diff --git a/src/pixi/textures/Texture.js b/src/pixi/textures/Texture.js
diff --git a/src/pixi/utils/EventTarget.js b/src/pixi/utils/EventTarget.js

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ Object.defineProperty(PIXI.DisplayObjectContainer.prototype, 'height', {`
`74`	`74`	`*/`
`75`	`75`	`PIXI.DisplayObjectContainer.prototype.addChild = function(child)`
`76`	`76`	`{`
`77`		`- this.addChildAt(child, this.children.length);`
	`77`	`+ return this.addChildAt(child, this.children.length);`
`78`	`78`	`};`
`79`	`79`
`80`	`80`	`/**`
`@@ -98,6 +98,8 @@ PIXI.DisplayObjectContainer.prototype.addChildAt = function(child, index)`
`98`	`98`	`this.children.splice(index, 0, child);`
`99`	`99`
`100`	`100`	`if(this.stage)child.setStageReference(this.stage);`
	`101`	`+`
	`102`	`+ return child;`
`101`	`103`	`}`
`102`	`104`	`else`
`103`	`105`	`{`
Original file line number	Diff line number	Diff line change
`@@ -167,5 +167,5 @@ PIXI.Rope.prototype.setTexture = function(texture)`
`167`	`167`	`{`
`168`	`168`	`// stop current texture`
`169`	`169`	`this.texture = texture;`
`170`		`- this.updateFrame = true;`
	`170`	`+ //this.updateFrame = true;`
`171`	`171`	`};`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ Object.defineProperty(PIXI.TilingSprite.prototype, 'height', {`
`130`	`130`	`*/`
`131`	`131`	`PIXI.TilingSprite.prototype.onTextureUpdate = function()`
`132`	`132`	`{`
`133`		`- this.updateFrame = true;`
	`133`	`+ //this.updateFrame = true;`
`134`	`134`	`};`
`135`	`135`
`136`	`136`	`PIXI.TilingSprite.prototype.setTexture = function(texture)`