Major decapitation cleanup

Author: Avaer Kazmer

vrarmik.html

@@ -543,20 +543,6 @@ <h3>Multiplayer</h3>
   normal: 0x5c6bc0,
   highlight: 0x303f9f,
 };
-const _unloadSavedHead = () => {
-  rig.modelBones.Head.traverse(o => {
-    o.savedPosition.copy(o.position);
-    o.savedMatrixWorld.copy(o.matrixWorld);
-    o.position.set(NaN, NaN, NaN);
-    o.matrixWorld.set(NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN);
-  });
-};
-const _loadSavedHead = () => {
-  rig.modelBones.Head.traverse(o => {
-    o.position.copy(o.savedPosition);
-    o.matrixWorld.copy(o.savedMatrixWorld);
-  });
-};
 const mirrorMesh = (() => {
   const geometry = new THREE.PlaneBufferGeometry(1, 2)
     .applyMatrix(new THREE.Matrix4().makeTranslation(0, 1, 0));
@@ -884,7 +870,15 @@ <h3>Multiplayer</h3>
     }
   }
 
+  /* if (rig) {
+    rig.decapitate();
+  } */
+
   renderer.render(scene, camera);
+
+  /* if (rig) {
+    rig.undecapitate();
+  } */
 }
 renderer.setAnimationLoop(animate);
 

vrarmik/avatars.js

@@ -406,12 +406,9 @@ class Avatar {
     armature.updateMatrix();
 
     Head.traverse(o => {
-      o.savedPosition = new THREE.Vector3();
-      o.savedMatrixWorld = new THREE.Matrix4();
+      o.savedPosition = o.position.clone();
+      o.savedMatrixWorld = o.matrixWorld.clone();
     });
-    if (options.decapitate) {
-      this.decapitate();
-    }
 
     const hairBones = tailBones.filter(bone => /hair/i.test(bone.name)).map(bone => {
       for (; bone; bone = bone.parent) {
@@ -734,6 +731,11 @@ class Avatar {
 
     this.shoulderTransforms.Start();
     this.legsManager.Start();
+
+    this.decapitated = false;
+    if (options.decapitate) {
+      this.decapitate();
+    }
 	}
 	update() {
 // return;
@@ -791,15 +793,17 @@ class Avatar {
     }
 
     if (this.options.hair) {
+      const _getMatrixWorld = o => this.decapitated ? o.savedMatrixWorld : o.matrixWorld;
+
       const hipsRotation = this.modelBones.Hips.quaternion;
-      const scale = localVector.setFromMatrixScale(this.modelBones.Head.matrixWorld);;
+      const scale = localVector.setFromMatrixScale(_getMatrixWorld(this.modelBones.Head));
       const _processHairBone = (hairBone, children) => {
-        const p = localVector2.setFromMatrixPosition(hairBone.matrixWorld);
+        const p = localVector2.setFromMatrixPosition(_getMatrixWorld(hairBone));
 
         for (let i = 0; i < children.length; i++) {
           const childHairBone = children[i];
 
-          const px = localVector3.setFromMatrixPosition(childHairBone.matrixWorld);
+          const px = localVector3.setFromMatrixPosition(_getMatrixWorld(childHairBone));
           const hairDistance = px.distanceTo(p);
           const hairDirection = localVector4.copy(px).sub(p).normalize();
 
@@ -828,7 +832,7 @@ class Avatar {
             )),
             childHairBone.initialWorldQuaternion
           );
-          childHairBone.matrixWorld.compose(p2, q2, scale);
+          _getMatrixWorld(childHairBone).compose(p2, q2, scale);
         }
         for (let i = 0; i < children.length; i++) {
           const childHairBone = children[i];
@@ -912,18 +916,24 @@ class Avatar {
   }
 
   decapitate() {
-    rig.modelBones.Head.traverse(o => {
-      o.savedPosition.copy(o.position);
-      o.savedMatrixWorld.copy(o.matrixWorld);
-      o.position.set(NaN, NaN, NaN);
-      o.matrixWorld.set(NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN);
-    });
+    if (!this.decapitated) {
+      this.modelBones.Head.traverse(o => {
+        o.savedPosition.copy(o.position);
+        o.savedMatrixWorld.copy(o.matrixWorld);
+        o.position.set(NaN, NaN, NaN);
+        o.matrixWorld.set(NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN);
+      });
+      this.decapitated = true;
+    }
   }
   undecapitate() {
-    rig.modelBones.Head.traverse(o => {
-      o.position.copy(o.savedPosition);
-      o.matrixWorld.copy(o.savedMatrixWorld);
-    });
+    if (this.decapitated) {
+      this.modelBones.Head.traverse(o => {
+        o.position.copy(o.savedPosition);
+        o.matrixWorld.copy(o.savedMatrixWorld);
+      });
+      this.decapitated = false;
+    }
   }
 }
 export default Avatar;