fix cannon contact normal (#8189)

* fix cannon contact normal

* fix set connected body of cannon constraint
This commit is contained in:
jiaxin.lai
2021-01-23 14:04:18 +08:00
committed by GitHub
parent 093cee855e
commit 98dfe79632
2 changed files with 5 additions and 0 deletions
@@ -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 {
@@ -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);
}
}