Skip to content

Commit

Permalink
fix: trigger event update (#673)
Browse files Browse the repository at this point in the history
* fix: trigger event update
  • Loading branch information
yangfengzzz authored Mar 3, 2022
1 parent 953995e commit bec1c8d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
11 changes: 9 additions & 2 deletions packages/physics-lite/src/LitePhysicsManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,14 @@ export class LitePhysicsManager implements IPhysicsManager {
}

private _getTrigger(index1: number, index2: number): TriggerEvent {
const event = this._eventPool.length ? this._eventPool.pop() : new TriggerEvent(index1, index2);
let event: TriggerEvent;
if (this._eventPool.length) {
event = this._eventPool.pop();
event.index1 = index1;
event.index2 = index2;
} else {
event = new TriggerEvent(index1, index2);
}
this._eventMap[index1][index2] = event;
return event;
}
Expand Down Expand Up @@ -237,7 +244,7 @@ export class LitePhysicsManager implements IPhysicsManager {

private _fireEvent(): void {
const { _eventPool: eventPool, _currentEvents: currentEvents } = this;
for (let i = 0, n = currentEvents.length; i < n; ) {
for (let i = 0, n = currentEvents.length; i < n;) {
const event = currentEvents.get(i);
if (!event.needUpdate) {
if (event.state == TriggerEventState.Enter) {
Expand Down
9 changes: 8 additions & 1 deletion packages/physics-physx/src/PhysXPhysicsManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,14 @@ export class PhysXPhysicsManager implements IPhysicsManager {
}

private _getTrigger(index1: number, index2: number): TriggerEvent {
const event = this._eventPool.length ? this._eventPool.pop() : new TriggerEvent(index1, index2);
let event: TriggerEvent;
if (this._eventPool.length) {
event = this._eventPool.pop();
event.index1 = index1;
event.index2 = index2;
} else {
event = new TriggerEvent(index1, index2);
}
this._eventMap[index1][index2] = event;
return event;
}
Expand Down

0 comments on commit bec1c8d

Please sign in to comment.