Skip to content

Commit 102fa3e

Browse files
committed
Movement event now checks draggable.
1 parent 46ece8b commit 102fa3e

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ var InputEvent = require('../events');
22

33
var ProcessMoveEvents = function (pointer, currentlyOver)
44
{
5+
var i;
6+
var interactiveObject;
7+
58
if (currentlyOver.length === 0)
69
{
710
// Dispatch MOVE event, even though pointer isn't over anything
@@ -10,9 +13,9 @@ var ProcessMoveEvents = function (pointer, currentlyOver)
1013
else
1114
{
1215
// Go through all objects the pointer is over and dispatch them
13-
for (var i = 0; i < currentlyOver.length; i++)
16+
for (i = 0; i < currentlyOver.length; i++)
1417
{
15-
var interactiveObject = currentlyOver[i];
18+
interactiveObject = currentlyOver[i];
1619

1720
this.events.dispatch(new InputEvent.MOVE(pointer, interactiveObject.gameObject, currentlyOver));
1821

@@ -26,10 +29,9 @@ var ProcessMoveEvents = function (pointer, currentlyOver)
2629
}
2730

2831
// Check the list of Draggable Items
29-
/*
30-
for (var i = 0; i < this.children.draggable.length; i++)
32+
for (i = 0; i < this.children.draggable.length; i++)
3133
{
32-
var interactiveObject = this.children.draggable[i];
34+
interactiveObject = this.children.draggable[i];
3335

3436
if (!interactiveObject.enabled)
3537
{
@@ -39,16 +41,14 @@ var ProcessMoveEvents = function (pointer, currentlyOver)
3941
if (pointer.justUp && interactiveObject.isDragged)
4042
{
4143
// Drag End
42-
this.childOnDragEnd(i, pointer, interactiveObject);
44+
this.childOnDragEnd(pointer, interactiveObject, currentlyOver);
4345
}
4446
else if (interactiveObject.isDragged)
4547
{
4648
// Drag
47-
this.childOnDrag(i, pointer, interactiveObject);
49+
this.childOnDrag(pointer, interactiveObject, currentlyOver);
4850
}
4951
}
50-
*/
51-
5252
};
5353

5454
module.exports = ProcessMoveEvents;

0 commit comments

Comments
 (0)