Input updates

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '51369a60-5161-11e7-bea9-fdb861265841'
+build: '531e9860-521e-11e7-914d-2dba089add27'
 };
 module.exports = CHECKSUM;

v3/src/components/TransformMatrix.js

@@ -113,6 +113,47 @@ TransformMatrix.prototype.transform = function (a, b, c, d, tx, ty)
     return this;
 };
 
+TransformMatrix.prototype.transformPoint = function (x, y, point)
+{
+    if (point === undefined) { point = { x: 0, y: 0 }; }
+
+    var matrix = this.matrix;
+
+    var a = matrix[0];
+    var b = matrix[1];
+    var c = matrix[2];
+    var d = matrix[3];
+    var tx = matrix[4];
+    var ty = matrix[5];
+
+    point.x = x * a + y * c + tx;
+    point.y = x * b + y * d + ty;
+
+    return point;
+};
+
+TransformMatrix.prototype.invert = function ()
+{
+    var matrix = this.matrix;
+
+    var a1 = matrix[0];
+    var b1 = matrix[1];
+    var c1 = matrix[2];
+    var d1 = matrix[3];
+    var tx1 = matrix[4];
+    var ty1 = matrix[5];
+    var n = a1 * d1 - b1 * c1;
+
+    matrix[0] = d1 / n;
+    matrix[1] = -b1 / n;
+    matrix[2] = -c1 / n;
+    matrix[3] = a1 / n;
+    matrix[4] = (c1 * ty1 - d1 * tx1) / n;
+    matrix[5] = -(a1 * ty1 - b1 * tx1) / n;
+
+    return this;
+};
+
 TransformMatrix.prototype.setTransform = function (a, b, c, d, tx, ty)
 {
     var matrix = this.matrix;

v3/src/input/components/GetTransformedPoint.js

@@ -11,18 +11,28 @@ var GetTransformedPoint = function (matrix, gameObject, x, y, output)
     if (output === undefined) { output = { x: 0, y: 0 }; }
 
     matrix.applyITRS(gameObject.x, gameObject.y, gameObject.rotation, gameObject.scaleX, gameObject.scaleY);
+    matrix.invert();
+    matrix.transformPoint(x, y, output);
 
-    var a = matrix.matrix[0];
-    var b = matrix.matrix[1];
-    var c = matrix.matrix[2];
-    var d = matrix.matrix[3];
-    var tx = matrix.matrix[4];
-    var ty = matrix.matrix[5];
+    // var a = matrix.matrix[0];
+    // var b = matrix.matrix[1];
+    // var c = matrix.matrix[2];
+    // var d = matrix.matrix[3];
+    // var tx = matrix.matrix[4];
+    // var ty = matrix.matrix[5];
 
-    var id = 1 / (a * d + c * -b);
+    //  Apply inverse of the matrix
 
-    output.x = d * id * x + -c * id * y + (ty * c - tx * d) * id;
-    output.y = a * id * y + -b * id * x + (-ty * a + tx * b) * id;
+    // var id = 1 / ((a * d) + (c * -b));
+
+    // output.x = (d * id * x) + (-c * id * y) + (((ty * c) - (tx * d)) * id);
+    // output.y = (a * id * y) + (-b * id * x) + (((-ty * a) + (tx * b)) * id);
+
+    // x -= tx;
+    // y -= ty;
+
+    // output.x = (a * x) + (c * y) + tx;
+    // output.y = (b * x) + (d * y) + ty;
 
     return output;
 };

v3/src/input/components/PointWithinGameObject.js

@@ -3,12 +3,24 @@
 
 var PointWithinGameObject = function (gameObject, x, y)
 {
-    var width = gameObject.width;
-    var height = gameObject.height;
-    var x1 = -width * gameObject.originX;
-    var y1 = -height * gameObject.originY;
+    // var width = gameObject.width;
+    // var height = gameObject.height;
+    // var x1 = -width * gameObject.originX;
+
+    // if (x >= x1 && x < x1 + width)
+    // {
+    //     var y1 = -height * gameObject.originY;
+
+    //     if (y >= y1 && y < y1 + height)
+    //     {
+    //         return true;
+    //     }
+    // }
+
+    // return false;
+
+    return (x >= gameObject.x && x <= gameObject.x+gameObject.width && y >= gameObject.y && y <= gameObject.y+gameObject.height);
 
-    return (x >= x1 && x < x1 + width && y >= y1 && y < y1 + height);
 };
 
 module.exports = PointWithinGameObject;