Fix type check

packages/3d-web-client-core/src/character/Character.ts

@@ -17,21 +17,22 @@ export type AnimationConfig = {
   doubleJumpAnimationFileUrl: string;
 };
 
-export type CharacterDescription = {
-  meshFileUrl?: string;
-  mmlCharacterUrl?: string;
-  mmlCharacterString?: string;
-} & (
+export type CharacterDescription =
   | {
       meshFileUrl: string;
+      mmlCharacterString?: null;
+      mmlCharacterUrl?: null;
     }
   | {
-      mmlCharacterUrl: string;
-    }
-  | {
+      meshFileUrl?: null;
       mmlCharacterString: string;
+      mmlCharacterUrl?: null;
     }
-);
+  | {
+      meshFileUrl?: null;
+      mmlCharacterString?: null;
+      mmlCharacterUrl: string;
+    };
 
 export type CharacterConfig = {
   username: string;
@@ -161,11 +162,7 @@ export class Character extends Group {
     const tooltip = new CharacterTooltip({
       maxWidth: 1000,
       secondsToFadeOut: 10,
-      color: {
-        r: 0.125,
-        g: 0.125,
-        b: 0.125,
-      },
+      color: new Color(0.125, 0.125, 0.125),
     });
     this.add(tooltip);
     this.chatTooltips.push(tooltip);

packages/3d-web-client-core/src/character/CharacterModel.ts

@@ -229,17 +229,19 @@ export class CharacterModel {
   }
 
   private cleanAnimationClips(
-    skeletalMesh: Object3D,
+    skeletalMesh: Object3D | null,
     animationClip: AnimationClip,
     keepRootBonePositionAnimation: boolean,
   ): AnimationClip {
     const availableBones = new Set<string>();
-    skeletalMesh.traverse((child) => {
-      const asBone = child as Bone;
-      if (asBone.isBone) {
-        availableBones.add(child.name);
-      }
-    });
+    if (skeletalMesh) {
+      skeletalMesh.traverse((child) => {
+        const asBone = child as Bone;
+        if (asBone.isBone) {
+          availableBones.add(child.name);
+        }
+      });
+    }
     animationClip.tracks = animationClip.tracks.filter((track) => {
       const [trackName, trackProperty] = track.name.split(".");
       if (keepRootBonePositionAnimation && trackName === "root" && trackProperty === "position") {

packages/3d-web-client-core/src/mml/MMLCompositionScene.ts

@@ -99,7 +99,6 @@ export class MMLCompositionScene {
       hasGraphicsAdapter(): boolean {
         return true;
       },
-      getRootContainer: () => this.group,
       addCollider: (object: Object3D, mElement: MElement<ThreeJSGraphicsAdapter>) => {
         this.config.collisionsManager.addMeshesGroup(object as Group, mElement);
       },

packages/3d-web-user-networking/src/UserNetworkingMessages.ts

@@ -13,21 +13,22 @@ export type UserNetworkingIdentityMessage = {
   id: number;
 };
 
-export type CharacterDescription = {
-  meshFileUrl?: string;
-  mmlCharacterUrl?: string;
-  mmlCharacterString?: string;
-} & (
+export type CharacterDescription =
   | {
       meshFileUrl: string;
+      mmlCharacterString?: null;
+      mmlCharacterUrl?: null;
     }
   | {
-      mmlCharacterUrl: string;
-    }
-  | {
+      meshFileUrl?: null;
       mmlCharacterString: string;
+      mmlCharacterUrl?: null;
     }
-);
+  | {
+      meshFileUrl?: null;
+      mmlCharacterString?: null;
+      mmlCharacterUrl: string;
+    };
 
 export type UserNetworkingProfileMessage = {
   type: typeof USER_NETWORKING_USER_PROFILE_MESSAGE_TYPE;