Merge branch 'main' into feature/collisions-debug-toggle

mml-io · May 13, 2024 · 91b0015 · 91b0015
2 parents 6b84675 + a3bab94
commit 91b0015
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/3d-web-client-core/src/character/CharacterManager.ts b/packages/3d-web-client-core/src/character/CharacterManager.ts
@@ -31,11 +31,10 @@ export type CharacterManagerConfig = {
     username: string;
     characterDescription: CharacterDescription;
   };
+  updateLocationHash?: boolean;
 };
 
 export class CharacterManager {
-  private updateLocationHash = true;
-
   public readonly headTargetOffset = new Vector3(0, 1.3, 0);
 
   private localClientId: number = 0;
@@ -234,7 +233,7 @@ export class CharacterManager {
         }
       }
 
-      if (this.updateLocationHash && this.config.timeManager.frame % 60 === 0) {
+      if (this.config.updateLocationHash && this.config.timeManager.frame % 60 === 0) {
         window.location.hash = encodeCharacterAndCamera(
           this.localCharacter,
           this.config.cameraManager.camera,

diff --git a/packages/3d-web-experience-client/src/Networked3dWebExperienceClient.ts b/packages/3d-web-experience-client/src/Networked3dWebExperienceClient.ts
@@ -208,6 +208,7 @@ export class Networked3dWebExperienceClient {
       characterResolve: (characterId: number) => {
         return this.resolveCharacterData(characterId);
       },
+      updateLocationHash: true,
     });
     this.scene.add(this.characterManager.group);