Skip to content

Commit 0ee9339

Browse files
committed
CollideObjects now handles the total setting and returning.
1 parent 916e59c commit 0ee9339

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

v3/src/physics/arcade/inc/Collide.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ var Collide = function (object1, object2, collideCallback, processCallback, call
44
if (processCallback === undefined) { processCallback = null; }
55
if (callbackContext === undefined) { callbackContext = collideCallback; }
66

7-
this._total = 0;
8-
9-
this.collideObjects(object1, object2, collideCallback, processCallback, callbackContext, false);
10-
11-
return (this._total > 0);
7+
return this.collideObjects(object1, object2, collideCallback, processCallback, callbackContext, false);
128
};
139

1410
module.exports = Collide;

v3/src/physics/arcade/inc/CollideObjects.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ var CollideObjects = function (object1, object2, collideCallback, processCallbac
44
var object1isArray = Array.isArray(object1);
55
var object2isArray = Array.isArray(object2);
66

7+
this._total = 0;
8+
79
if (!object1isArray && !object2isArray)
810
{
911
// Neither of them are arrays - do this first as it's the most common use-case
@@ -36,6 +38,8 @@ var CollideObjects = function (object1, object2, collideCallback, processCallbac
3638
}
3739
}
3840
}
41+
42+
return (this._total > 0);
3943
};
4044

4145
module.exports = CollideObjects;

v3/src/physics/arcade/inc/Overlap.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ var Overlap = function (object1, object2, overlapCallback, processCallback, call
44
if (processCallback === undefined) { processCallback = null; }
55
if (callbackContext === undefined) { callbackContext = overlapCallback; }
66

7-
this._total = 0;
8-
9-
this.collideObjects(object1, object2, overlapCallback, processCallback, callbackContext, true);
10-
11-
return (this._total > 0);
7+
return this.collideObjects(object1, object2, overlapCallback, processCallback, callbackContext, true);
128
};
139

1410
module.exports = Overlap;

0 commit comments

Comments
 (0)