CocosPlugin/esengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 triggerlistener 发生碰撞后不断触发问题（仅第一次碰撞触发）

Browse Source
This commit is contained in:
YHH
2020-06-18 09:06:59 +08:00
parent 18279d16cd
commit bc995e36c2
11 changed files with 119 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demo/libs/framework/framework.d.ts vendored
View File

@@ -782,7 +782,6 @@ declare class NumberDictionary {
add(x: number, y: number, list: Collider[]): void;
remove(obj: Collider): void;
tryGetValue(x: number, y: number): Collider[];
getAllObjects(): Collider[];
clear(): void;
}
declare class Emitter<T> {

70
demo/libs/framework/framework.js
View File

@@ -2401,7 +2401,8 @@ var EntityList = (function () {
configurable: true
});
EntityList.prototype.add = function (entity) {
this._entitiesToAdded.push(entity);
if (this._entitiesToAdded.indexOf(entity) == -1)
this._entitiesToAdded.push(entity);
};
EntityList.prototype.remove = function (entity) {
if (this._entitiesToAdded.contains(entity)) {
@@ -2473,9 +2474,11 @@ var EntityList = (function () {
this._entitiesToAdded = this._tempEntityList;
this._tempEntityList = temp;
this._tempEntityList.forEach(function (entity) {
_this._entities.push(entity);
entity.scene = _this.scene;
_this.scene.entityProcessors.onEntityAdded(entity);
if (!_this._entities.contains(entity)) {
_this._entities.push(entity);
entity.scene = _this.scene;
_this.scene.entityProcessors.onEntityAdded(entity);
}
});
this._tempEntityList.forEach(function (entity) { return entity.onAddedToScene(); });
this._tempEntityList.length = 0;
@@ -3084,17 +3087,26 @@ var ColliderTriggerHelper = (function () {
for (var i = 0; i < colliders.length; i++) {
var collider = colliders[i];
var neighbors = Physics.boxcastBroadphase(collider.bounds, collider.collidesWithLayers);
for (var j = 0; j < neighbors.length; j++) {
var _loop_5 = function (j) {
var neighbor = neighbors[j];
if (!collider.isTrigger && !neighbor.isTrigger)
continue;
return "continue";
if (collider.overlaps(neighbor)) {
var pair = new Pair(collider, neighbor);
var shouldReportTriggerEvent = !this._activeTriggerIntersections.contains(pair) && !this._previousTriggerIntersections.contains(pair);
var pair_1 = new Pair(collider, neighbor);
var shouldReportTriggerEvent = this_1._activeTriggerIntersections.findIndex(function (value) {
return value.first == pair_1.first && value.second == pair_1.second;
}) == -1 && this_1._previousTriggerIntersections.findIndex(function (value) {
return value.first == pair_1.first && value.second == pair_1.second;
}) == -1;
if (shouldReportTriggerEvent)
this.notifyTriggerListeners(pair, true);
this._activeTriggerIntersections.push(pair);
this_1.notifyTriggerListeners(pair_1, true);
if (!this_1._activeTriggerIntersections.contains(pair_1))
this_1._activeTriggerIntersections.push(pair_1);
}
};
var this_1 = this;
for (var j = 0; j < neighbors.length; j++) {
_loop_5(j);
}
}
ListPool.free(colliders);
@@ -3102,22 +3114,27 @@ var ColliderTriggerHelper = (function () {
};
ColliderTriggerHelper.prototype.checkForExitedColliders = function () {
var _this = this;
var tempIntersections = [];
this._previousTriggerIntersections = this._previousTriggerIntersections.filter(function (value) {
for (var i = 0; i < _this._activeTriggerIntersections.length; i++) {
if (value == _this._activeTriggerIntersections[i]) {
tempIntersections.push(value);
var _loop_6 = function (i) {
var index = this_2._previousTriggerIntersections.findIndex(function (value) {
if (value.first == _this._activeTriggerIntersections[i].first && value.second == _this._activeTriggerIntersections[i].second)
return true;
}
}
return false;
});
return false;
});
if (index != -1)
this_2._previousTriggerIntersections.removeAt(index);
};
var this_2 = this;
for (var i = 0; i < this._activeTriggerIntersections.length; i++) {
_loop_6(i);
}
for (var i = 0; i < this._previousTriggerIntersections.length; i++) {
this.notifyTriggerListeners(this._previousTriggerIntersections[i], false);
}
this._previousTriggerIntersections.length = 0;
for (var i = 0; i < tempIntersections.length; i++) {
this._previousTriggerIntersections.push(tempIntersections[i]);
for (var i = 0; i < this._activeTriggerIntersections.length; i++) {
if (!this._previousTriggerIntersections.contains(this._activeTriggerIntersections[i])) {
this._previousTriggerIntersections.push(this._activeTriggerIntersections[i]);
}
}
this._activeTriggerIntersections.length = 0;
};
@@ -3814,8 +3831,10 @@ var SpatialHash = (function () {
var collider = cell[i];
if (collider == excludeCollider || !Flags.isFlagSet(layerMask, collider.physicsLayer))
continue;
if (bounds.intersects(collider.bounds))
this._tempHashSet.push(collider);
if (bounds.intersects(collider.bounds)) {
if (this._tempHashSet.indexOf(collider) == -1)
this._tempHashSet.push(collider);
}
}
}
}
@@ -3867,11 +3886,6 @@ var NumberDictionary = (function () {
NumberDictionary.prototype.tryGetValue = function (x, y) {
return this._store.get(this.getKey(x, y));
};
NumberDictionary.prototype.getAllObjects = function () {
var set = [];
this._store.forEach(function (list) { return set.concat(list); });
return set;
};
NumberDictionary.prototype.clear = function () {
this._store.clear();
};

2
demo/libs/framework/framework.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
demo/src/Main.ts
View File

@@ -117,7 +117,7 @@ class Main extends eui.UILayer {
player.addComponent(new Mover());
let player2 = scene.createEntity("player2");
player2.addComponent(new BoxCollider()).setSize(100, 100);
player2.addComponent(new BoxCollider()).setSize(99, 99);
// Main.emitter.addObserver(CoreEmitterType.Update, ()=>{
// console.log("update emitter");

2
demo/src/game/SpawnerComponent.ts
View File

@@ -20,6 +20,8 @@ class SpawnComponent extends Component implements ITriggerListener {
}
public onTriggerEnter(other: Collider, local: Collider){
if (other == local)
console.log("repeat collider")
console.log("enter collider");
}

1
source/bin/framework.d.ts vendored
View File

@@ -782,7 +782,6 @@ declare class NumberDictionary {
add(x: number, y: number, list: Collider[]): void;
remove(obj: Collider): void;
tryGetValue(x: number, y: number): Collider[];
getAllObjects(): Collider[];
clear(): void;
}
declare class Emitter<T> {

70
source/bin/framework.js
View File

@@ -2401,7 +2401,8 @@ var EntityList = (function () {
configurable: true
});
EntityList.prototype.add = function (entity) {
this._entitiesToAdded.push(entity);
if (this._entitiesToAdded.indexOf(entity) == -1)
this._entitiesToAdded.push(entity);
};
EntityList.prototype.remove = function (entity) {
if (this._entitiesToAdded.contains(entity)) {
@@ -2473,9 +2474,11 @@ var EntityList = (function () {
this._entitiesToAdded = this._tempEntityList;
this._tempEntityList = temp;
this._tempEntityList.forEach(function (entity) {
_this._entities.push(entity);
entity.scene = _this.scene;
_this.scene.entityProcessors.onEntityAdded(entity);
if (!_this._entities.contains(entity)) {
_this._entities.push(entity);
entity.scene = _this.scene;
_this.scene.entityProcessors.onEntityAdded(entity);
}
});
this._tempEntityList.forEach(function (entity) { return entity.onAddedToScene(); });
this._tempEntityList.length = 0;
@@ -3084,17 +3087,26 @@ var ColliderTriggerHelper = (function () {
for (var i = 0; i < colliders.length; i++) {
var collider = colliders[i];
var neighbors = Physics.boxcastBroadphase(collider.bounds, collider.collidesWithLayers);
for (var j = 0; j < neighbors.length; j++) {
var _loop_5 = function (j) {
var neighbor = neighbors[j];
if (!collider.isTrigger && !neighbor.isTrigger)
continue;
return "continue";
if (collider.overlaps(neighbor)) {
var pair = new Pair(collider, neighbor);
var shouldReportTriggerEvent = !this._activeTriggerIntersections.contains(pair) && !this._previousTriggerIntersections.contains(pair);
var pair_1 = new Pair(collider, neighbor);
var shouldReportTriggerEvent = this_1._activeTriggerIntersections.findIndex(function (value) {
return value.first == pair_1.first && value.second == pair_1.second;
}) == -1 && this_1._previousTriggerIntersections.findIndex(function (value) {
return value.first == pair_1.first && value.second == pair_1.second;
}) == -1;
if (shouldReportTriggerEvent)
this.notifyTriggerListeners(pair, true);
this._activeTriggerIntersections.push(pair);
this_1.notifyTriggerListeners(pair_1, true);
if (!this_1._activeTriggerIntersections.contains(pair_1))
this_1._activeTriggerIntersections.push(pair_1);
}
};
var this_1 = this;
for (var j = 0; j < neighbors.length; j++) {
_loop_5(j);
}
}
ListPool.free(colliders);
@@ -3102,22 +3114,27 @@ var ColliderTriggerHelper = (function () {
};
ColliderTriggerHelper.prototype.checkForExitedColliders = function () {
var _this = this;
var tempIntersections = [];
this._previousTriggerIntersections = this._previousTriggerIntersections.filter(function (value) {
for (var i = 0; i < _this._activeTriggerIntersections.length; i++) {
if (value == _this._activeTriggerIntersections[i]) {
tempIntersections.push(value);
var _loop_6 = function (i) {
var index = this_2._previousTriggerIntersections.findIndex(function (value) {
if (value.first == _this._activeTriggerIntersections[i].first && value.second == _this._activeTriggerIntersections[i].second)
return true;
}
}
return false;
});
return false;
});
if (index != -1)
this_2._previousTriggerIntersections.removeAt(index);
};
var this_2 = this;
for (var i = 0; i < this._activeTriggerIntersections.length; i++) {
_loop_6(i);
}
for (var i = 0; i < this._previousTriggerIntersections.length; i++) {
this.notifyTriggerListeners(this._previousTriggerIntersections[i], false);
}
this._previousTriggerIntersections.length = 0;
for (var i = 0; i < tempIntersections.length; i++) {
this._previousTriggerIntersections.push(tempIntersections[i]);
for (var i = 0; i < this._activeTriggerIntersections.length; i++) {
if (!this._previousTriggerIntersections.contains(this._activeTriggerIntersections[i])) {
this._previousTriggerIntersections.push(this._activeTriggerIntersections[i]);
}
}
this._activeTriggerIntersections.length = 0;
};
@@ -3814,8 +3831,10 @@ var SpatialHash = (function () {
var collider = cell[i];
if (collider == excludeCollider || !Flags.isFlagSet(layerMask, collider.physicsLayer))
continue;
if (bounds.intersects(collider.bounds))
this._tempHashSet.push(collider);
if (bounds.intersects(collider.bounds)) {
if (this._tempHashSet.indexOf(collider) == -1)
this._tempHashSet.push(collider);
}
}
}
}
@@ -3867,11 +3886,6 @@ var NumberDictionary = (function () {
NumberDictionary.prototype.tryGetValue = function (x, y) {
return this._store.get(this.getKey(x, y));
};
NumberDictionary.prototype.getAllObjects = function () {
var set = [];
this._store.forEach(function (list) { return set.concat(list); });
return set;
};
NumberDictionary.prototype.clear = function () {
this._store.clear();
};

2
source/bin/framework.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
source/src/ECS/Utils/EntityList.ts
View File

@@ -20,7 +20,8 @@ class EntityList{
}
public add(entity: Entity){
this._entitiesToAdded.push(entity);
if (this._entitiesToAdded.indexOf(entity) == -1)
this._entitiesToAdded.push(entity);
}
public remove(entity: Entity){
@@ -108,10 +109,12 @@ class EntityList{
this._entitiesToAdded = this._tempEntityList;
this._tempEntityList = temp;
this._tempEntityList.forEach(entity => {
this._entities.push(entity);
entity.scene = this.scene;
if (!this._entities.contains(entity)){
this._entities.push(entity);
entity.scene = this.scene;
this.scene.entityProcessors.onEntityAdded(entity)
this.scene.entityProcessors.onEntityAdded(entity)
}
});
this._tempEntityList.forEach(entity => entity.onAddedToScene());

32
source/src/Physics/ColliderTriggerHelper.ts
View File

@@ -26,12 +26,17 @@ class ColliderTriggerHelper {
if (collider.overlaps(neighbor)) {
let pair = new Pair<Collider>(collider, neighbor);
let shouldReportTriggerEvent = !this._activeTriggerIntersections.contains(pair) && !this._previousTriggerIntersections.contains(pair);
let shouldReportTriggerEvent = this._activeTriggerIntersections.findIndex(value => {
return value.first == pair.first && value.second == pair.second;
}) == -1 && this._previousTriggerIntersections.findIndex(value => {
return value.first == pair.first && value.second == pair.second;
}) == -1;
if (shouldReportTriggerEvent)
this.notifyTriggerListeners(pair, true);
this._activeTriggerIntersections.push(pair);
if (!this._activeTriggerIntersections.contains(pair))
this._activeTriggerIntersections.push(pair);
}
}
}
@@ -42,24 +47,25 @@ class ColliderTriggerHelper {
}
private checkForExitedColliders(){
let tempIntersections = [];
this._previousTriggerIntersections = this._previousTriggerIntersections.filter(value => {
for (let i = 0; i < this._activeTriggerIntersections.length; i ++){
if (value == this._activeTriggerIntersections[i]){
tempIntersections.push(value);
for (let i = 0; i < this._activeTriggerIntersections.length; i ++){
let index = this._previousTriggerIntersections.findIndex(value => {
if (value.first == this._activeTriggerIntersections[i].first && value.second == this._activeTriggerIntersections[i].second)
return true;
}
}
return false;
});
return false;
});
if (index != -1)
this._previousTriggerIntersections.removeAt(index);
}
for (let i = 0; i < this._previousTriggerIntersections.length; i ++){
this.notifyTriggerListeners(this._previousTriggerIntersections[i], false)
}
this._previousTriggerIntersections.length = 0;
for (let i = 0; i < tempIntersections.length; i ++){
this._previousTriggerIntersections.push(tempIntersections[i]);
for (let i = 0; i < this._activeTriggerIntersections.length; i ++){
if (!this._previousTriggerIntersections.contains(this._activeTriggerIntersections[i])){
this._previousTriggerIntersections.push(this._activeTriggerIntersections[i]);
}
}
this._activeTriggerIntersections.length = 0;
}

14
source/src/Physics/Verlet/SpatialHash.ts
View File

@@ -94,8 +94,10 @@ class SpatialHash {
if (collider == excludeCollider || !Flags.isFlagSet(layerMask, collider.physicsLayer))
continue;
if (bounds.intersects(collider.bounds))
this._tempHashSet.push(collider);
if (bounds.intersects(collider.bounds)){
if (this._tempHashSet.indexOf(collider) == -1)
this._tempHashSet.push(collider);
}
}
}
}
@@ -157,14 +159,6 @@ class NumberDictionary {
return this._store.get(this.getKey(x, y));
}
public getAllObjects(): Collider[] {
let set: Collider[] = [];
this._store.forEach(list => set.concat(list));
return set;
}
public clear() {
this._store.clear();
}