Tidying up the global input manager.

Author: photonstorm

v3/src/input/global/GlobalInputManager.js

@@ -3,16 +3,12 @@
 var Class = require('../../utils/Class');
 var EventDispatcher = require('../../events/EventDispatcher');
 var Gamepad = require('../gamepad/GamepadManager');
-var GetTransformedPoint = require('./inc/GetTransformedPoint');
 var HitTest = require('./inc/HitTest');
 var Keyboard = require('../keyboard/KeyboardManager');
 var Mouse = require('../mouse/MouseManager');
 var MouseEvent = require('../mouse/events/');
 var Pointer = require('../Pointer');
-var PointScreenToWorldHitTest = require('./inc/PointScreenToWorldHitTest');
-var PointWithinGameObject = require('./inc/PointWithinGameObject');
 var Touch = require('../touch/TouchManager');
-var TransformMatrix = require('../../gameobjects/components/TransformMatrix');
 
 var GlobalInputManager = new Class({
 
@@ -45,7 +41,7 @@ var GlobalInputManager = new Class({
 
         this.bounds;
 
-        this._tempMatrix = new TransformMatrix();
+        // this._tempMatrix = new TransformMatrix();
         this._tempPoint = { x: 0, y: 0 };
         this._tempHitTest = [];
     },
@@ -159,26 +155,12 @@ var GlobalInputManager = new Class({
         }
     },
 
-    getTransformedPoint: function (gameObject, x, y)
-    {
-        return GetTransformedPoint(this._tempMatrix, gameObject, x, y, this._tempPoint);
-    },
-
-    pointWithinGameObject: function (gameObject, x, y)
-    {
-        return PointWithinGameObject(gameObject, x, y);
-    },
-
     hitTest: function (gameObjects, x, y, camera)
     {
-        return HitTest(this._tempMatrix, x, y, gameObjects, camera, this._tempHitTest);
-    },
-
-    pointScreenToWorldHitTest: function (gameObjects, x, y, camera)
-    {
-        return PointScreenToWorldHitTest(this._tempMatrix, x, y, gameObjects, camera, this._tempHitTest);
+        return HitTest(this._tempPoint, x, y, gameObjects, camera, this._tempHitTest);
     },
 
+    //  Called by Pointer class
     transformX: function (pageX)
     {
         return (pageX - this.bounds.left) * this.scale.x;

v3/src/input/global/inc/GetTransformedPoint.js

@@ -1,15 +1,10 @@
 //  x/y MUST be translated before being passed to this function,
 //  unless the gameObject is guaranteed to not be rotated or scaled in any way
 
-var PointWithinHitArea = function (gameObject, x, y, camera)
+var PointWithinHitArea = function (gameObject, x, y)
 {
     var input = gameObject.input;
 
-    // if (!input)
-    // {
-    //     return false;
-    // }
-
     //  Normalize the origin
     x += gameObject.displayOriginX;
     y += gameObject.displayOriginY;

v3/src/input/global/inc/PointScreenToWorldHitTest.js

@@ -1,4 +1,4 @@
-//  x/y MUST be translated before being passed to this function, unless the gameObject is guarnateed to
+//  x/y MUST be translated before being passed to this function, unless the gameObject is guaranteed to
 //  be not rotated or scaled in any way
 
 var PointWithinInteractiveObject = function (object, x, y)

v3/src/input/global/inc/PointWithinGameObject.js

@@ -1,3 +1,5 @@
+//  Called from SceneInputManager.update
+
 var HitTestPointer = function (pointer)
 {
     var camera = this.cameras.getCameraBelowPointer(pointer);

v3/src/input/global/inc/PointWithinHitArea.js

@@ -17,36 +17,38 @@ var Update = function (time, delta)
         }
     }
 
-    if (runUpdate)
+    if (!runUpdate)
     {
-        this._temp = this.hitTestPointer(pointer);
+        return;
+    }
 
-        this.sortGameObjects(this._temp);
+    this._temp = this.hitTestPointer(pointer);
 
-        if (this.topOnly && this._temp.length)
-        {
-            //  Only the top-most one counts now, so safely ignore the rest
-            this._temp.splice(1);
-        }
+    this.sortGameObjects(this._temp);
 
-        this.processDragEvents(pointer, time);
+    if (this.topOnly && this._temp.length)
+    {
+        //  Only the top-most one counts now, so safely ignore the rest
+        this._temp.splice(1);
+    }
 
-        this.processOverOutEvents(pointer);
+    this.processDragEvents(pointer, time);
 
-        if (pointer.justDown)
-        {
-            this.processDownEvents(pointer);
-        }
+    this.processOverOutEvents(pointer);
 
-        if (pointer.justUp)
-        {
-            this.processUpEvents(pointer);
-        }
+    if (pointer.justDown)
+    {
+        this.processDownEvents(pointer);
+    }
 
-        if (pointer.justMoved)
-        {
-            this.processMoveEvents(pointer);
-        }
+    if (pointer.justUp)
+    {
+        this.processUpEvents(pointer);
+    }
+
+    if (pointer.justMoved)
+    {
+        this.processMoveEvents(pointer);
     }
 };