wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-07-27 11:25:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue in Text. Fixed the background color issue with Canvas games. Updated the Examples viewer so the side-by-side focuses the iframe now. Added new "Extend Group" example.

Browse Source
This commit is contained in:
photonstorm
2013-11-25 13:12:03 +00:00
parent 299115ca5d
commit 06a17b4b26
11 changed files with 9984 additions and 9280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PixiPatch.js
+1 -4
View File
@@ -21,12 +21,9 @@ PIXI.CanvasRenderer.prototype.render = function(stage)
PIXI.visibleCount++;
stage.updateTransform();
// update the background color
// if(this.view.style.backgroundColor!=stage.backgroundColorString && !this.transparent)this.view.style.backgroundColor = stage.backgroundColorString;
this.context.setTransform(1, 0, 0, 1, 0, 0);
// this.context.clearRect(0, 0, this.width, this.height)
this.context.clearRect(0, 0, this.width, this.height)
this.renderDisplayObject(stage);
// Remove frame updates
src/core/Stage.js
+15 -9
View File
@@ -98,6 +98,8 @@ Phaser.Stage.prototype = {
Phaser.Canvas.setUserSelect(this.canvas, 'none');
Phaser.Canvas.setTouchAction(this.canvas, 'none');
this.backgroundColor = '#000';
document.addEventListener('visibilitychange', this._onChange, false);
document.addEventListener('webkitvisibilitychange', this._onChange, false);
document.addEventListener('pagehide', this._onChange, false);
@@ -165,19 +167,23 @@ Object.defineProperty(Phaser.Stage.prototype, "backgroundColor", {
this._backgroundColor = color;
if (this.game.renderType == Phaser.CANVAS)
if (this.game.transparent === false)
{
// Set it directly, this allows us to use rgb alpha values in Canvas mode.
this._stage.backgroundColorString = color;
}
else
{
if (typeof color === 'string')
if (this.game.renderType == Phaser.CANVAS)
{
color = Phaser.Color.hexToRGB(color);
// Set it directly, this allows us to use rgb alpha values in Canvas mode.
this.game.canvas.style.backgroundColor = color;
}
else
{
if (typeof color === 'string')
{
color = Phaser.Color.hexToRGB(color);
}
this._stage.setBackgroundColor(color);
}
this._stage.setBackgroundColor(color);
}
}
src/gameobjects/Text.js
+4 -4
View File
@@ -202,10 +202,10 @@ Object.defineProperty(Phaser.Text.prototype, 'angle', {
/**
* The x coordinate of this object in world space.
* @name Phaser.BitmapText#x
* @name Phaser.Text#x
* @property {number} x - The x coordinate of this object in world space.
*/
Object.defineProperty(Phaser.BitmapText.prototype, 'x', {
Object.defineProperty(Phaser.Text.prototype, 'x', {
get: function() {
return this.position.x;
@@ -219,10 +219,10 @@ Object.defineProperty(Phaser.BitmapText.prototype, 'x', {
/**
* The y coordinate of this object in world space.
* @name Phaser.BitmapText#y
* @name Phaser.Text#y
* @property {number} y - The y coordinate of this object in world space.
*/
Object.defineProperty(Phaser.BitmapText.prototype, 'y', {
Object.defineProperty(Phaser.Text.prototype, 'y', {
get: function() {
return this.position.y;
src/input/Keyboard.js
+4 -4
View File
@@ -160,8 +160,8 @@ Phaser.Keyboard.prototype = {
return _this.processKeyUp(event);
};
document.body.addEventListener('keydown', this._onKeyDown, false);
document.body.addEventListener('keyup', this._onKeyUp, false);
window.addEventListener('keydown', this._onKeyDown, false);
window.addEventListener('keyup', this._onKeyUp, false);
},
@@ -172,8 +172,8 @@ Phaser.Keyboard.prototype = {
*/
stop: function () {
document.body.removeEventListener('keydown', this._onKeyDown);
document.body.removeEventListener('keyup', this._onKeyUp);
window.removeEventListener('keydown', this._onKeyDown);
window.removeEventListener('keyup', this._onKeyUp);
},