Skip to content

Commit a877cda

Browse files
committed
Fixed State.renderToTexture setting.
1 parent b0e2018 commit a877cda

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

v3/src/checksum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var CHECKSUM = {
2-
build: '2c3243e0-ed7f-11e6-a825-abeab037992f'
2+
build: 'd2813a20-ed80-11e6-9112-31e669c80df9'
33
};
44
module.exports = CHECKSUM;

v3/src/loader/BaseLoader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ BaseLoader.prototype = {
6767

6868
start: function ()
6969
{
70-
console.log(this.state.settings.key, 'BaseLoader start. Files to load:', this.list.size);
70+
console.log(this.state.settings.key, ' - BaseLoader start. Files to load:', this.list.size);
7171

7272
if (!this.isReady())
7373
{
@@ -247,7 +247,7 @@ BaseLoader.prototype = {
247247

248248
processComplete: function ()
249249
{
250-
console.log(this.state.settings.key, 'Loader Complete. Loaded:', this.storage.size, 'Failed:', this.failed.size);
250+
console.log(this.state.settings.key, ' - Loader Complete. Loaded:', this.storage.size, 'Failed:', this.failed.size);
251251

252252
this.list.clear();
253253
this.inflight.clear();

v3/src/renderer/canvas/CanvasRenderer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ CanvasRenderer.prototype = {
149149
var ctx = state.sys.context;
150150
var settings = state.sys.settings;
151151
var scissor = (camera.x !== 0 || camera.y !== 0 || camera.width !== ctx.canvas.width || camera.height !== ctx.canvas.height);
152+
152153
this.currentContext = ctx;
153154

154155
ctx.setTransform(1, 0, 0, 1, 0, 0);

v3/src/state/StateManager.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ StateManager.prototype = {
280280

281281
createStateDisplay: function (state)
282282
{
283-
console.log('createStateDisplay', state.settings.key);
283+
// console.log('createStateDisplay', state.settings.key);
284284

285285
var settings = state.sys.settings;
286286

@@ -295,7 +295,7 @@ StateManager.prototype = {
295295
{
296296
if (settings.renderToTexture)
297297
{
298-
console.log('renderToTexture');
298+
// console.log('renderToTexture', width, height);
299299
state.sys.canvas = CanvasPool.create(state, width, height);
300300
state.sys.context = GetContext(state.sys.canvas);
301301

@@ -307,7 +307,7 @@ StateManager.prototype = {
307307
}
308308
else
309309
{
310-
console.log('using game canvas');
310+
// console.log('using game canvas');
311311
state.sys.mask = new Rectangle(0, 0, width, height);
312312
state.sys.canvas = this.game.canvas;
313313
state.sys.context = this.game.context;
@@ -317,7 +317,6 @@ StateManager.prototype = {
317317
{
318318
// state.sys.fbo = this.game.renderer.createFBO(state, x, y, width, height);
319319
}
320-
321320
},
322321

323322
getState: function (key)

v3/src/state/Systems.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ var Systems = function (state, config)
2727

2828
this.x = this.settings.x;
2929
this.y = this.settings.y;
30+
this.width = this.settings.width;
31+
this.height = this.settings.height;
3032

3133
this.mask = null;
3234
this.canvas;

0 commit comments

Comments
 (0)