@mml-io/3d-web-client-core 0.0.0-experimental-8e179c2-20240414 → 0.0.0-experimental-a61f041-20240424

package/build/character/Character.d.ts

@@ -15,9 +15,16 @@ export type CharacterDescription = {
     meshFileUrl?: string;
     mmlCharacterUrl?: string;
     mmlCharacterString?: string;
-};
+} & ({
+    meshFileUrl: string;
+} | {
+    mmlCharacterUrl: string;
+} | {
+    mmlCharacterString: string;
+});
 export declare class Character extends Group {
-    private readonly characterDescription;
+    private username;
+    private characterDescription;
     private readonly animationConfig;
     private readonly characterModelLoader;
     private readonly characterId;
@@ -27,9 +34,10 @@ export declare class Character extends Group {
     private readonly isLocal;
     private model;
     color: Color;
-    tooltip: CharacterTooltip | null;
+    tooltip: CharacterTooltip;
     speakingIndicator: CharacterSpeakingIndicator | null;
-    constructor(characterDescription: CharacterDescription, animationConfig: AnimationConfig, characterModelLoader: CharacterModelLoader, characterId: number, modelLoadedCallback: () => void, cameraManager: CameraManager, composer: Composer, isLocal: boolean);
+    constructor(username: string, characterDescription: CharacterDescription, animationConfig: AnimationConfig, characterModelLoader: CharacterModelLoader, characterId: number, modelLoadedCallback: () => void, cameraManager: CameraManager, composer: Composer, isLocal: boolean);
+    updateCharacter(username: string, characterDescription: CharacterDescription): void;
     private load;
     updateAnimation(targetAnimation: AnimationState): void;
     update(time: number, deltaTime: number): void;

package/build/character/CharacterManager.d.ts

@@ -19,10 +19,10 @@ export declare class CharacterManager {
     private readonly clientStates;
     private readonly sendUpdate;
     private readonly animationConfig;
-    private readonly characterDescription;
+    private readonly characterResolve;
     private updateLocationHash;
     readonly headTargetOffset: Vector3;
-    private id;
+    private localClientId;
     remoteCharacters: Map<number, Character>;
     remoteCharacterControllers: Map<number, RemoteController>;
     private localCharacterSpawned;
@@ -30,11 +30,15 @@ export declare class CharacterManager {
     localCharacter: Character | null;
     private speakingCharacters;
     readonly group: Group;
-    constructor(composer: Composer, characterModelLoader: CharacterModelLoader, collisionsManager: CollisionsManager, cameraManager: CameraManager, timeManager: TimeManager, keyInputManager: KeyInputManager, clientStates: Map<number, CharacterState>, sendUpdate: (update: CharacterState) => void, animationConfig: AnimationConfig, characterDescription: CharacterDescription);
-    spawnLocalCharacter(characterDescription: CharacterDescription, id: number, spawnPosition?: Vector3, spawnRotation?: Euler): void;
-    spawnRemoteCharacter(characterDescription: CharacterDescription, id: number, spawnPosition?: Vector3, spawnRotation?: Euler): void;
+    constructor(composer: Composer, characterModelLoader: CharacterModelLoader, collisionsManager: CollisionsManager, cameraManager: CameraManager, timeManager: TimeManager, keyInputManager: KeyInputManager, clientStates: Map<number, CharacterState>, sendUpdate: (update: CharacterState) => void, animationConfig: AnimationConfig, characterResolve: (clientId: number) => {
+        username: string;
+        characterDescription: CharacterDescription;
+    });
+    spawnLocalCharacter(id: number, username: string, characterDescription: CharacterDescription, spawnPosition?: Vector3, spawnRotation?: Euler): void;
+    spawnRemoteCharacter(id: number, username: string, characterDescription: CharacterDescription, spawnPosition?: Vector3, spawnRotation?: Euler): void;
     getLocalCharacterPositionAndRotation(): PositionAndRotation;
     clear(): void;
     setSpeakingCharacter(id: number, value: boolean): void;
+    respawnIfPresent(id: number): void;
     update(): void;
 }

package/build/index.js

@@ -1175,7 +1175,7 @@ var defaultLabelColor = new Color2(0);
 var defaultFontColor = new Color2(16777215);
 var defaultLabelAlignment = "center" /* center */;
 var defaultLabelFontSize = 8;
-var defaultLabelPadding = 0;
+var defaultLabelPadding = 8;
 var defaultLabelWidth = 0.25;
 var defaultLabelHeight = 0.1;
 var defaultLabelCastShadows = true;
@@ -1231,10 +1231,6 @@ var CharacterTooltip = class extends Mesh3 {
         b: this.props.color.b * 255,
         a: 1
       },
-      dimensions: {
-        width: this.props.width * (100 * fontScale),
-        height: this.props.height * (100 * fontScale)
-      },
       alignment: this.props.alignment
     });
     this.tooltipMaterial.map = texture;
@@ -1246,7 +1242,8 @@ var CharacterTooltip = class extends Mesh3 {
     this.position.y = 1.4;
   }
   setText(text, temporary = false) {
-    this.redrawText(text);
+    const sanitizedText = text.replace(/(\r\n|\n|\r)/gm, "");
+    this.redrawText(sanitizedText);
     this.visible = true;
     this.targetOpacity = this.visibleOpacity;
     if (temporary) {
@@ -1287,8 +1284,9 @@ var CharacterTooltip = class extends Mesh3 {
 
 // src/character/Character.ts
 var Character = class extends Group {
-  constructor(characterDescription, animationConfig, characterModelLoader, characterId, modelLoadedCallback, cameraManager, composer, isLocal) {
+  constructor(username, characterDescription, animationConfig, characterModelLoader, characterId, modelLoadedCallback, cameraManager, composer, isLocal) {
     super();
+    this.username = username;
     this.characterDescription = characterDescription;
     this.animationConfig = animationConfig;
     this.characterModelLoader = characterModelLoader;
@@ -1299,13 +1297,22 @@ var Character = class extends Group {
     this.isLocal = isLocal;
     this.model = null;
     this.color = new Color3();
-    this.tooltip = null;
     this.speakingIndicator = null;
     this.tooltip = new CharacterTooltip();
+    this.tooltip.setText(this.username, isLocal);
     this.add(this.tooltip);
+    this.load().then(() => {
+      this.modelLoadedCallback();
+    });
+  }
+  updateCharacter(username, characterDescription) {
+    this.username = username;
+    this.characterDescription = characterDescription;
     this.load();
+    this.tooltip.setText(username, this.isLocal);
   }
-  async load() {
+  async load(callback) {
+    const previousModel = this.model;
     this.model = new CharacterModel(
       this.characterDescription,
       this.animationConfig,
@@ -1315,11 +1322,13 @@ var Character = class extends Group {
       this.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.composer.postPostScene);
     }
-    this.modelLoadedCallback();
   }
   updateAnimation(targetAnimation) {
     var _a;
@@ -1732,7 +1741,7 @@ function decodeCharacterAndCamera(hash) {
 
 // src/character/CharacterManager.ts
 var CharacterManager = class {
-  constructor(composer, characterModelLoader, collisionsManager, cameraManager, timeManager, keyInputManager, clientStates, sendUpdate, animationConfig, characterDescription) {
+  constructor(composer, characterModelLoader, collisionsManager, cameraManager, timeManager, keyInputManager, clientStates, sendUpdate, animationConfig, characterResolve) {
     this.composer = composer;
     this.characterModelLoader = characterModelLoader;
     this.collisionsManager = collisionsManager;
@@ -1742,10 +1751,10 @@ var CharacterManager = class {
     this.clientStates = clientStates;
     this.sendUpdate = sendUpdate;
     this.animationConfig = animationConfig;
-    this.characterDescription = characterDescription;
+    this.characterResolve = characterResolve;
     this.updateLocationHash = true;
     this.headTargetOffset = new Vector38(0, 1.3, 0);
-    this.id = 0;
+    this.localClientId = 0;
     this.remoteCharacters = /* @__PURE__ */ new Map();
     this.remoteCharacterControllers = /* @__PURE__ */ new Map();
     this.localCharacterSpawned = false;
@@ -1753,9 +1762,9 @@ var CharacterManager = class {
     this.speakingCharacters = /* @__PURE__ */ new Map();
     this.group = new Group2();
   }
-  spawnLocalCharacter(characterDescription, id, spawnPosition = new Vector38(), spawnRotation = new Euler2()) {
-    var _a;
+  spawnLocalCharacter(id, username, characterDescription, spawnPosition = new Vector38(), spawnRotation = new Euler2()) {
     const character = new Character(
+      username,
       characterDescription,
       this.animationConfig,
       this.characterModelLoader,
@@ -1777,11 +1786,11 @@ var CharacterManager = class {
       rotation: { quaternionY: quaternion.y, quaternionW: quaternion.w },
       state: 0 /* idle */
     });
-    this.id = id;
+    this.localClientId = id;
     this.localCharacter = character;
     this.localController = new LocalController(
       this.localCharacter,
-      this.id,
+      this.localClientId,
       this.collisionsManager,
       this.keyInputManager,
       this.cameraManager,
@@ -1789,13 +1798,12 @@ var CharacterManager = class {
     );
     this.localCharacter.position.set(spawnPosition.x, spawnPosition.y, spawnPosition.z);
     this.localCharacter.rotation.set(spawnRotation.x, spawnRotation.y, spawnRotation.z);
-    (_a = character.tooltip) == null ? void 0 : _a.setText(`${id}`, true);
     this.group.add(character);
     this.localCharacterSpawned = true;
   }
-  spawnRemoteCharacter(characterDescription, id, spawnPosition = new Vector38(), spawnRotation = new Euler2()) {
-    var _a;
+  spawnRemoteCharacter(id, username, characterDescription, spawnPosition = new Vector38(), spawnRotation = new Euler2()) {
     const character = new Character(
+      username,
       characterDescription,
       this.animationConfig,
       this.characterModelLoader,
@@ -1811,7 +1819,6 @@ var CharacterManager = class {
     remoteController.character.position.set(spawnPosition.x, spawnPosition.y, spawnPosition.z);
     remoteController.character.rotation.set(spawnRotation.x, spawnRotation.y, spawnRotation.z);
     this.remoteCharacterControllers.set(id, remoteController);
-    (_a = character.tooltip) == null ? void 0 : _a.setText(`${id}`);
     this.group.add(character);
   }
   getLocalCharacterPositionAndRotation() {
@@ -1840,12 +1847,27 @@ var CharacterManager = class {
   setSpeakingCharacter(id, value) {
     this.speakingCharacters.set(id, value);
   }
+  respawnIfPresent(id) {
+    const characterInfo = this.characterResolve(id);
+    if (this.localCharacter && this.localClientId == id) {
+      this.localCharacter.updateCharacter(
+        characterInfo.username,
+        characterInfo.characterDescription
+      );
+    }
+    const remoteCharacter = this.remoteCharacters.get(id);
+    if (remoteCharacter) {
+      remoteCharacter.updateCharacter(characterInfo.username, characterInfo.characterDescription);
+    }
+  }
   update() {
     var _a, _b, _c;
     if (this.localCharacter) {
       this.localCharacter.update(this.timeManager.time, this.timeManager.deltaTime);
-      if (this.speakingCharacters.has(this.id)) {
-        (_a = this.localCharacter.speakingIndicator) == null ? void 0 : _a.setSpeaking(this.speakingCharacters.get(this.id));
+      if (this.speakingCharacters.has(this.localClientId)) {
+        (_a = this.localCharacter.speakingIndicator) == null ? void 0 : _a.setSpeaking(
+          this.speakingCharacters.get(this.localClientId)
+        );
       }
       this.localController.update();
       if (this.timeManager.frame % 2 === 0) {
@@ -1861,9 +1883,11 @@ var CharacterManager = class {
         }
         const { position } = update;
         if (!this.remoteCharacters.has(id) && this.localCharacterSpawned === true) {
+          const characterInfo = this.characterResolve(id);
           this.spawnRemoteCharacter(
-            this.characterDescription,
             id,
+            characterInfo.username,
+            characterInfo.characterDescription,
             new Vector38(position.x, position.y, position.z)
           );
         }