Skip to content

Commit 031ab55

Browse files
author
Avaer Kazmer
committed
Clean up armature scale tracking
1 parent 148eb03 commit 031ab55

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

vrarmik/avatars.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -397,13 +397,9 @@ class Avatar {
397397

398398
const armatureQuaternion = armature.quaternion.clone();
399399
const armatureMatrixInverse = new THREE.Matrix4().getInverse(armature.matrixWorld);
400-
const armatureScale = armature.scale.clone();
401400
armature.position.set(0, 0, 0);
402401
armature.quaternion.set(0, 0, 0, 1);
403-
this.armatureScaleFactor = Head.getWorldPosition(new THREE.Vector3())
404-
.distanceTo(Left_ankle.getWorldPosition(new THREE.Vector3()))
405-
/ Math.abs(armature.scale.y) > 100 ? 100 : 1;
406-
armature.scale.set(1, 1, 1).divideScalar(this.armatureScaleFactor);
402+
armature.scale.set(1, 1, 1);
407403
armature.updateMatrix();
408404

409405
Head.traverse(o => {
@@ -423,7 +419,7 @@ class Avatar {
423419
hairBones.forEach(rootHairBone => {
424420
rootHairBone.traverse(hairBone => {
425421
hairBone.length = hairBone.position.length();
426-
hairBone.worldParentOffset = hairBone.getWorldPosition(new THREE.Vector3()).sub(hairBone.parent.getWorldPosition(new THREE.Vector3())).divide(armatureScale);
422+
hairBone.worldParentOffset = hairBone.getWorldPosition(new THREE.Vector3()).sub(hairBone.parent.getWorldPosition(new THREE.Vector3()));
427423
hairBone.initialWorldQuaternion = hairBone.getWorldQuaternion(new THREE.Quaternion());
428424
hairBone.velocity = new THREE.Vector3();
429425
if (hairBone !== rootHairBone) {
@@ -749,7 +745,7 @@ class Avatar {
749745
const modelBoneOutput = this.modelBoneOutputs[k];
750746

751747
if (k === 'Hips') {
752-
modelBone.position.copy(modelBoneOutput.position).multiplyScalar(this.armatureScaleFactor);
748+
modelBone.position.copy(modelBoneOutput.position);
753749
}
754750
modelBone.quaternion.multiplyQuaternions(modelBoneOutput.quaternion, modelBone.initialQuaternion)
755751

0 commit comments

Comments
 (0)