Phaser 2.1.3

chris-hammersley · Oct 23, 2014 · 7557e4e · 7557e4e
1 parent f3f022b
commit 7557e4e
Show file tree

Hide file tree

Showing 12 changed files with 192 additions and 52 deletions.
diff --git a/build/custom/phaser-arcade-physics.js b/build/custom/phaser-arcade-physics.js
@@ -7,7 +7,7 @@
 *
 * Phaser - http://phaser.io
 *
-* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:26:25
+* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:33:03
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -1068,7 +1068,11 @@ PIXI.DisplayObject.prototype.generateTexture = function(resolution, scaleMode, r
     var bounds = this.getLocalBounds();
 
     var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution);
-    renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) );
+
+    PIXI.DisplayObject._tempMatrix.tx = -bounds.x;
+    PIXI.DisplayObject._tempMatrix.ty = -bounds.y;
+
+    renderTexture.render(this, PIXI.DisplayObject._tempMatrix);
 
     return renderTexture;
 };
@@ -2634,6 +2638,7 @@ PIXI.Text.prototype.updateText = function()
     this.context.strokeStyle = this.style.stroke;
     this.context.lineWidth = this.style.strokeThickness;
     this.context.textBaseline = 'alphabetic';
+    this.context.lineJoin = 'round';
 
     var linePositionX;
     var linePositionY;
@@ -7550,7 +7555,7 @@ PIXI.WebGLSpriteBatch.prototype.destroy = function()
 * @class WebGLFastSpriteBatch
 * @constructor
 */
-PIXI.WebGLFastSpriteBatch = function()
+PIXI.WebGLFastSpriteBatch = function(gl)
 {
     /**
      * @property vertSize
@@ -7660,6 +7665,7 @@ PIXI.WebGLFastSpriteBatch = function()
      */
     this.matrix = null;
 
+    this.setContext(gl);
 };
 
 PIXI.WebGLFastSpriteBatch.prototype.constructor = PIXI.WebGLFastSpriteBatch;
@@ -7895,7 +7901,7 @@ PIXI.WebGLFastSpriteBatch.prototype.flush = function()
 
     // bind the current texture
 
-    if(!this.currentBaseTexture._glTextures[gl.id])PIXI.createWebGLTexture(this.currentBaseTexture, gl);
+    if(!this.currentBaseTexture._glTextures[gl.id])this.renderSession.renderer.updateTexture(this.currentBaseTexture, gl);
 
     gl.bindTexture(gl.TEXTURE_2D, this.currentBaseTexture._glTextures[gl.id]);
 
@@ -9116,6 +9122,28 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
     }
 };
 
+/**
+ * Removes everything from the renderer and optionally removes the Canvas DOM element.
+ *
+ * @method destroy
+ * @param [removeView=true] {boolean} Removes the Canvas element from the DOM.
+ */
+PIXI.CanvasRenderer.prototype.destroy = function(removeView)
+{
+    if (typeof removeView === "undefined") { removeView = true; }
+
+    if (removeView && this.view.parent)
+    {
+        this.view.parent.removeChild(this.view);
+    }
+
+    this.view = null;
+    this.context = null;
+    this.maskManager = null;
+    this.renderSession = null;
+
+};
+
 /**
  * Resizes the canvas view to the specified width and height
  *
@@ -11554,7 +11582,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
 *
 * Phaser - http://phaser.io
 *
-* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:26:25
+* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:33:03
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *

diff --git a/build/custom/phaser-arcade-physics.min.js b/build/custom/phaser-arcade-physics.min.js
diff --git a/build/custom/phaser-ninja-physics.js b/build/custom/phaser-ninja-physics.js
@@ -7,7 +7,7 @@
 *
 * Phaser - http://phaser.io
 *
-* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:26:25
+* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:33:03
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -1068,7 +1068,11 @@ PIXI.DisplayObject.prototype.generateTexture = function(resolution, scaleMode, r
     var bounds = this.getLocalBounds();
 
     var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution);
-    renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) );
+
+    PIXI.DisplayObject._tempMatrix.tx = -bounds.x;
+    PIXI.DisplayObject._tempMatrix.ty = -bounds.y;
+
+    renderTexture.render(this, PIXI.DisplayObject._tempMatrix);
 
     return renderTexture;
 };
@@ -2634,6 +2638,7 @@ PIXI.Text.prototype.updateText = function()
     this.context.strokeStyle = this.style.stroke;
     this.context.lineWidth = this.style.strokeThickness;
     this.context.textBaseline = 'alphabetic';
+    this.context.lineJoin = 'round';
 
     var linePositionX;
     var linePositionY;
@@ -7550,7 +7555,7 @@ PIXI.WebGLSpriteBatch.prototype.destroy = function()
 * @class WebGLFastSpriteBatch
 * @constructor
 */
