Skip to content

Fix MMDPhysics _updateBonePosition() #16178

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

Merged
merged 1 commit into from
Apr 7, 2019
Merged

Fix MMDPhysics _updateBonePosition() #16178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 20 additions & 21 deletions examples/js/animation/MMDPhysics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,14 +994,8 @@ THREE.MMDPhysics = ( function () {
_getWorldTransformForBone: function () {

var manager = this.manager;

var tr = manager.allocTransform();
this.body.getMotionState().getWorldTransform( tr );
var tr2 = manager.multiplyTransforms( tr, this.boneOffsetFormInverse );

manager.freeTransform( tr );

return tr2;
var tr = this.body.getCenterOfMassTransform();
return manager.multiplyTransforms( tr, this.boneOffsetFormInverse );

},

Expand Down Expand Up @@ -1072,19 +1066,24 @@ THREE.MMDPhysics = ( function () {

var manager = this.manager;

var tr = this.body.getCenterOfMassTransform();
var origin = tr.getOrigin();

var matrixInv = manager.allocThreeMatrix4();
matrixInv.copy( this.bone.parent.matrixWorld ).getInverse( matrixInv );

var pos = manager.allocThreeVector3();
pos.set( origin.x(), origin.y(), origin.z() ).applyMatrix4( matrixInv );

this.bone.position.copy( pos );

manager.freeThreeVector3( pos );
manager.freeThreeMatrix4( matrixInv );
var tr = this._getWorldTransformForBone();

var thV = manager.allocThreeVector3();

var o = manager.getOrigin( tr );
thV.set( o.x(), o.y(), o.z() );

if ( this.bone.parent ) {

this.bone.parent.worldToLocal( thV );

}

this.bone.position.copy( thV );

manager.freeThreeVector3( thV );

manager.freeTransform( tr );

}

Expand Down