Merge remote-tracking branch 'origin/master'

Author: pavle-goloskokovic

v3/src/camera/2d/inc/GetWorldPoint.js

@@ -1,8 +1,11 @@
 var Vector2 = require('../../../math/Vector2');
 
-var GetWorldPoint = function (screenPoint, output)
+var GetWorldPoint = function (x, y, output)
 {
+    if (output === undefined) { output = new Vector2(); }
+
     var cameraMatrix = this.matrix.matrix;
+
     var mva = cameraMatrix[0];
     var mvb = cameraMatrix[1];
     var mvc = cameraMatrix[2];
@@ -15,7 +18,10 @@ var GetWorldPoint = function (screenPoint, output)
 
     if (!determinant)
     {
-        return screenPoint;
+        output.x = x;
+        output.y = y;
+
+        return output;
     }
 
     determinant = 1 / determinant;
@@ -26,22 +32,21 @@ var GetWorldPoint = function (screenPoint, output)
     var imd = mva * determinant;
     var ime = (mvc * mvf - mvd * mve) * determinant;
     var imf = (mvb * mve - mva * mvf) * determinant;
+
     var c = Math.cos(this.rotation);
     var s = Math.sin(this.rotation);
+
     var zoom = this.zoom;
+
     var scrollX = this.scrollX;
     var scrollY = this.scrollY;
-    var x = screenPoint.x + ((scrollX * c - scrollY * s) * zoom);
-    var y = screenPoint.y + ((scrollX * s + scrollY * c) * zoom);
 
-    if (!output)
-    {
-        output = new Vector2();
-    }
+    var sx = x + ((scrollX * c - scrollY * s) * zoom);
+    var sy = y + ((scrollX * s + scrollY * c) * zoom);
 
     /* Apply transform to point */
-    output.x = (x * ima + y * imc + ime);
-    output.y = (x * imb + y * imd + imf);
+    output.x = (sx * ima + sy * imc + ime);
+    output.y = (sx * imb + sy * imd + imf);
 
     return output;
 };

v3/src/camera/2d/inc/PreRender.js

@@ -21,30 +21,25 @@ var PreRender = function ()
     {
         var bounds = this._bounds;
 
-        // width = bounds.width;
-        // height = bounds.height;
-
-        // var boundsX = bounds.x;
-        // var boundsY = bounds.y;
-        // var boundsR = Math.max(bounds.right - width, width);
-        // var boundsB = Math.max(bounds.bottom - height, height);
+        var bw = Math.max(0, bounds.right - width);
+        var bh = Math.max(0, bounds.bottom - height);
 
         if (this.scrollX < bounds.x)
         {
             this.scrollX = bounds.x;
         }
-        else if (this.scrollX > bounds.right)
+        else if (this.scrollX > bw)
         {
-            this.scrollX = bounds.right;
+            this.scrollX = bw;
         }
 
         if (this.scrollY < bounds.y)
         {
             this.scrollY = bounds.y;
         }
-        else if (this.scrollY > bounds.bottom)
+        else if (this.scrollY > bh)
         {
-            this.scrollY = bounds.bottom;
+            this.scrollY = bh;
         }
     }
 

v3/src/camera/controls/KeyControl.js

@@ -46,11 +46,22 @@ var KeyControl = new Class({
     start: function ()
     {
         this.active = (this.camera !== null);
+
+        return this;
     },
 
     stop: function ()
     {
         this.active = false;
+
+        return this;
+    },
+
+    setCamera: function (camera)
+    {
+        this.camera = camera;
+
+        return this;
     },
 
     update: function (delta)

v3/src/camera/controls/SmoothedKeyControl.js

@@ -81,11 +81,22 @@ var SmoothedKeyControl = new Class({
     start: function ()
     {
         this.active = (this.camera !== null);
+
+        return this;
     },
 
     stop: function ()
     {
         this.active = false;
+
+        return this;
+    },
+
+    setCamera: function (camera)
+    {
+        this.camera = camera;
+
+        return this;
     },
 
     update: function (delta)

v3/src/camera/local/CameraManager.js

@@ -28,15 +28,16 @@ var CameraManager = new Class({
         this.main = this.cameras[0];
     },
 
-    add: require('./inc/Add2DCamera'),
     add3D: require('./inc/AddPerspectiveCamera'),
-    addPerspectiveCamera: require('./inc/AddPerspectiveCamera'),
-    addOrthographicCamera: require('./inc/AddOrthographicCamera'),
+    add: require('./inc/Add2DCamera'),
     addExisting: require('./inc/AddExisting'),
     addKeyControl: require('./inc/AddKeyControl'),
+    addOrthographicCamera: require('./inc/AddOrthographicCamera'),
+    addPerspectiveCamera: require('./inc/AddPerspectiveCamera'),
     addSmoothedKeyControl: require('./inc/AddSmoothedKeyControl'),
     destroy: require('./inc/Destroy'),
     fromJSON: require('./inc/FromJSON'),
+    getCamera: require('./inc/GetCamera'),
     getCameraBelowPointer: require('./inc/GetCameraBelowPointer'),
     remove: require('./inc/RemoveCamera'),
     render: require('./inc/Render'),

v3/src/camera/local/inc/Add2DCamera.js

@@ -1,12 +1,13 @@
 var Camera = require('../../2d/Camera');
 
-var Add2DCamera = function (x, y, width, height, makeMain)
+var Add2DCamera = function (x, y, width, height, makeMain, name)
 {
     if (x === undefined) { x = 0; }
     if (y === undefined) { y = 0; }
     if (width === undefined) { width = this.scene.sys.game.config.width; }
     if (height === undefined) { height = this.scene.sys.game.config.height; }
     if (makeMain === undefined) { makeMain = false; }
+    if (name === undefined) { name = ''; }
 
     var camera = null;
 
@@ -21,6 +22,7 @@ var Add2DCamera = function (x, y, width, height, makeMain)
         camera = new Camera(x, y, width, height);
     }
 
+    camera.setName(name);
     camera.setScene(this.scene);
 
     this.cameras.push(camera);

v3/src/camera/local/inc/GetCamera.js

@@ -0,0 +1,14 @@
+var GetCamera = function (name)
+{
+    this.cameras.forEach(function (camera)
+    {
+        if (camera.name === name)
+        {
+            return camera;
+        }
+    });
+
+    return null;
+};
+
+module.exports = GetCamera;

v3/src/gameobjects/components/ScrollFactor.js

@@ -1,7 +1,7 @@
 var ScrollFactor = {
 
-    scrollFactorX: 1.0,
-    scrollFactorY: 1.0,
+    scrollFactorX: 1,
+    scrollFactorY: 1,
 
     setScrollFactor: function (x, y)
     {

v3/src/gameobjects/components/TransformMatrix.js

@@ -118,6 +118,7 @@ var TransformMatrix = new Class({
         return this;
     },
 
+
     transformPoint: function (x, y, point)
     {
         if (point === undefined) { point = { x: 0, y: 0 }; }

v3/src/gameobjects/renderpass/RenderPass.js

@@ -176,6 +176,7 @@ var RenderPass = new Class({
                 gl.bindTexture(gl.TEXTURE_2D, textureData.texture);
                 gl.activeTexture(gl.TEXTURE0);
             }
+            //renderer.spriteBatch.addRenderPassRect(x, y, width, height, this.scrollFactorX, this.scrollFactorY, camera, this.passShader, this.passRenderTarget);
             renderer.spriteBatch.flush(this.passShader, this.passRenderTarget);
         }
     },