-PIXI.WebGLFastSpriteBatch = function()
+PIXI.WebGLFastSpriteBatch = function(gl)
 {
     /**
      * @property vertSize
@@ -7660,6 +7665,7 @@ PIXI.WebGLFastSpriteBatch = function()
      */
     this.matrix = null;
 
+    this.setContext(gl);
 };
 
 PIXI.WebGLFastSpriteBatch.prototype.constructor = PIXI.WebGLFastSpriteBatch;
@@ -7895,7 +7901,7 @@ PIXI.WebGLFastSpriteBatch.prototype.flush = function()
 
     // bind the current texture
 
-    if(!this.currentBaseTexture._glTextures[gl.id])PIXI.createWebGLTexture(this.currentBaseTexture, gl);
+    if(!this.currentBaseTexture._glTextures[gl.id])this.renderSession.renderer.updateTexture(this.currentBaseTexture, gl);
 
     gl.bindTexture(gl.TEXTURE_2D, this.currentBaseTexture._glTextures[gl.id]);
 
@@ -9116,6 +9122,28 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
     }
 };
 
+/**
+ * Removes everything from the renderer and optionally removes the Canvas DOM element.
+ *
+ * @method destroy
+ * @param [removeView=true] {boolean} Removes the Canvas element from the DOM.
+ */
+PIXI.CanvasRenderer.prototype.destroy = function(removeView)
+{
+    if (typeof removeView === "undefined") { removeView = true; }
+
+    if (removeView && this.view.parent)
+    {
+        this.view.parent.removeChild(this.view);
+    }
+
+    this.view = null;
+    this.context = null;
+    this.maskManager = null;
+    this.renderSession = null;
+
+};
+
 /**
  * Resizes the canvas view to the specified width and height
  *
@@ -11554,7 +11582,7 @@ PIXI.AbstractFilter.prototype.apply = function(frameBuffer)
 *
 * Phaser - http://phaser.io
 *
-* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:26:25
+* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:33:03
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *

diff --git a/build/custom/phaser-ninja-physics.min.js b/build/custom/phaser-ninja-physics.min.js
diff --git a/build/custom/phaser-no-libs.js b/build/custom/phaser-no-libs.js
@@ -7,7 +7,7 @@
 *
 * Phaser - http://phaser.io
 *
-* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:26:25
+* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:33:03
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *

diff --git a/build/custom/phaser-no-physics.js b/build/custom/phaser-no-physics.js
@@ -7,7 +7,7 @@
 *
 * Phaser - http://phaser.io
 *
-* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:26:25
+* v2.1.3 "Ravinda" - Built: Thu Oct 23 2014 12:33:03
 *
 * By Richard Davey http://www.photonstorm.com @photonstorm
 *
@@ -1068,7 +1068,11 @@ PIXI.DisplayObject.prototype.generateTexture = function(resolution, scaleMode, r
     var bounds = this.getLocalBounds();
 
     var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution);
-    renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) );
+
+    PIXI.DisplayObject._tempMatrix.tx = -bounds.x;
+    PIXI.DisplayObject._tempMatrix.ty = -bounds.y;
+
+    renderTexture.render(this, PIXI.DisplayObject._tempMatrix);
 
     return renderTexture;
 };
@@ -2634,6 +2638,7 @@ PIXI.Text.prototype.updateText = function()
     this.context.strokeStyle = this.style.stroke;
     this.context.lineWidth = this.style.strokeThickness;
     this.context.textBaseline = 'alphabetic';
+    this.context.lineJoin = 'round';
 
     var linePositionX;
     var linePositionY;
@@ -7550,7 +7555,7 @@ PIXI.WebGLSpriteBatch.prototype.destroy = function()
 * @class WebGLFastSpriteBatch
 * @constructor
 */
-PIXI.WebGLFastSpriteBatch = function()
+PIXI.WebGLFastSpriteBatch = function(gl)
 {
     /**
      * @property vertSize
@@ -7660,6 +7665,7 @@ PIXI.WebGLFastSpriteBatch = function()
      */
     this.matrix = null;
 
+    this.setContext(gl);
 };
 
 PIXI.WebGLFastSpriteBatch.prototype.constructor = PIXI.WebGLFastSpriteBatch;
