From 98dfe79632e04dcffb3369e0599c71485fa54f61 Mon Sep 17 00:00:00 2001 From: "jiaxin.lai" Date: Sat, 23 Jan 2021 14:04:18 +0800 Subject: [PATCH] fix cannon contact normal (#8189) * fix cannon contact normal * fix set connected body of cannon constraint --- cocos/physics/cannon/constraints/cannon-constraint.ts | 2 ++ cocos/physics/cannon/constraints/cannon-hinge-constraint.ts | 3 +++ 2 files changed, 5 insertions(+) diff --git a/cocos/physics/cannon/constraints/cannon-constraint.ts b/cocos/physics/cannon/constraints/cannon-constraint.ts index 0526066724..e5005f7496 100644 --- a/cocos/physics/cannon/constraints/cannon-constraint.ts +++ b/cocos/physics/cannon/constraints/cannon-constraint.ts @@ -50,6 +50,8 @@ export class CannonConstraint implements IBaseConstraint { } else { this._impl.bodyB = (CANNON.World as any).staticBody; } + const newBJ = this._impl.bodyB; + this._impl.equations.forEach((v: CANNON.Equation) => { v.bj = newBJ; }); } setEnableCollision (v: boolean): void { diff --git a/cocos/physics/cannon/constraints/cannon-hinge-constraint.ts b/cocos/physics/cannon/constraints/cannon-hinge-constraint.ts index ce3cfebc70..19eff49163 100644 --- a/cocos/physics/cannon/constraints/cannon-hinge-constraint.ts +++ b/cocos/physics/cannon/constraints/cannon-hinge-constraint.ts @@ -70,14 +70,17 @@ export class CannonHingeConstraint extends CannonConstraint implements IHingeCon Vec3.copy(this.impl.axisA, v); Vec3.copy((this.impl.equations[3] as CANNON.RotationalEquation).axisA, v); Vec3.copy((this.impl.equations[4] as CANNON.RotationalEquation).axisA, v); + Vec3.copy((this.impl.equations[5] as CANNON.RotationalMotorEquation).axisA, v); if (this.constraint.connectedBody) { Vec3.copy(this.impl.axisB, v); Vec3.copy((this.impl.equations[3] as CANNON.RotationalEquation).axisB, v); Vec3.copy((this.impl.equations[4] as CANNON.RotationalEquation).axisB, v); + Vec3.copy((this.impl.equations[5] as CANNON.RotationalMotorEquation).axisB, v); } else { Vec3.transformQuat(this.impl.axisB, v, this.constraint.node.worldRotation); Vec3.copy((this.impl.equations[3] as CANNON.RotationalEquation).axisB, this.impl.axisB); Vec3.copy((this.impl.equations[4] as CANNON.RotationalEquation).axisB, this.impl.axisB); + Vec3.copy((this.impl.equations[5] as CANNON.RotationalMotorEquation).axisB, this.impl.axisB); } }