foster/liabru-matter-js
0
0
Fork 0
mirror of https://github.com/liabru/matter-js.git synced 2025-01-21 17:14:38 -05:00
Code Issues Wiki Activity

fix collision end event for sleeping bodies

Browse source
This commit is contained in:
liabru 2022-01-13 11:08:14 +00:00
parent 0eeceb514d
commit 98509fd4dd
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/body/Composite.js
View file

@ -246,6 +246,10 @@ var Body = require('./Body');
var position = Common.indexOf(composite.bodies, body);
if (position !== -1) {
Composite.removeBodyAt(composite, position);
// remove sleeping to allow pair removal
body.isSleeping = false;
body.sleepCounter = 0;
}
if (deep) {

25
src/collision/Pairs.js
View file

@ -45,6 +45,8 @@ var Common = require('../core/Common');
collisionEnd = pairs.collisionEnd,
collisionActive = pairs.collisionActive,
collision,
bodyA,
bodyB,
pairIndex,
pair,
i;
@ -92,15 +94,24 @@ var Common = require('../core/Common');
for (i = 0; i < pairsListLength; i++) {
pair = pairsList[i];
if (!pair.confirmedActive) {
Pair.setActive(pair, false, timestamp);
if (!pair.collision.bodyA.isSleeping && !pair.collision.bodyB.isSleeping) {
collisionEnd.push(pair);
removePairIndex.push(i);
}
// keep pair if it had a collision this update
if (pair.confirmedActive) {
continue;
}
bodyA = pair.collision.bodyA;
bodyB = pair.collision.bodyB;
// keep pair if it is sleeping but not both static
if ((bodyA.isSleeping || bodyA.isStatic) && (bodyB.isSleeping || bodyB.isStatic)
&& !(bodyA.isStatic && bodyB.isStatic)) {
continue;
}
Pair.setActive(pair, false, timestamp);
collisionEnd.push(pair);
removePairIndex.push(i);
}
// remove inactive pairs