Skip to content
This repository has been archived by the owner on May 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #184 from kylebakerio/master
Browse files Browse the repository at this point in the history
  • Loading branch information
n5ro authored Apr 20, 2021
2 parents 7f49464 + edabbb9 commit 63d88d2
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 53 deletions.
6 changes: 3 additions & 3 deletions dist/aframe-physics-system.js
Original file line number Diff line number Diff line change
Expand Up @@ -14487,7 +14487,7 @@ module.exports = AFRAME.registerComponent("ammo-constraint", {

const bodyTransform = body
.getCenterOfMassTransform()
.inverse()
.invert()
.op_mul(targetBody.getWorldTransform());
const targetTransform = new Ammo.btTransform();
targetTransform.setIdentity();
Expand Down Expand Up @@ -15009,7 +15009,7 @@ let AmmoBody = {
} else {
q1.set(quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w());
parentEl.object3D.getWorldQuaternion(q2);
q1.multiply(q2.inverse());
q1.multiply(q2.invert());
el.object3D.quaternion.copy(q1);

v.set(position.x(), position.y(), position.z());
Expand Down Expand Up @@ -15413,7 +15413,7 @@ var Body = {
} else {
q1.copy(body.quaternion);
parentEl.object3D.getWorldQuaternion(q2);
q1.premultiply(q2.inverse());
q1.premultiply(q2.invert());
el.object3D.quaternion.copy(q1);

v.copy(body.position);
Expand Down
2 changes: 1 addition & 1 deletion dist/aframe-physics-system.min.js

Large diffs are not rendered by default.

80 changes: 36 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"aframe": ">=0.5.0"
},
"devDependencies": {
"aframe": "^1.0.4",
"aframe": "^1.1.0",
"browserify": "^16.5.1",
"browserify-css": "^0.15.0",
"browserify-shim": "^3.8.14",
Expand All @@ -71,7 +71,7 @@
"replace": "^1.2.0",
"sinon": "^2.4.1",
"sinon-chai": "^2.14.0",
"three": "^0.115.0",
"three": "^0.123.0",
"uglify-es": "^3.3.9"
}
}
2 changes: 1 addition & 1 deletion src/components/ammo-constraint.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ module.exports = AFRAME.registerComponent("ammo-constraint", {

const bodyTransform = body
.getCenterOfMassTransform()
.inverse()
.invert()
.op_mul(targetBody.getWorldTransform());
const targetTransform = new Ammo.btTransform();
targetTransform.setIdentity();
Expand Down
2 changes: 1 addition & 1 deletion src/components/body/ammo-body.js
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ let AmmoBody = {
} else {
q1.set(quaternion.x(), quaternion.y(), quaternion.z(), quaternion.w());
parentEl.object3D.getWorldQuaternion(q2);
q1.multiply(q2.inverse());
q1.multiply(q2.invert());
el.object3D.quaternion.copy(q1);

v.set(position.x(), position.y(), position.z());
Expand Down
2 changes: 1 addition & 1 deletion src/components/body/body.js
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ var Body = {
} else {
q1.copy(body.quaternion);
parentEl.object3D.getWorldQuaternion(q2);
q1.premultiply(q2.inverse());
q1.premultiply(q2.invert());
el.object3D.quaternion.copy(q1);

v.copy(body.position);
Expand Down

0 comments on commit 63d88d2

Please sign in to comment.