Fixed repose ordering

mml-io · Jan 21, 2024 · 2da4cd3 · 2da4cd3
1 parent 11f0b63
commit 2da4cd3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/tools/gltf-avatar-exporter/src/scene/correction-steps/reposeBones.ts b/tools/gltf-avatar-exporter/src/scene/correction-steps/reposeBones.ts
@@ -11,9 +11,23 @@ export const reposeBonesCorrectionStep: Step = {
     group.traverse((child) => {
       const asSkinnedMesh = child as THREE.SkinnedMesh;
       if (asSkinnedMesh.isSkinnedMesh) {
-        console.log("reposing", asSkinnedMesh.name);
+        const inverses = [...asSkinnedMesh.skeleton.boneInverses];
         asSkinnedMesh.skeleton.pose();
         asSkinnedMesh.skeleton.calculateInverses();
+        const newInverses = asSkinnedMesh.skeleton.boneInverses;
+        let allInversesEqual = true;
+        for (let i = 0; i < inverses.length; i++) {
+          if (!inverses[i].equals(newInverses[i])) {
+            allInversesEqual = false;
+            break;
+          }
+        }
+        if (!allInversesEqual) {
+          logs.push({
+            level: "info",
+            message: `Reposed skeleton for ${asSkinnedMesh.name}`,
+          });
+        }
       }
     });
 
@@ -22,7 +36,7 @@ export const reposeBonesCorrectionStep: Step = {
         didApply: false,
         topLevelMessage: {
           level: "info",
-          message: "No geometries with duplicate material ids found.",
+          message: "No skeletons were reposed.",
         },
       };
     }
@@ -31,7 +45,7 @@ export const reposeBonesCorrectionStep: Step = {
       didApply: true,
       topLevelMessage: {
         level: "info",
-        message: "Merged geometry groups",
+        message: "Skeleton(s) were reposed",
       },
       logs,
     };

diff --git a/tools/gltf-avatar-exporter/src/scene/correction-steps/rotatePelvis.ts b/tools/gltf-avatar-exporter/src/scene/correction-steps/rotatePelvis.ts
@@ -47,6 +47,13 @@ export const rotatePelvisCorrectionStep: Step = {
       pelvisBone.rotation.x += 0;
       pelvisBone.rotation.y -= HalfPi;
       pelvisBone.rotation.z += HalfPi;
+    } else if (isNear(pelvisX, 0) && isNear(pelvisY, -HalfPi) && isNear(pelvisZ, 0)) {
+      pelvisBone.rotation.x += 0;
+      pelvisBone.rotation.y += HalfPi;
+      pelvisBone.rotation.z += HalfPi;
+      const tempPosY = pelvisBone.position.y;
+      pelvisBone.position.y = pelvisBone.position.z;
+      pelvisBone.position.z = -tempPosY;
     } else {
       reposeSkinnedMeshes(group);
       return {

diff --git a/tools/gltf-avatar-exporter/src/scene/correction-steps/runFixes.ts b/tools/gltf-avatar-exporter/src/scene/correction-steps/runFixes.ts
@@ -20,11 +20,11 @@ export const correctionSteps = [
   levelOfDetailDedupingCorrectionStep,
   mergeGeometryGroupsCorrectionStep,
   boneDedupingCorrectionStep,
-  reposeBonesCorrectionStep,
   rotateWholeGroupCorrectionStep,
   zUpMeshCorrectionStep,
   zUpBonesCorrectionStep,
   fixMeshScaleCorrectionStep,
+  reposeBonesCorrectionStep,
   fixBonesScaleCorrectionStep,
   connectRootCorrectionStep,
   rotateRootCorrectionStep,