foster/matter-js
0
0
Fork 0
mirror of https://github.com/liabru/matter-js.git synced 2025-03-14 00:38:41 -04:00
Code Issues Wiki Activity

Merge 04fd881a7c into 06655ff2c7

Browse source
This commit is contained in:
Gilbert Röhrbein 2018-01-14 15:48:21 +00:00 • committed by GitHub
commit 85cf0878bf
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.eslintrc
View file

@ -17,7 +17,8 @@
"node": true,
"browser": true,
"jquery": true,
"amd": true
"amd": true,
"es6": true
},
"globals": {
"Matter": false,

6
src/collision/Pairs.js
View file

@ -44,7 +44,7 @@ var Common = require('../core/Common');
collisionStart = pairs.collisionStart,
collisionEnd = pairs.collisionEnd,
collisionActive = pairs.collisionActive,
activePairIds = [],
activePairIds = new Set(),
collision,
pairId,
pair,
@ -60,7 +60,7 @@ var Common = require('../core/Common');
if (collision.collided) {
pairId = Pair.id(collision.bodyA, collision.bodyB);
activePairIds.push(pairId);
activePairIds.add(pairId);
pair = pairsTable[pairId];
@ -91,7 +91,7 @@ var Common = require('../core/Common');
// deactivate previously active pairs that are now inactive
for (i = 0; i < pairsList.length; i++) {
pair = pairsList[i];
if (pair.isActive && Common.indexOf(activePairIds, pair.id) === -1) {
if (pair.isActive && !activePairIds.has(pair.id)) {
Pair.setActive(pair, false, timestamp);
collisionEnd.push(pair);
}