Added reposing and geometry merging steps and fixed rotate root

tools/gltf-avatar-exporter/src/scene/correction-steps/boneDeduping.ts

@@ -1,7 +1,6 @@
 import * as THREE from "three";
 import { Group } from "three";
 
-import { reposeSkinnedMeshes } from "./reposeSkinnedMeshes";
 import { Step } from "./types";
 
 export const boneDedupingCorrectionStep: Step = {
@@ -49,8 +48,6 @@ export const boneDedupingCorrectionStep: Step = {
       }
     });
 
-    reposeSkinnedMeshes(group);
-
     return {
       didApply: true,
       topLevelMessage: {

tools/gltf-avatar-exporter/src/scene/correction-steps/mergeGeometryGroups.ts

@@ -0,0 +1,60 @@
+import * as THREE from "three";
+import { Group } from "three";
+// @ts-ignore
+// eslint-disable-next-line import/no-unresolved
+import * as BufferGeometryUtils from "three/addons/utils/BufferGeometryUtils.js";
+
+import { LogMessage, Step } from "./types";
+
+export const mergeGeometryGroupsCorrectionStep: Step = {
+  name: "mergeGeometryGroups",
+  action: (group: Group) => {
+    const logs: Array<LogMessage> = [];
+
+    group.traverse((child) => {
+      const asSkinnedMesh = child as THREE.SkinnedMesh;
+      if (asSkinnedMesh.isSkinnedMesh) {
+        const geometry = asSkinnedMesh.geometry;
+        const existingIds = new Set<number>();
+        let didHaveDuplicateIds = false;
+        if (geometry.groups.length > 0) {
+          for (const geoGroup of geometry.groups) {
+            if (geoGroup.materialIndex) {
+              if (existingIds.has(geoGroup.materialIndex)) {
+                didHaveDuplicateIds = true;
+                break;
+              }
+              existingIds.add(geoGroup.materialIndex);
+            }
+          }
+          if (didHaveDuplicateIds) {
+            logs.push({
+              level: "info",
+              message: `Merging geometry groups for mesh: ${child.name}`,
+            });
+            BufferGeometryUtils.mergeGroups(geometry);
+          }
+        }
+      }
+    });
+
+    if (logs.length === 0) {
+      return {
+        didApply: false,
+        topLevelMessage: {
+          level: "info",
+          message: "No geometries with duplicate material ids found.",
+        },
+      };
+    }
+
+    return {
+      didApply: true,
+      topLevelMessage: {
+        level: "info",
+        message: "Merged geometry groups",
+      },
+      logs,
+    };
+  },
+};

tools/gltf-avatar-exporter/src/scene/correction-steps/reposeBones.ts

@@ -0,0 +1,53 @@
+import * as THREE from "three";
+import { Group } from "three";
+
+import { LogMessage, Step } from "./types";
+
+export const reposeBonesCorrectionStep: Step = {
+  name: "reposeBones",
+  action: (group: Group) => {
+    const logs: Array<LogMessage> = [];
+
+    group.traverse((child) => {
+      const asSkinnedMesh = child as THREE.SkinnedMesh;
+      if (asSkinnedMesh.isSkinnedMesh) {
+        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}`,
+          });
+        }
+      }
+    });
+
+    if (logs.length === 0) {
+      return {
+        didApply: false,
+        topLevelMessage: {
+          level: "info",
+          message: "No skeletons were reposed.",
+        },
+      };
+    }
+
+    return {
+      didApply: true,
+      topLevelMessage: {
+        level: "info",
+        message: "Skeletons were reposed",
+      },
+      logs,
+    };
+  },
+};

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 {

tools/gltf-avatar-exporter/src/scene/correction-steps/rotateRoot.ts

@@ -53,7 +53,7 @@ export const rotateRootCorrectionStep: Step = {
         if (asBone.isBone) {
           const tempPosY = asBone.position.y;
           asBone.position.y = asBone.position.z;
-          asBone.position.z = tempPosY;
+          asBone.position.z = -tempPosY;
 
           const [x, y, z, w] = asBone.quaternion.toArray();
           asBone.quaternion.set(x, -y, -z, w);

tools/gltf-avatar-exporter/src/scene/correction-steps/runFixes.ts

@@ -4,10 +4,12 @@ import { fixFlippedBitmapTexturesCorrectionStep } from "./fixBitmapTextures";
 import { fixBonesScaleCorrectionStep } from "./fixBonesScale";
 import { fixMeshScaleCorrectionStep } from "./fixMeshScale";
 import { levelOfDetailDedupingCorrectionStep } from "./lodDeduping";
+import { mergeGeometryGroupsCorrectionStep } from "./mergeGeometryGroups";
 import { placeholderMissingTexturesCorrectionStep } from "./placeholderMissingTextures";
 import { removeTransparencyFromMaterialsCorrectionStep } from "./removeTransparencyFromMaterials";
 import { removeVertexColorsCorrectionStep } from "./removeVertexColors";
 import { replaceIncompatibleMaterialsCorrectionStep } from "./replaceIncompatibleMaterials";
+import { reposeBonesCorrectionStep } from "./reposeBones";
 import { rotatePelvisCorrectionStep } from "./rotatePelvis";
 import { rotateRootCorrectionStep } from "./rotateRoot";
 import { rotateWholeGroupCorrectionStep } from "./rotateWholeGroup";
@@ -16,12 +18,14 @@ import { zUpMeshCorrectionStep } from "./zUpMeshCorrectionStep";
 
 export const correctionSteps = [
   levelOfDetailDedupingCorrectionStep,
+  mergeGeometryGroupsCorrectionStep,
+  boneDedupingCorrectionStep,
   rotateWholeGroupCorrectionStep,
   zUpMeshCorrectionStep,
   zUpBonesCorrectionStep,
   fixMeshScaleCorrectionStep,
+  reposeBonesCorrectionStep,
   fixBonesScaleCorrectionStep,
-  boneDedupingCorrectionStep,
   connectRootCorrectionStep,
   rotateRootCorrectionStep,
   rotatePelvisCorrectionStep,