From 9d6d3127ad69dc19b94a0098422c782dd8b3f1ac Mon Sep 17 00:00:00 2001 From: photonstorm Date: Thu, 13 Feb 2014 13:00:15 +0000 Subject: [PATCH] Few more reference fixes. --- src/core/Game.js | 11 +++++++---- src/core/Stage.js | 18 ++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/core/Game.js b/src/core/Game.js index fc65062f..f391a8df 100644 --- a/src/core/Game.js +++ b/src/core/Game.js @@ -534,7 +534,7 @@ Phaser.Game.prototype = { this.renderer = new PIXI.CanvasRenderer(this.width, this.height, this.canvas, this.transparent); Phaser.Canvas.setSmoothingEnabled(this.renderer.context, this.antialias); - this.canvas = this.renderer.view; + // this.canvas = this.renderer.view; this.context = this.renderer.context; } else @@ -547,12 +547,15 @@ Phaser.Game.prototype = { // They requested WebGL, and their browser supports it this.renderType = Phaser.WEBGL; this.renderer = new PIXI.WebGLRenderer(this.width, this.height, this.canvas, this.transparent, this.antialias); - this.canvas = this.renderer.view; + // this.canvas = this.renderer.view; this.context = null; } - Phaser.Canvas.addToDOM(this.renderer.view, this.parent, true); - Phaser.Canvas.setTouchAction(this.renderer.view); + // Phaser.Canvas.addToDOM(this.renderer.view, this.parent, true); + // Phaser.Canvas.setTouchAction(this.renderer.view); + + Phaser.Canvas.addToDOM(this.canvas, this.parent, true); + Phaser.Canvas.setTouchAction(this.canvas); }, diff --git a/src/core/Stage.js b/src/core/Stage.js index b357a2df..b9e8dfda 100644 --- a/src/core/Stage.js +++ b/src/core/Stage.js @@ -81,20 +81,20 @@ Phaser.Stage.prototype.parseConfig = function (config) { if (config['canvasID']) { - this.canvas = Phaser.Canvas.create(this.game.width, this.game.height, config['canvasID']); + this.game.canvas = Phaser.Canvas.create(this.game.width, this.game.height, config['canvasID']); } else { - this.canvas = Phaser.Canvas.create(this.game.width, this.game.height); + this.game.canvas = Phaser.Canvas.create(this.game.width, this.game.height); } if (config['canvasStyle']) { - this.canvas.stlye = config['canvasStyle']; + this.game.canvas.stlye = config['canvasStyle']; } else { - this.canvas.style['-webkit-full-screen'] = 'width: 100%; height: 100%'; + this.game.canvas.style['-webkit-full-screen'] = 'width: 100%; height: 100%'; } if (config['checkOffsetInterval']) @@ -131,7 +131,7 @@ Phaser.Stage.prototype.parseConfig = function (config) { */ Phaser.Stage.prototype.boot = function () { - Phaser.Canvas.getOffset(this.canvas, this.offset); + Phaser.Canvas.getOffset(this.game.canvas, this.offset); this.bounds = new Phaser.Rectangle(this.offset.x, this.offset.y, this.game.width, this.game.height); @@ -141,10 +141,8 @@ Phaser.Stage.prototype.boot = function () { return _this.visibilityChange(event); } - Phaser.Canvas.setUserSelect(this.canvas, 'none'); - Phaser.Canvas.setTouchAction(this.canvas, 'none'); - - // this.backgroundColor = '#000000'; + Phaser.Canvas.setUserSelect(this.game.canvas, 'none'); + Phaser.Canvas.setTouchAction(this.game.canvas, 'none'); document.addEventListener('visibilitychange', this._onChange, false); document.addEventListener('webkitvisibilitychange', this._onChange, false); @@ -166,7 +164,7 @@ Phaser.Stage.prototype.update = function () { { if (this.game.time.now > this._nextOffsetCheck) { - Phaser.Canvas.getOffset(this.canvas, this.offset); + Phaser.Canvas.getOffset(this.game.canvas, this.offset); this._nextOffsetCheck = this.game.time.now + this.checkOffsetInterval; }