Merge remote-tracking branch 'origin/master'

Author: pavle-goloskokovic

.npmignore

@@ -1,6 +1,2 @@
 **/.*
-dist/
-docs/
-merge/
-examples/
-v3/
+wip/

src/CoreScenePlugins.js

@@ -11,8 +11,8 @@ var CoreScenePlugins = [
     'GameObjectCreator',
     'GameObjectFactory',
     'ScenePlugin',
-    'DisplayList',
-    'UpdateList'
+    'DisplayListPlugin',
+    'UpdateListPlugin'
 
 ];
 

src/boot/Config.js

@@ -182,6 +182,18 @@ var Config = new Class({
         this.physics = GetValue(config, 'physics', {});
         this.defaultPhysicsSystem = GetValue(this.physics, 'default', false);
 
+        //  Loader Defaults
+        this.loaderBaseURL = GetValue(config, 'loader.baseURL', '');
+        this.loaderPath = GetValue(config, 'loader.path', '');
+        this.loaderEnableParallel = GetValue(config, 'loader.enableParallel', true);
+        this.loaderMaxParallelDownloads = GetValue(config, 'loader.maxParallelDownloads', 4);
+        this.loaderCrossOrigin = GetValue(config, 'loader.crossOrigin', undefined);
+        this.loaderResponseType = GetValue(config, 'loader.responseType', '');
+        this.loaderAsync = GetValue(config, 'loader.async', true);
+        this.loaderUser = GetValue(config, 'loader.user', '');
+        this.loaderPassword = GetValue(config, 'loader.password', '');
+        this.loaderTimeout = GetValue(config, 'loader.timeout', 0);
+
         //  Scene Plugins
         this.defaultPlugins = GetValue(config, 'plugins', DefaultScenePlugins);
 

src/boot/DebugHeader.js

@@ -105,7 +105,7 @@ var DebugHeader = function (game)
     }
 
     // Keep this during dev build only
-    console.log(CHECKSUM.build);
+    // console.log(CHECKSUM.build);
 };
 
 module.exports = DebugHeader;

src/boot/Game.js