@@ -7895,7 +7901,7 @@ PIXI.WebGLFastSpriteBatch.prototype.flush = function()
 
     // bind the current texture
 
-    if(!this.currentBaseTexture._glTextures[gl.id])PIXI.createWebGLTexture(this.currentBaseTexture, gl);
+    if(!this.currentBaseTexture._glTextures[gl.id])this.renderSession.renderer.updateTexture(this.currentBaseTexture, gl);
 
     gl.bindTexture(gl.TEXTURE_2D, this.currentBaseTexture._glTextures[gl.id]);
 
@@ -9116,6 +9122,28 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
     }
 };
 
+/**
+ * Removes everything from the renderer and optionally removes the Canvas DOM element.
+ *
+ * @method destroy
+ * @param [removeView=true] {boolean} Removes the Canvas element from the DOM.
+ */
+PIXI.CanvasRenderer.prototype.destroy = function(removeView)
+{
+    if (typeof removeView === "undefined") { removeView = true; }
+
+    if (removeView && this.view.parent)
+    {
+        this.view.parent.removeChild(this.view);
+    }
+
+    this.view = null;
+    this.context = null;
+    this.maskManager = null;
+    this.renderSession = null;
+
+};
+
 /**
  * Resizes the canvas view to the specified width and height
  *

diff --git a/build/custom/phaser-no-physics.min.js b/build/custom/phaser-no-physics.min.js
diff --git a/build/custom/pixi.js b/build/custom/pixi.js
@@ -1038,7 +1038,11 @@ PIXI.DisplayObject.prototype.generateTexture = function(resolution, scaleMode, r
     var bounds = this.getLocalBounds();
 
     var renderTexture = new PIXI.RenderTexture(bounds.width | 0, bounds.height | 0, renderer, scaleMode, resolution);
-    renderTexture.render(this, new PIXI.Point(-bounds.x, -bounds.y) );
+
+    PIXI.DisplayObject._tempMatrix.tx = -bounds.x;
+    PIXI.DisplayObject._tempMatrix.ty = -bounds.y;
+
+    renderTexture.render(this, PIXI.DisplayObject._tempMatrix);
 
     return renderTexture;
 };
@@ -2604,6 +2608,7 @@ PIXI.Text.prototype.updateText = function()
     this.context.strokeStyle = this.style.stroke;
     this.context.lineWidth = this.style.strokeThickness;
     this.context.textBaseline = 'alphabetic';
+    this.context.lineJoin = 'round';
 
     var linePositionX;
     var linePositionY;
@@ -7520,7 +7525,7 @@ PIXI.WebGLSpriteBatch.prototype.destroy = function()
 * @class WebGLFastSpriteBatch
 * @constructor
 */
-PIXI.WebGLFastSpriteBatch = function()
+PIXI.WebGLFastSpriteBatch = function(gl)
 {
     /**
      * @property vertSize
@@ -7630,6 +7635,7 @@ PIXI.WebGLFastSpriteBatch = function()
      */
     this.matrix = null;
 
+    this.setContext(gl);
 };
 
 PIXI.WebGLFastSpriteBatch.prototype.constructor = PIXI.WebGLFastSpriteBatch;
@@ -7865,7 +7871,7 @@ PIXI.WebGLFastSpriteBatch.prototype.flush = function()
 
     // bind the current texture
 
-    if(!this.currentBaseTexture._glTextures[gl.id])PIXI.createWebGLTexture(this.currentBaseTexture, gl);
+    if(!this.currentBaseTexture._glTextures[gl.id])this.renderSession.renderer.updateTexture(this.currentBaseTexture, gl);
 
     gl.bindTexture(gl.TEXTURE_2D, this.currentBaseTexture._glTextures[gl.id]);
 
@@ -9086,6 +9092,28 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
     }
 };
 
+/**
+ * Removes everything from the renderer and optionally removes the Canvas DOM element.
+ *
+ * @method destroy
+ * @param [removeView=true] {boolean} Removes the Canvas element from the DOM.
+ */
+PIXI.CanvasRenderer.prototype.destroy = function(removeView)
+{
+    if (typeof removeView === "undefined") { removeView = true; }
+
+    if (removeView && this.view.parent)
+    {
+        this.view.parent.removeChild(this.view);
+    }
+
+    this.view = null;
+    this.context = null;
+    this.maskManager = null;
+    this.renderSession = null;
+
+};
+
 /**
  * Resizes the canvas view to the specified width and height
  *

diff --git a/build/custom/pixi.min.js b/build/custom/pixi.min.js