diff --git a/demo/libs/framework/framework.js b/demo/libs/framework/framework.js index 50cf55b7..b029b2da 100644 --- a/demo/libs/framework/framework.js +++ b/demo/libs/framework/framework.js @@ -3084,14 +3084,13 @@ 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 i_2 = 0; i_2 < neighbors.length; i_2++) { - var neighbor = neighbors[i_2]; + for (var j = 0; j < neighbors.length; j++) { + var neighbor = neighbors[j]; if (!collider.isTrigger && !neighbor.isTrigger) continue; if (collider.overlaps(neighbor)) { var pair = new Pair(collider, neighbor); - var shouldReportTriggerEvent = !this._activeTriggerIntersections.contains(pair) && - !this._previousTriggerIntersections.contains(pair); + var shouldReportTriggerEvent = !this._activeTriggerIntersections.contains(pair) && !this._previousTriggerIntersections.contains(pair); if (shouldReportTriggerEvent) this.notifyTriggerListeners(pair, true); this._activeTriggerIntersections.push(pair); @@ -3134,12 +3133,12 @@ var ColliderTriggerHelper = (function () { this._tempTriggerList.length = 0; if (collisionPair.second.entity) { collisionPair.second.entity.getComponents("ITriggerListener", this._tempTriggerList); - for (var i_3 = 0; i_3 < this._tempTriggerList.length; i_3++) { + for (var i_2 = 0; i_2 < this._tempTriggerList.length; i_2++) { if (isEntering) { - this._tempTriggerList[i_3].onTriggerEnter(collisionPair.first, collisionPair.second); + this._tempTriggerList[i_2].onTriggerEnter(collisionPair.first, collisionPair.second); } else { - this._tempTriggerList[i_3].onTriggerExit(collisionPair.first, collisionPair.second); + this._tempTriggerList[i_2].onTriggerExit(collisionPair.first, collisionPair.second); } } this._tempTriggerList.length = 0; diff --git a/demo/src/Main.ts b/demo/src/Main.ts index 54d3b58a..995fa0fd 100644 --- a/demo/src/Main.ts +++ b/demo/src/Main.ts @@ -59,6 +59,14 @@ class Main extends eui.UILayer { private updateFrame(evt: egret.Event){ Main.emitter.emit(CoreEmitterType.Update, evt); + let activeScene = SceneManager.getActiveScene(); + if (activeScene){ + let player = activeScene.findEntity("player"); + if (player){ + let mover = player.getComponent(Mover); + mover.move(new Vector2(0, 0)); + } + } } private async runGame() { diff --git a/demo/src/game/SpawnerComponent.ts b/demo/src/game/SpawnerComponent.ts index 4abfa435..bfd645b3 100644 --- a/demo/src/game/SpawnerComponent.ts +++ b/demo/src/game/SpawnerComponent.ts @@ -17,7 +17,6 @@ class SpawnComponent extends Component implements ITriggerListener { public update() { // console.log("update"); - this.entity.getComponent(Mover).move(new Vector2(0, 0)); } public onTriggerEnter(other: Collider, local: Collider){ diff --git a/source/bin/framework.js b/source/bin/framework.js index 50cf55b7..b029b2da 100644 --- a/source/bin/framework.js +++ b/source/bin/framework.js @@ -3084,14 +3084,13 @@ 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 i_2 = 0; i_2 < neighbors.length; i_2++) { - var neighbor = neighbors[i_2]; + for (var j = 0; j < neighbors.length; j++) { + var neighbor = neighbors[j]; if (!collider.isTrigger && !neighbor.isTrigger) continue; if (collider.overlaps(neighbor)) { var pair = new Pair(collider, neighbor); - var shouldReportTriggerEvent = !this._activeTriggerIntersections.contains(pair) && - !this._previousTriggerIntersections.contains(pair); + var shouldReportTriggerEvent = !this._activeTriggerIntersections.contains(pair) && !this._previousTriggerIntersections.contains(pair); if (shouldReportTriggerEvent) this.notifyTriggerListeners(pair, true); this._activeTriggerIntersections.push(pair); @@ -3134,12 +3133,12 @@ var ColliderTriggerHelper = (function () { this._tempTriggerList.length = 0; if (collisionPair.second.entity) { collisionPair.second.entity.getComponents("ITriggerListener", this._tempTriggerList); - for (var i_3 = 0; i_3 < this._tempTriggerList.length; i_3++) { + for (var i_2 = 0; i_2 < this._tempTriggerList.length; i_2++) { if (isEntering) { - this._tempTriggerList[i_3].onTriggerEnter(collisionPair.first, collisionPair.second); + this._tempTriggerList[i_2].onTriggerEnter(collisionPair.first, collisionPair.second); } else { - this._tempTriggerList[i_3].onTriggerExit(collisionPair.first, collisionPair.second); + this._tempTriggerList[i_2].onTriggerExit(collisionPair.first, collisionPair.second); } } this._tempTriggerList.length = 0; diff --git a/source/src/Physics/ColliderTriggerHelper.ts b/source/src/Physics/ColliderTriggerHelper.ts index c37adb52..b9b278da 100644 --- a/source/src/Physics/ColliderTriggerHelper.ts +++ b/source/src/Physics/ColliderTriggerHelper.ts @@ -19,15 +19,14 @@ class ColliderTriggerHelper { let collider = colliders[i]; let neighbors = Physics.boxcastBroadphase(collider.bounds, collider.collidesWithLayers); - for (let i = 0; i < neighbors.length; i++) { - let neighbor = neighbors[i]; + for (let j = 0; j < neighbors.length; j++) { + let neighbor = neighbors[j]; if (!collider.isTrigger && !neighbor.isTrigger) continue; if (collider.overlaps(neighbor)) { let pair = new Pair(collider, neighbor); - let shouldReportTriggerEvent = !this._activeTriggerIntersections.contains(pair) && - !this._previousTriggerIntersections.contains(pair); + let shouldReportTriggerEvent = !this._activeTriggerIntersections.contains(pair) && !this._previousTriggerIntersections.contains(pair); if (shouldReportTriggerEvent) this.notifyTriggerListeners(pair, true);