Skip to content

Handle scaled parent object #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Handle scaled parent object #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e88981d
Handle case where parent object is scaled
diarmidmackenzie Dec 18, 2023
def7710
Updated builds
diarmidmackenzie Dec 18, 2023
6df5836
Another parenting assumption fix
diarmidmackenzie Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions dist/aframe-physics-system.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13929,6 +13929,7 @@ let AmmoBody = {
const clamp = (num, min, max) => Math.min(Math.max(num, min), max)

this.localScaling = new Ammo.btVector3();
this.scaleVector = new THREE.Vector3();

const obj = this.el.object3D;
obj.getWorldPosition(pos);
Expand Down Expand Up @@ -14014,8 +14015,9 @@ let AmmoBody = {
let updated = false;

const obj = this.el.object3D;
if (this.data.scaleAutoUpdate && this.prevScale && !almostEqualsVector3(0.001, obj.scale, this.prevScale)) {
this.prevScale.copy(obj.scale);
obj.getWorldScale(this.scaleVector);
if (this.data.scaleAutoUpdate && this.prevScale && !almostEqualsVector3(0.001, this.scaleVector, this.prevScale)) {
this.prevScale.copy(this.scaleVector);
updated = true;

this.localScaling.setValue(this.prevScale.x, this.prevScale.y, this.prevScale.z);
Expand Down Expand Up @@ -14233,8 +14235,9 @@ let AmmoBody = {
const v2 = new THREE.Vector3();
return function() {
const el = this.el,
parentEl = el.parentEl,
body = this.body;
body = this.body,
// see notes on parentEl in syncFromPhysics
parentEl = el.object3D.parent.el ? el.object3D.parent.el : el.parentEl;

if (!body) return;

Expand Down
2 changes: 1 addition & 1 deletion dist/aframe-physics-system.min.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions src/components/body/ammo-body.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ let AmmoBody = {
const clamp = (num, min, max) => Math.min(Math.max(num, min), max)

this.localScaling = new Ammo.btVector3();
this.scaleVector = new THREE.Vector3();

const obj = this.el.object3D;
obj.getWorldPosition(pos);
Expand Down Expand Up @@ -190,8 +191,9 @@ let AmmoBody = {
let updated = false;

const obj = this.el.object3D;
if (this.data.scaleAutoUpdate && this.prevScale && !almostEqualsVector3(0.001, obj.scale, this.prevScale)) {
this.prevScale.copy(obj.scale);
obj.getWorldScale(this.scaleVector);
if (this.data.scaleAutoUpdate && this.prevScale && !almostEqualsVector3(0.001, this.scaleVector, this.prevScale)) {
this.prevScale.copy(this.scaleVector);
updated = true;

this.localScaling.setValue(this.prevScale.x, this.prevScale.y, this.prevScale.z);
Expand Down Expand Up @@ -409,8 +411,9 @@ let AmmoBody = {
const v2 = new THREE.Vector3();
return function() {
const el = this.el,
parentEl = el.parentEl,
body = this.body;
body = this.body,
// see notes on parentEl in syncFromPhysics
parentEl = el.object3D.parent.el ? el.object3D.parent.el : el.parentEl;

if (!body) return;

Expand Down