Renaming from State to Scene internally.

This is one monster update.

Author: photonstorm

v3/src/animation/manager/AnimationManager.js

@@ -15,7 +15,7 @@ var Map = require('../../structs/Map');
 *
 * Sprites and other Game Objects get the data they need from the AnimationManager.
 *
-* Access it via `state.anims`.
+* Access it via `scene.anims`.
 *
 * @class Phaser.AnimationManager
 * @constructor

v3/src/boot/Config.js

@@ -41,7 +41,7 @@ var Config = new Class({
         this.canvas = GetValue(config, 'canvas', null);
         this.canvasStyle = GetValue(config, 'canvasStyle', null);
 
-        this.stateConfig = GetValue(config, 'state', null);
+        this.sceneConfig = GetValue(config, 'scene', null);
 
         this.seed = GetValue(config, 'seed', [ (Date.now() * Math.random()).toString() ]);
 

v3/src/boot/Game.js

@@ -14,7 +14,7 @@ var CreateRenderer = require('./CreateRenderer');
 var Data = require('../plugins/Data');
 var GlobalCache = require('../cache/GlobalCache');
 var GlobalInputManager = require('../input/GlobalInputManager');
-var GlobalStateManager = require('../state/GlobalStateManager');
+var GlobalSceneManager = require('../scene/GlobalSceneManager');
 var TextureManager = require('../textures/TextureManager');
 var TimeStep = require('./TimeStep');
 
@@ -64,9 +64,9 @@ var Game = new Class({
         this.input = new GlobalInputManager(this, this.config);
 
         /**
-        * @property {Phaser.GlobalStateManager} state - The StateManager. Phaser instance specific.
+        * @property {Phaser.GlobalSceneManager} scene - The SceneManager. Phaser instance specific.
         */
-        this.state = new GlobalStateManager(this, this.config.stateConfig);
+        this.scene = new GlobalSceneManager(this, this.config.sceneConfig);
 
         /**
         * @property {Phaser.Device} device - Contains device information and capabilities (singleton)
@@ -100,7 +100,7 @@ var Game = new Class({
 
         this.anims.boot(this.textures);
 
-        this.state.boot();
+        this.scene.boot();
 
         this.input.boot();
 
@@ -120,18 +120,18 @@ var Game = new Class({
 
     step: function (time, delta)
     {
-        var active = this.state.active;
+        var active = this.scene.active;
         var renderer = this.renderer;
 
         //  Global Managers (Time, Input, etc)
 
         this.input.update(time, delta);
 
-        //  States
+        //  Scenes
 
         for (var i = 0; i < active.length; i++)
         {
-            active[i].state.sys.step(time, delta);
+            active[i].scene.sys.step(time, delta);
         }
 
         //  Render
@@ -140,10 +140,10 @@ var Game = new Class({
 
         renderer.preRender();
 
-        //  This uses active.length, in case state.update removed the state from the active list
+        //  This uses active.length, in case scene.update removed the scene from the active list
         for (i = 0; i < active.length; i++)
         {
-            active[i].state.sys.render(0, renderer);
+            active[i].scene.sys.render(0, renderer);
         }
 
         renderer.postRender();
@@ -153,23 +153,23 @@ var Game = new Class({
     {
         this.loop.pause();
 
-        // var active = this.state.active;
+        // var active = this.scene.active;
 
         // for (var i = 0; i < active.length; i++)
         // {
-        //     active[i].state.sys.pause();
+        //     active[i].scene.sys.pause();
         // }
     },
 
     onVisible: function ()
     {
         this.loop.resume();
 
-        // var active = this.state.active;
+        // var active = this.scene.active;
 
         // for (var i = 0; i < active.length; i++)
         // {
-        //     active[i].state.sys.resume();
+        //     active[i].scene.sys.resume();
         // }
     },
 

v3/src/camera/Camera.js

@@ -171,9 +171,9 @@ var Camera = new Class({
         return this;
     },
 
-    setState: function (state)
+    setScene: function (scene)
     {
-        this.state = state;
+        this.scene = scene;
 
         return this;
     },
@@ -477,7 +477,7 @@ var Camera = new Class({
 
     destroy: function ()
     {
-        this.state = undefined;
+        this.scene = undefined;
     }
 
 });

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '8d1f7160-682b-11e7-b9b9-afea77e03fb0'
+build: 'de3f9290-689a-11e7-813e-ffb54ad43616'
 };
 module.exports = CHECKSUM;

v3/src/gameobjects/BuildGameObject.js

@@ -2,7 +2,7 @@ var GetAdvancedValue = require('../utils/object/GetAdvancedValue');
 var ScaleModes = require('../renderer/ScaleModes');
 var BlendModes = require('../renderer/BlendModes');
 
-var BuildGameObject = function (state, gameObject, config)
+var BuildGameObject = function (scene, gameObject, config)
 {
     //  Position
 
@@ -89,13 +89,13 @@ var BuildGameObject = function (state, gameObject, config)
 
     gameObject.visible = GetAdvancedValue(config, 'visible', true);
 
-    //  Add to State
+    //  Add to Scene
 
     var add = GetAdvancedValue(config, 'add', true);
 
     if (add)
     {
-        state.children.add(gameObject);
+        scene.sys.displayList.add(gameObject);
     }
 
     return gameObject;

v3/src/gameobjects/GameObject.js

@@ -17,9 +17,9 @@ var GameObject = new Class({
 
     initialize:
 
-    function GameObject (state, type)
+    function GameObject (scene, type)
     {
-        this.state = state;
+        this.scene = scene;
 
         this.type = type;
 
@@ -39,8 +39,8 @@ var GameObject = new Class({
         this.hitArea = null;
         this.hitAreaCallback = null;
 
-        //  Trigger a state z-depth sort
-        this.state.sys.sortChildrenFlag = true;
+        //  Trigger a scene z-depth sort
+        this.scene.sys.sortChildrenFlag = true;
     },
 
     //  For GameObject Pooling and item selection
@@ -58,7 +58,7 @@ var GameObject = new Class({
 
     setHitArea: function (shape, callback)
     {
-        this.state.sys.inputManager.setHitArea(this, shape, callback);
+        this.scene.sys.inputManager.setHitArea(this, shape, callback);
 
         return this;
     },
@@ -73,7 +73,7 @@ var GameObject = new Class({
     {
         this.parent.remove(this);
 
-        this.state = undefined;
+        this.scene = undefined;
     }
 
 });

v3/src/gameobjects/bitmaptext/ParseFromAtlas.js

@@ -1,15 +1,15 @@
 var ParseXMLBitmapFont = require('./ParseXMLBitmapFont');
 
-var ParseFromAtlas = function (state, fontName, textureKey, frameKey, xmlKey, xSpacing, ySpacing)
+var ParseFromAtlas = function (scene, fontName, textureKey, frameKey, xmlKey, xSpacing, ySpacing)
 {
-    var frame = state.sys.textures.getFrame(textureKey, frameKey);
-    var xml = state.sys.cache.xml.get(xmlKey);
+    var frame = scene.sys.textures.getFrame(textureKey, frameKey);
+    var xml = scene.sys.cache.xml.get(xmlKey);
 
     if (frame && xml)
     {
         var data = ParseXMLBitmapFont(xml, xSpacing, ySpacing, frame);
 
-        state.sys.cache.bitmapFont.add(fontName, { data: data, texture: textureKey, frame: frameKey });
+        scene.sys.cache.bitmapFont.add(fontName, { data: data, texture: textureKey, frame: frameKey });
 
         return true;
     }

v3/src/gameobjects/bitmaptext/ParseRetroFont.js

@@ -11,7 +11,7 @@ var GetValue = require('../../utils/object/GetValue');
 // Phaser.GameObject.RetroFont = function (game, key, characterWidth, characterHeight, chars, charsPerRow, xSpacing, ySpacing, xOffset, yOffset)
 
 // {
-//      image: key,    
+//      image: key,
 //      width: 32,
 //      height: 32,
 //      chars: 'string',
@@ -20,7 +20,7 @@ var GetValue = require('../../utils/object/GetValue');
 //      offset: { x: 0, y: 0 }
 // }
 
-var ParseRetroFont = function (state, config)
+var ParseRetroFont = function (scene, config)
 {
     var w = config.width;
     var h = config.height;
@@ -38,7 +38,7 @@ var ParseRetroFont = function (state, config)
 
     if (charsPerRow === null)
     {
-        charsPerRow = state.sys.textures.getFrame(key).width / w;
+        charsPerRow = scene.sys.textures.getFrame(key).width / w;
 
         if (charsPerRow > letters.length)
         {

v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapText.js

@@ -22,14 +22,14 @@ var DynamicBitmapText = new Class({
 
     initialize:
 
-    function DynamicBitmapText (state, x, y, font, text, size, align)
+    function DynamicBitmapText (scene, x, y, font, text, size, align)
     {
         if (text === undefined) { text = ''; }
         if (align === undefined) { align = 'left'; }
 
-        GameObject.call(this, state, 'DynamicBitmapText');
+        GameObject.call(this, scene, 'DynamicBitmapText');
 
-        this.fontData = this.state.sys.cache.bitmapFont.get(font);
+        this.fontData = this.scene.sys.cache.bitmapFont.get(font);
 
         this.text = (Array.isArray(text)) ? text.join('\n') : text;