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

overlapCircle添加检测圆重合

Browse Source
This commit is contained in:
yhh
2021-05-28 16:16:58 +08:00
parent 4db8734a34
commit 79d684caae
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/bin/framework.js
View File

@@ -8192,11 +8192,9 @@ var es;
for (var potentials_1 = __values(potentials), potentials_1_1 = potentials_1.next(); !potentials_1_1.done; potentials_1_1 = potentials_1.next()) { for (var potentials_1 = __values(potentials), potentials_1_1 = potentials_1.next(); !potentials_1_1.done; potentials_1_1 = potentials_1.next()) {
var collider = potentials_1_1.value; var collider = potentials_1_1.value;
if (collider instanceof es.BoxCollider) { if (collider instanceof es.BoxCollider) {
if (collider.shape.overlaps(this._overlapTestCircle)) {
results[resultCounter] = collider; results[resultCounter] = collider;
resultCounter++; resultCounter++;
} }
}
else if (collider instanceof es.CircleCollider) { else if (collider instanceof es.CircleCollider) {
if (es.Collisions.rectToCircle(rect, collider.bounds.center, collider.bounds.width * 0.5)) { if (es.Collisions.rectToCircle(rect, collider.bounds.center, collider.bounds.width * 0.5)) {
results[resultCounter] = collider; results[resultCounter] = collider;
@@ -8243,9 +8241,11 @@ var es;
for (var potentials_2 = __values(potentials), potentials_2_1 = potentials_2.next(); !potentials_2_1.done; potentials_2_1 = potentials_2.next()) { for (var potentials_2 = __values(potentials), potentials_2_1 = potentials_2.next(); !potentials_2_1.done; potentials_2_1 = potentials_2.next()) {
var collider = potentials_2_1.value; var collider = potentials_2_1.value;
if (collider instanceof es.BoxCollider) { if (collider instanceof es.BoxCollider) {
if (collider.shape.overlaps(this._overlapTestCircle)) {
results[resultCounter] = collider; results[resultCounter] = collider;
resultCounter++; resultCounter++;
} }
}
else if (collider instanceof es.CircleCollider) { else if (collider instanceof es.CircleCollider) {
if (collider.shape.overlaps(this._overlapTestCircle)) { if (collider.shape.overlaps(this._overlapTestCircle)) {
results[resultCounter] = collider; results[resultCounter] = collider;

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

File diff suppressed because one or more lines are too long

4
source/src/Physics/SpatialHash.ts
View File

@@ -231,10 +231,8 @@ module es {
let potentials = this.aabbBroadphase(rect, null, layerMask); let potentials = this.aabbBroadphase(rect, null, layerMask);
for (let collider of potentials) { for (let collider of potentials) {
if (collider instanceof BoxCollider) { if (collider instanceof BoxCollider) {
if (collider.shape.overlaps(this._overlapTestCircle)) {
results[resultCounter] = collider; results[resultCounter] = collider;
resultCounter ++; resultCounter ++;
}
} else if(collider instanceof CircleCollider) { } else if(collider instanceof CircleCollider) {
if (Collisions.rectToCircle(rect, collider.bounds.center, collider.bounds.width * 0.5)) { if (Collisions.rectToCircle(rect, collider.bounds.center, collider.bounds.width * 0.5)) {
results[resultCounter] = collider; results[resultCounter] = collider;
@@ -273,8 +271,10 @@ module es {
let potentials = this.aabbBroadphase(bounds, null, layerMask); let potentials = this.aabbBroadphase(bounds, null, layerMask);
for (let collider of potentials) { for (let collider of potentials) {
if (collider instanceof BoxCollider) { if (collider instanceof BoxCollider) {
if (collider.shape.overlaps(this._overlapTestCircle)) {
results[resultCounter] = collider; results[resultCounter] = collider;
resultCounter++; resultCounter++;
}
} else if (collider instanceof CircleCollider) { } else if (collider instanceof CircleCollider) {
if (collider.shape.overlaps(this._overlapTestCircle)) { if (collider.shape.overlaps(this._overlapTestCircle)) {
results[resultCounter] = collider; results[resultCounter] = collider;