Added the Texture Manager into the core systems list.

Author: photonstorm

build/config.php

@@ -102,8 +102,8 @@
     <script src="$path/src/textures/Texture.js"></script>
     <script src="$path/src/textures/TextureSource.js"></script>
     <script src="$path/src/textures/Frame.js"></script>
-    <script src="$path/src/textures/parsers/Image.js"></script>
     <script src="$path/src/textures/parsers/Canvas.js"></script>
+    <script src="$path/src/textures/parsers/Image.js"></script>
     <script src="$path/src/textures/parsers/JSONArray.js"></script>
     <script src="$path/src/textures/parsers/JSONHash.js"></script>
     <script src="$path/src/textures/parsers/SpriteSheet.js"></script>

src/core/Game.js

@@ -221,6 +221,11 @@ Phaser.Game = function (width, height, renderer, parent, state, transparent, ant
     */
     this.make = null;
 
+    /**
+    * @property {Phaser.TextureManager} textures - Reference to the Phaser Texture Manager.
+    */
+    this.textures = null;
+
     /**
     * @property {Phaser.Cache} cache - Reference to the assets cache.
     */
@@ -603,7 +608,7 @@ Phaser.Game.prototype = {
 
         this.isBooted = true;
 
-        PIXI.game = this;
+        // PIXI.game = this;
 
         this.math = Phaser.Math;
 
@@ -612,6 +617,8 @@ Phaser.Game.prototype = {
 
         this.setUpRenderer();
 
+        this.textures = new Phaser.TextureManager(this);
+
         this.world = new Phaser.World(this);
 
         this.add = new Phaser.GameObject.Factory(this);

src/core/State.js

@@ -24,10 +24,15 @@ Phaser.State = function () {
     this.key = '';
 
     /**
-    * @property {Phaser.GameObjectFactory} add - A reference to the GameObjectFactory which can be used to add new objects to the World.
+    * @property {Phaser.GameObject.Factory} add - A reference to the GameObjectFactory which can be used to add new objects to the World.
     */
     this.add = null;
 
+    /**
+    * @property {Phaser.TextureManager} textures - TODO
+    */
+    this.textures = null;
+
     /**
     * @property {Phaser.GameObjectCreator} make - A reference to the GameObjectCreator which can be used to make new objects.
     */

src/core/StateManager.js

@@ -470,6 +470,7 @@ Phaser.StateManager.prototype = {
         this.states[key].scale = this.game.scale;
         this.states[key].state = this;
         this.states[key].stage = this.game.stage;
+        this.states[key].textures = this.game.textures;
         this.states[key].time = this.game.time;
         this.states[key].tweens = this.game.tweens;
         this.states[key].world = this.game.world;
@@ -503,6 +504,7 @@ Phaser.StateManager.prototype = {
             this.states[key].scale = null;
             this.states[key].state = null;
             this.states[key].stage = null;
+            this.states[key].textures = null;
             this.states[key].time = null;
             this.states[key].tweens = null;
             this.states[key].world = null;