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

修复因Vector2.add/substract/divide/mutiply导致的计算错误

Browse Source
This commit is contained in:
yhh
2020-12-03 17:58:25 +08:00
parent 89cfd5388f
commit 4665d1d0ea
16 changed files with 83 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/src/Physics/Shapes/Polygon.ts
View File

@@ -116,7 +116,7 @@ module es {
public static recenterPolygonVerts(points: Vector2[]) {
let center = this.findPolygonCenter(points);
for (let i = 0; i < points.length; i++)
points[i].subtract(center);
points[i] = Vector2.subtract(points[i], center);
}
/**
@@ -212,7 +212,7 @@ module es {
public recalculateBounds(collider: Collider) {
// 如果我们没有旋转或不关心TRS我们使用localOffset作为中心，我们会从那开始
this.center = collider.localOffset;
this.center = collider.localOffset.clone();
if (collider.shouldColliderScaleAndRotateWithTransform) {
let hasUnitScale = true;
@@ -234,7 +234,7 @@ module es {
// 为了处理偏移原点的旋转我们只需要将圆心在(0,0)附近移动
// 我们的偏移使角度为0我们还需要处理这里的比例所以我们先对偏移进行缩放以得到合适的长度。
let offsetAngle = Math.atan2(collider.localOffset.y, collider.localOffset.x) * MathHelper.Rad2Deg;
let offsetAngle = Math.atan2(collider.localOffset.y * collider.entity.transform.scale.y, collider.localOffset.x * collider.entity.transform.scale.x) * MathHelper.Rad2Deg;
let offsetLength = hasUnitScale ? collider._localOffsetLength :
Vector2.multiply(collider.localOffset, collider.entity.transform.scale).length();
this.center = MathHelper.pointOnCirlce(Vector2.zero, offsetLength,
@@ -256,7 +256,7 @@ module es {
this.position = Vector2.add(collider.entity.transform.position, this.center);
this.bounds = Rectangle.rectEncompassingPoints(this.points);
this.bounds.location.add(this.position);
this.bounds.location = Vector2.add(this.bounds.location, this.position);
}
public overlaps(other: Shape) {

2
source/src/Physics/Shapes/ShapeCollisions/ShapeCollisions.ts
View File

@@ -369,7 +369,7 @@ module es {
if (u < 0 || u > 1)
return false;
intersection = intersection.add(a1).add(Vector2.multiply(new Vector2(t), b));
intersection = Vector2.add(a1, Vector2.multiply(new Vector2(t), b));
return true;
}

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

@@ -35,7 +35,7 @@ module es {
* @param collider
*/
public register(collider: Collider) {
let bounds = collider.bounds;
let bounds = collider.bounds.clone();
collider.registeredPhysicsBounds = bounds;
let p1 = this.cellCoords(bounds.x, bounds.y);
let p2 = this.cellCoords(bounds.right, bounds.bottom);
@@ -63,7 +63,7 @@ module es {
* @param collider
*/
public remove(collider: Collider) {
let bounds = collider.registeredPhysicsBounds;
let bounds = collider.registeredPhysicsBounds.clone();
let p1 = this.cellCoords(bounds.x, bounds.y);
let p2 = this.cellCoords(bounds.right, bounds.bottom);
@@ -106,7 +106,7 @@ module es {
for (let x = p1.x; x <= p2.x; x++) {
for (let y = p1.y; y <= p2.y; y++) {
let cell = this.cellAtPosition(x, y);
if (!cell)
if (cell == null)
continue;
// 当cell不为空。循环并取回所有碰撞器
@@ -350,7 +350,7 @@ module es {
// TODO: rayIntersects的性能够吗?需要测试它。Collisions.rectToLine可能更快
// TODO: 如果边界检查返回更多数据，我们就不需要为BoxCollider检查做任何事情
// 在做形状测试之前先做一个边界检查
let colliderBounds = potential.bounds;
let colliderBounds = potential.bounds.clone();
if (colliderBounds.rayIntersects(this._ray, fraction) && fraction.value <= 1){
if (potential.shape.collidesWithLine(this._ray.start, this._ray.end, this._tempHit)) {
// 检查一下，我们应该排除这些射线，射线cast是否在碰撞器中开始