From 563e2a9d9bd28ca6cadd39dc63cc38693c6e2830 Mon Sep 17 00:00:00 2001 From: Michael Hemingway Date: Sat, 7 Mar 2020 00:20:43 -0500 Subject: [PATCH] fix computeAABB orientation mult (legacy #433) https://github.com/schteppe/cannon.js/pull/433 --- src/collision/Ray.js | 2 +- src/objects/Body.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collision/Ray.js b/src/collision/Ray.js index 9e7d341b5..fb19f2b24 100644 --- a/src/collision/Ray.js +++ b/src/collision/Ray.js @@ -29,7 +29,6 @@ export class Ray { * @property {Vec3} _direction */ this._direction = new Vec3() - /** * The precision of the ray. Used when checking parallelity etc. * @property {Number} precision @@ -98,6 +97,7 @@ export class Ray { this.skipBackfaces = !!options.skipBackfaces this.collisionFilterMask = typeof options.collisionFilterMask !== 'undefined' ? options.collisionFilterMask : -1 this.collisionFilterGroup = typeof options.collisionFilterGroup !== 'undefined' ? options.collisionFilterGroup : -1 + this.checkCollisionResponse = typeof (options.checkCollisionResponse) !== 'undefined' ? options.checkCollisionResponse : true; if (options.from) { this.from.copy(options.from) } diff --git a/src/objects/Body.js b/src/objects/Body.js index edf23e4f5..9e27d59c9 100644 --- a/src/objects/Body.js +++ b/src/objects/Body.js @@ -572,7 +572,7 @@ export class Body extends EventTarget { offset.vadd(this.position, offset) // Get shape world quaternion - shapeOrientations[i].mult(bodyQuat, orientation) + bodyQuat.mult(shapeOrientations[i], orientation); // Get shape AABB shape.calculateWorldAABB(offset, orientation, shapeAABB.lowerBound, shapeAABB.upperBound)