Preparing to normalize game object data

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '8c3fb080-70c2-11e7-b128-81fb6f2e39f6'
+build: 'be8a33d0-70d6-11e7-afe6-e9365652ea53'
 };
 module.exports = CHECKSUM;

v3/src/input/local/SceneInputManager.js

@@ -42,8 +42,11 @@ var SceneInputManager = new Class({
         //  Internal counter
         this._pollTimer = 0;
 
+        //  Used to temporarily store the results of the Hit Test
+        this._temp = [];
+
         //  An object containing the various lists of Interactive Objects
-        //  list: A list of all Interactive Objects
+        //  list: A list of all Interactive Game Objects
         //  pendingInsertion: Objects waiting to be inserted to the list on the next call to 'begin'
         //  pendingRemoval: Objects waiting to be removed from the list on the next call to 'begin'
         //  draggable: A list of all Interactive Objects that are set to be draggable (a subset of list)

v3/src/input/local/components/HitTestPointer.js

@@ -1,6 +1,6 @@
-var HitTestPointer = function (pointer)
+var HitTestPointer = function (pointer, output)
 {
-    var output = [];
+    output.length = 0;
 
     //  Get a list of all objects that can be seen by all the cameras in the scene and store in 'output' array.
     //  All objects in this array are input enabled, as checked by the hitTest function, so we don't need to check later on as well.

v3/src/input/local/components/ProcessDownEvents.js

@@ -1,8 +1,10 @@
 var InputEvent = require('../events');
 
-var ProcessDownEvents = function (pointer, currentlyOver)
+var ProcessDownEvents = function (pointer)
 {
-    this.events.dispatch(new InputEvent.POINTER_DOWN(pointer, currentlyOver));
+    var currentlyOver = this._tempIO;
+
+    this.events.dispatch(new InputEvent.POINTER_DOWN(pointer, this._tempGO));
 
     //  Go through all objects the pointer was over and fire their events / callbacks
     for (var i = 0; i < currentlyOver.length; i++)

v3/src/input/local/components/ProcessMoveEvents.js

@@ -1,8 +1,10 @@
 var InputEvent = require('../events');
 
-var ProcessMoveEvents = function (pointer, currentlyOver)
+var ProcessMoveEvents = function (pointer)
 {
-    this.events.dispatch(new InputEvent.POINTER_MOVE(pointer, currentlyOver));
+    var currentlyOver = this._tempIO;
+
+    this.events.dispatch(new InputEvent.POINTER_MOVE(pointer, this._tempGO));
 
     //  Go through all objects the pointer was over and fire their events / callbacks
     for (var i = 0; i < currentlyOver.length; i++)
@@ -14,7 +16,6 @@ var ProcessMoveEvents = function (pointer, currentlyOver)
         interactiveObject.onMove(interactiveObject.gameObject, pointer, interactiveObject.localX, interactiveObject.localY);
     }
 
-
     /*
     var i;
     var interactiveObject;

v3/src/input/local/components/ProcessOverOutEvents.js

@@ -1,7 +1,9 @@
 var InputEvent = require('../events');
 
-var ProcessOverOutEvents = function (pointer, currentlyOver)
+var ProcessOverOutEvents = function (pointer)
 {
+    var currentlyOver = this._tempIO;
+
     var justOut = [];
     var justOver = [];
     var stillOver = [];

v3/src/input/local/components/ProcessUpEvents.js

@@ -1,8 +1,10 @@
 var InputEvent = require('../events');
 
-var ProcessUpEvents = function (pointer, currentlyOver)
+var ProcessUpEvents = function (pointer)
 {
-    this.events.dispatch(new InputEvent.POINTER_UP(pointer, currentlyOver));
+    var currentlyOver = this._tempIO;
+
+    this.events.dispatch(new InputEvent.POINTER_UP(pointer, this._tempGO));
 
     //  Go through all objects the pointer was over and fire their events / callbacks
     for (var i = 0; i < currentlyOver.length; i++)

v3/src/input/local/components/Update.js

@@ -19,32 +19,40 @@ var Update = function (time, delta)
 
     if (runUpdate)
     {
-        var results = this.hitTestPointer(pointer);
+        this.hitTestPointer(pointer, this._tempIO);
 
-        if (this.topOnly && results.length > 0)
+        this.sortInteractiveObjects(this._tempIO);
+
+        if (this.topOnly && this._tempIO.length > 1)
         {
-            this.sortInteractiveObjects(results);
+            this._tempIO = this._tempIO.splice(1);
+        }
 
-            var top = results[0];
+        this._tempGO.length = 0;
 
-            results = [ top ];
+        for (var i = 0; i < this._tempIO.length; i++)
+        {
+            this._tempGO.push(this._tempIO[i].gameObject);
         }
 
-        this.processOverOutEvents(pointer, results);
+        //  tempIO and tempGO now contain the sorted lists of InteractiveObjects
+        //  and their corresponding GameObjects
+
+        this.processOverOutEvents(pointer);
 
         if (pointer.justUp)
         {
-            this.processUpEvents(pointer, results);
+            this.processUpEvents(pointer);
         }
 
         if (pointer.justDown)
         {
-            this.processDownEvents(pointer, results);
+            this.processDownEvents(pointer);
         }
 
         if (pointer.justMoved)
         {
-            this.processMoveEvents(pointer, results);
+            this.processMoveEvents(pointer);
         }
     }
 };

v3/src/input/local/events/PointerDownEvent.js

@@ -31,7 +31,7 @@ var PointerDownEvent = new Class({
         this.list = gameObjects;
 
         //  A reference to the top-most object on the display list (same as event.list[0])
-        this.gameObject = gameObjects[0];
+        this.gameObject = (gameObjects.length > 0) ? gameObjects[gameObjects.length - 1].gameObject : undefined;
     }
 
 });

v3/src/input/local/events/PointerOutEvent.js

@@ -7,7 +7,7 @@ var PointerOutEvent = new Class({
 
     initialize:
 
-    function PointerOutEvent (pointer, gameObjects)
+    function PointerOutEvent (pointer, interactiveObjects)
     {
         Event.call(this, 'POINTER_OUT_EVENT');
 
@@ -25,10 +25,15 @@ var PointerOutEvent = new Class({
         //  Will be undefined if no objects were interacted with.
         //  If populated, the bottom element (list[0]) is the highest object on the display list.
         //  If InputManager.topOnly is true this array will only contain one element.
-        this.list = gameObjects;
+        this.list = [];
+
+        for (var i = 0; i < interactiveObjects.length; i++)
+        {
+            this.list.push(interactiveObjects[i].gameObject);
+        }
 
         //  A reference to the top-most object on the display list (also this.list[0])
-        this.gameObject = gameObjects[0];
+        this.gameObject = this.list[0];
     }
 
 });