mirror of
https://github.com/liabru/matter-js.git
synced 2024-12-25 13:39:06 -05:00
added local pairs functions in Pairs.update
This commit is contained in:
parent
72bc203c27
commit
e9da32c886
2 changed files with 10 additions and 7 deletions
|
@ -75,7 +75,7 @@ var Contact = require('./Contact');
|
||||||
collision.pair = pair;
|
collision.pair = pair;
|
||||||
|
|
||||||
var support = supports[0],
|
var support = supports[0],
|
||||||
contact = contacts[0];
|
contact = contacts[0];
|
||||||
|
|
||||||
// reset first contact if support changed
|
// reset first contact if support changed
|
||||||
if (contact.vertex !== support) {
|
if (contact.vertex !== support) {
|
||||||
|
|
|
@ -37,14 +37,17 @@ var Common = require('../core/Common');
|
||||||
* @param {number} timestamp
|
* @param {number} timestamp
|
||||||
*/
|
*/
|
||||||
Pairs.update = function(pairs, collisions, timestamp) {
|
Pairs.update = function(pairs, collisions, timestamp) {
|
||||||
var pairsList = pairs.list,
|
var pairUpdate = Pair.update,
|
||||||
|
pairCreate = Pair.create,
|
||||||
|
pairSetActive = Pair.setActive,
|
||||||
|
pairsTable = pairs.table,
|
||||||
|
pairsList = pairs.list,
|
||||||
pairsListLength = pairsList.length,
|
pairsListLength = pairsList.length,
|
||||||
pairsListIndex = pairsListLength,
|
pairsListIndex = pairsListLength,
|
||||||
pairsTable = pairs.table,
|
|
||||||
collisionsLength = collisions.length,
|
|
||||||
collisionStart = pairs.collisionStart,
|
collisionStart = pairs.collisionStart,
|
||||||
collisionEnd = pairs.collisionEnd,
|
collisionEnd = pairs.collisionEnd,
|
||||||
collisionActive = pairs.collisionActive,
|
collisionActive = pairs.collisionActive,
|
||||||
|
collisionsLength = collisions.length,
|
||||||
collisionStartIndex = 0,
|
collisionStartIndex = 0,
|
||||||
collisionEndIndex = 0,
|
collisionEndIndex = 0,
|
||||||
collisionActiveIndex = 0,
|
collisionActiveIndex = 0,
|
||||||
|
@ -67,10 +70,10 @@ var Common = require('../core/Common');
|
||||||
}
|
}
|
||||||
|
|
||||||
// update the pair
|
// update the pair
|
||||||
Pair.update(pair, collision, timestamp);
|
pairUpdate(pair, collision, timestamp);
|
||||||
} else {
|
} else {
|
||||||
// pair did not exist, create a new pair
|
// pair did not exist, create a new pair
|
||||||
pair = Pair.create(collision, timestamp);
|
pair = pairCreate(collision, timestamp);
|
||||||
pairsTable[pair.id] = pair;
|
pairsTable[pair.id] = pair;
|
||||||
|
|
||||||
// add the new pair
|
// add the new pair
|
||||||
|
@ -87,7 +90,7 @@ var Common = require('../core/Common');
|
||||||
pair = pairsList[i];
|
pair = pairsList[i];
|
||||||
|
|
||||||
if (pair.timeUpdated < timestamp) {
|
if (pair.timeUpdated < timestamp) {
|
||||||
Pair.setActive(pair, false, timestamp);
|
pairSetActive(pair, false, timestamp);
|
||||||
collisionEnd[collisionEndIndex++] = pair;
|
collisionEnd[collisionEndIndex++] = pair;
|
||||||
|
|
||||||
// remove inactive pairs
|
// remove inactive pairs
|
||||||
|
|
Loading…
Reference in a new issue