Fixed Camera3D Plugin, exposed it via camera3d in a Scene and added cameras to local array.

Closes phaserjs#3188

Author: photonstorm

src/cameras/2d/CameraManager.js

@@ -182,36 +182,6 @@ var CameraManager = new Class({
         return null;
     },
 
-    /**
-     * [description]
-     *
-     * @method Phaser.Cameras.Scene2D.CameraManager#addKeyControl
-     * @since 3.0.0
-     *
-     * @param {[type]} config - [description]
-     *
-     * @return {[type]} [description]
-     */
-    addKeyControl: function (config)
-    {
-        return new KeyControl(config);
-    },
-
-    /**
-     * [description]
-     *
-     * @method Phaser.Cameras.Scene2D.CameraManager#addSmoothedKeyControl
-     * @since 3.0.0
-     *
-     * @param {[type]} config - [description]
-     *
-     * @return {[type]} [description]
-     */
-    addSmoothedKeyControl: function (config)
-    {
-        return new SmoothedKeyControl(config);
-    },
-
     /*
     {
         cameras: [

src/cameras/sprite3d/CameraManager.js

@@ -1,5 +1,4 @@
 var Class = require('../../utils/Class');
-var GetFastValue = require('../../utils/object/GetFastValue');
 var OrthographicCamera = require('./OrthographicCamera');
 var PerspectiveCamera = require('./PerspectiveCamera');
 var PluginManager = require('../../plugins/PluginManager');
@@ -38,6 +37,14 @@ var CameraManager = new Class({
          */
         this.systems = scene.sys;
 
+        /**
+         * An Array of the Camera objects being managed by this Camera Manager.
+         *
+         * @property {Phaser.Cameras.Sprite3D.Camera[]} cameras
+         * @since 3.0.0
+         */
+        this.cameras = [];
+
         if (!scene.sys.settings.isBooted)
         {
             scene.sys.events.once('boot', this.boot, this);
@@ -96,6 +103,8 @@ var CameraManager = new Class({
 
         var camera = new OrthographicCamera(this.scene, width, height);
 
+        this.cameras.push(camera);
+
         return camera;
     },
 
@@ -121,18 +130,9 @@ var CameraManager = new Class({
 
         var camera = new PerspectiveCamera(this.scene, fieldOfView, width, height);
 
-        return camera;
-    },
+        this.cameras.push(camera);
 
-    /**
-     * [description]
-     *
-     * @method Phaser.Cameras.Sprite3D.CameraManager#destroy
-     * @since 3.0.0
-     */
-    destroy: function ()
-    {
-        this.scene = undefined;
+        return camera;
     },
 
     /**
@@ -170,58 +170,28 @@ var CameraManager = new Class({
     {
         var cameraIndex = this.cameras.indexOf(camera);
 
-        if (cameraIndex >= 0 && this.cameras.length > 1)
+        if (cameraIndex !== -1)
         {
-            this.cameraPool.push(this.cameras[cameraIndex]);
             this.cameras.splice(cameraIndex, 1);
-
-            if (this.main === camera)
-            {
-                this.main = this.cameras[0];
-            }
-        }
-    },
-
-    /**
-     * [description]
-     *
-     * @method Phaser.Cameras.Sprite3D.CameraManager#render
-     * @since 3.0.0
-     *
-     * @param {[type]} renderer - [description]
-     * @param {[type]} children - [description]
-     * @param {[type]} interpolation - [description]
-     */
-    render: function (renderer, children, interpolation)
-    {
-        var cameras = this.cameras;
-
-        for (var i = 0, l = cameras.length; i < l; ++i)
-        {
-            var camera = cameras[i];
-
-            camera.preRender();
-
-            renderer.render(this.scene, children, interpolation, camera);
         }
     },
 
     /**
      * [description]
      *
-     * @method Phaser.Cameras.Sprite3D.CameraManager#resetAll
+     * @method Phaser.Cameras.Sprite3D.CameraManager#removeAll
      * @since 3.0.0
      *
      * @return {[type]} [description]
      */
-    resetAll: function ()
+    removeAll: function ()
     {
         while (this.cameras.length > 0)
         {
-            this.cameraPool.push(this.cameras.pop());
-        }
+            var camera = this.cameras.pop();
 
-        this.main = this.add();
+            camera.destroy();
+        }
 
         return this.main;
     },
@@ -251,6 +221,17 @@ var CameraManager = new Class({
      */
     shutdown: function ()
     {
+    },
+
+    /**
+     * [description]
+     *
+     * @method Phaser.Cameras.Sprite3D.CameraManager#destroy
+     * @since 3.0.0
+     */
+    destroy: function ()
+    {
+        this.scene = undefined;
     }
 
 });

src/plugins/DefaultScenePlugins.js

@@ -7,6 +7,7 @@
 
 var DefaultScenePlugins = [
 
+    'CameraManager3D',
     'Clock',
     'DataManagerPlugin',
     'InputPlugin',

src/plugins/PluginManager.js

@@ -31,12 +31,15 @@ var PluginManager = new Class({
 
             // console.log('PluginManager.global', pluginKey);
 
-            sys[pluginKey] = game[pluginKey];
-
-            //  Scene level injection
-            if (map.hasOwnProperty(pluginKey))
+            if (game[pluginKey])
             {
-                scene[map[pluginKey]] = sys[pluginKey];
+                sys[pluginKey] = game[pluginKey];
+
+                //  Scene level injection
+                if (map.hasOwnProperty(pluginKey))
+                {
+                    scene[map[pluginKey]] = sys[pluginKey];
+                }
             }
         }
     },
@@ -51,6 +54,11 @@ var PluginManager = new Class({
         {
             var pluginKey = scenePlugins[i];
 
+            if (!plugins[pluginKey])
+            {
+                continue;
+            }
+
             var source = plugins[pluginKey];
 
             // console.log('PluginManager.local', pluginKey, 'to', source.mapping);

src/scene/InjectionMap.js

@@ -14,6 +14,7 @@ var InjectionMap = {
 
     events: 'events',
     cameras: 'cameras',
+    cameras3d: 'cameras3d',
     add: 'add',
     make: 'make',
     scenePlugin: 'scene',