From ff6f7cd30a51d8963a632b3f39a8bee48d176e34 Mon Sep 17 00:00:00 2001
From: Marcus Longmuir <marcus@mpl.dev>
Date: Tue, 16 Jul 2024 17:18:54 +0100
Subject: [PATCH] Fixed loading avatars with interleaved buffers

---
 .../src/character/MMLCharacter.ts             | 33 +++++++++++++------
 .../src/character/Character.ts                |  6 ++--
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/3d-web-avatar/src/character/MMLCharacter.ts b/packages/3d-web-avatar/src/character/MMLCharacter.ts
index e14447a8..60e4c01e 100644
--- a/packages/3d-web-avatar/src/character/MMLCharacter.ts
+++ b/packages/3d-web-avatar/src/character/MMLCharacter.ts
@@ -1,5 +1,14 @@
 import { ModelLoadResult } from "@mml-io/model-loader";
-import { Bone, BufferAttribute, Group, MathUtils, Object3D, Skeleton, SkinnedMesh } from "three";
+import {
+  Bone,
+  BufferAttribute,
+  Group,
+  InterleavedBufferAttribute,
+  MathUtils,
+  Object3D,
+  Skeleton,
+  SkinnedMesh,
+} from "three";
 
 import { MMLCharacterDescriptionPart } from "../helpers/parseMMLDescription";
 
@@ -33,20 +42,24 @@ export class MMLCharacter {
     const boneIndexMap = this.createBoneIndexMap(originSkeleton, targetSkeleton);
 
     const newSkinIndexArray = [];
-    for (let i = 0; i < originGeometry.attributes.skinIndex.array.length; i++) {
-      const originIndex = originGeometry.attributes.skinIndex.array[i];
+    const missingBoneIndices = new Set();
+
+    const skinIndexAttribute = originGeometry.attributes.skinIndex;
+    for (let i = 0; i < skinIndexAttribute.count; i++) {
+      const originIndex = skinIndexAttribute.getComponent(i, 0);
       const targetIndex = boneIndexMap.get(originIndex);
       if (targetIndex !== undefined) {
-        newSkinIndexArray.push(targetIndex);
+        skinIndexAttribute.setComponent(i, 0, targetIndex);
       } else {
-        console.error("Missing bone index", originIndex);
-        newSkinIndexArray.push(0);
+        missingBoneIndices.add(originIndex);
       }
     }
-    skinnedMesh.geometry.attributes.skinIndex = new BufferAttribute(
-      new Uint8Array(newSkinIndexArray),
-      4,
-    );
+
+    if (missingBoneIndices.size > 0) {
+      console.warn(
+        `Missing bone indices in skinIndex attribute: ${Array.from(missingBoneIndices).join(", ")}`,
+      );
+    }
   }
 
   public async mergeBodyParts(
diff --git a/packages/3d-web-client-core/src/character/Character.ts b/packages/3d-web-client-core/src/character/Character.ts
index 357d3311..11b348f8 100644
--- a/packages/3d-web-client-core/src/character/Character.ts
+++ b/packages/3d-web-client-core/src/character/Character.ts
@@ -70,6 +70,9 @@ export class Character extends Group {
 
   private async load(): Promise<void> {
     const previousModel = this.model;
+    if (previousModel && previousModel.mesh) {
+      this.remove(previousModel.mesh!);
+    }
     this.model = new CharacterModel({
       characterDescription: this.config.characterDescription,
       animationConfig: this.config.animationConfig,
@@ -79,9 +82,6 @@ export class Character extends Group {
       isLocal: this.config.isLocal,
     });
     await this.model.init();
-    if (previousModel && previousModel.mesh) {
-      this.remove(previousModel.mesh!);
-    }
     this.add(this.model.mesh!);
     if (this.speakingIndicator === null) {
       this.speakingIndicator = new CharacterSpeakingIndicator(this.config.composer.postPostScene);