@@ -226,9 +226,6 @@ var Game = new Class({
      */
     step: function (time, delta)
     {
-        var active = this.scene.active;
-        var renderer = this.renderer;
-
         //  Global Managers
 
         this.input.update(time, delta);
@@ -239,28 +236,21 @@ var Game = new Class({
 
         this.onStepCallback();
 
-        for (var i = 0; i < active.length; i++)
-        {
-            active[i].scene.sys.step(time, delta);
-        }
+        this.scene.update(time, delta);
 
         //  Render
 
-        // var interpolation = this.frameDelta / this.timestep;
+        var renderer = this.renderer;
 
         renderer.preRender();
 
-        this.events.emit('prerender');
+        this.events.emit('prerender', renderer);
 
-        //  This uses active.length, in case scene.update removed the scene from the active list
-        for (i = 0; i < active.length; i++)
-        {
-            active[i].scene.sys.render(0, renderer);
-        }
+        this.scene.render(renderer);
 
         renderer.postRender();
 
-        this.events.emit('postrender');
+        this.events.emit('postrender', renderer);
     },
 
     /**

src/gameobjects/DisplayList.js

@@ -1,23 +1,12 @@
 var Class = require('../utils/Class');
 var StableSort = require('../utils/array/StableSort');
-var PluginManager = require('../plugins/PluginManager');
 
 var DisplayList = new Class({
 
     initialize:
 
-    function DisplayList (scene)
+    function DisplayList ()
     {
-        //  The Scene that owns this plugin
-        this.scene = scene;
-
-        this.systems = scene.sys;
-
-        if (!scene.sys.settings.isBooted)
-        {
-            scene.sys.events.once('boot', this.boot, this);
-        }
-
         //  The objects that belong to this collection.
         //  The equivalent of the old `Sprite.children` array.
         this.list = [];
@@ -27,14 +16,6 @@ var DisplayList = new Class({
         this.position = 0;
     },
 
-    boot: function ()
-    {
-        var eventEmitter = this.systems.events;
-
-        eventEmitter.on('shutdown', this.shutdown, this);
-        eventEmitter.on('destroy', this.destroy, this);
-    },
-
     process: function ()
     {
         if (this.sortChildrenFlag)
@@ -725,6 +706,4 @@ var DisplayList = new Class({
 
 });
 
-PluginManager.register('DisplayList', DisplayList, 'displayList');
-
 module.exports = DisplayList;

src/gameobjects/DisplayListPlugin.js

@@ -0,0 +1,48 @@
+var Class = require('../utils/Class');
+var DisplayList = require('./DisplayList');
+var PluginManager = require('../plugins/PluginManager');
+
+var DisplayListPlugin = new Class({
+
+    Extends: DisplayList,
+
+    initialize:
+
+    function DisplayListPlugin (scene)
+    {
+        //  The Scene that owns this plugin
+        this.scene = scene;
+
+        this.systems = scene.sys;
+
+        if (!scene.sys.settings.isBooted)
+        {
+            scene.sys.events.once('boot', this.boot, this);
+        }
+
+        DisplayList.call(this);
+    },
+
+    boot: function ()
+    {
+        var eventEmitter = this.systems.events;
+
+        eventEmitter.on('shutdown', this.shutdown, this);
+        eventEmitter.on('destroy', this.destroy, this);
+    },
+
+    shutdown: function ()
+    {
+        this.removeAll();
+    },
+
+    destroy: function ()
+    {
+        this.shutdown();
+    }
+
+});
+
+PluginManager.register('DisplayListPlugin', DisplayListPlugin, 'displayList');
+
+module.exports = DisplayListPlugin;

src/gameobjects/UpdateList.js

@@ -1,36 +1,16 @@
 var Class = require('../utils/Class');
-var PluginManager = require('../plugins/PluginManager');
 
 var UpdateList = new Class({
 
     initialize:
 
-    function UpdateList (scene)
+    function UpdateList ()
     {
-        this.scene = scene;
-
-        this.systems = scene.sys;
-
-        if (!scene.sys.settings.isBooted)
-        {
-            scene.sys.events.once('boot', this.boot, this);
-        }
-
         this._list = [];
         this._pendingInsertion = [];
         this._pendingRemoval = [];
     },
 
-    boot: function ()
-    {
-        var eventEmitter = this.systems.events;
-
-        eventEmitter.on('preupdate', this.preUpdate, this);
-        eventEmitter.on('update', this.update, this);
-        eventEmitter.on('shutdown', this.shutdown, this);
-        eventEmitter.on('destroy', this.destroy, this);
-    },
-
     add: function (child)
     {
         //  Is child already in this list?
@@ -130,12 +110,8 @@ var UpdateList = new Class({
     destroy: function ()
     {
         this.shutdown();
-
-        this.scene = undefined;
     }
 
 });
 
-PluginManager.register('UpdateList', UpdateList, 'updateList');
-
 module.exports = UpdateList;

src/gameobjects/UpdateListPlugin.js

@@ -0,0 +1,46 @@
+var Class = require('../utils/Class');
+var PluginManager = require('../plugins/PluginManager');
+var UpdateList = require('./UpdateList');
+
+var UpdateListPlugin = new Class({
+
+    Extends: UpdateList,
+
+    initialize:
+
+    function UpdateListPlugin (scene)
+    {
+        this.scene = scene;
+
+        this.systems = scene.sys;
+
+        if (!scene.sys.settings.isBooted)
+        {
+            scene.sys.events.once('boot', this.boot, this);
+        }
+
+        UpdateList.call(this);
+    },
+
+    boot: function ()
+    {
+        var eventEmitter = this.systems.events;
+
+        eventEmitter.on('preupdate', this.preUpdate, this);
+        eventEmitter.on('update', this.update, this);
+        eventEmitter.on('shutdown', this.shutdown, this);
+        eventEmitter.on('destroy', this.destroy, this);
+    },
+
+    destroy: function ()
+    {
+        this.shutdown();
+
+        this.scene = undefined;
+    }
+
+});
+
+PluginManager.register('UpdateListPlugin', UpdateListPlugin, 'updateList');
+
+module.exports = UpdateListPlugin;

src/gameobjects/blitter/Blitter.js

@@ -3,6 +3,7 @@ var Bob = require('./Bob');
 var Class = require('../../utils/Class');
 var Components = require('../components');
 var DisplayList = require('../DisplayList');
+var Frame = require('../../textures/Frame');
 var GameObject = require('../GameObject');
 
 /**
@@ -41,14 +42,15 @@ var Blitter = new Class({
         this.setTexture(texture, frame);
         this.setPosition(x, y);
 
-        this.children = new DisplayList(this);
+        this.children = new DisplayList();
 
         this.renderList = [];
 
         this.dirty = false;
     },
 
     //  frame MUST be part of the Blitter texture
+    //  and can be either a Frame object or a string
     create: function (x, y, frame, visible, index)
     {
         if (visible === undefined) { visible = true; }
@@ -58,7 +60,7 @@ var Blitter = new Class({
         {
             frame = this.frame;
         }
-        else
+        else if (!(frame instanceof Frame))
         {
             frame = this.texture.get(frame);
         }
@@ -90,7 +92,7 @@ var Blitter = new Class({
     //  frame MUST be part of the Blitter texture
     createMultiple: function (quantity, frame, visible)
     {
-        if (frame === undefined) { frame = this.frame; }
+        if (frame === undefined) { frame = this.frame.name; }
         if (visible === undefined) { visible = true; }
 
         if (!Array.isArray(frame))