giers10/webeditor3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor pointer lock handling and controller deactivation logic in RuntimeHost

Browse Source
This commit is contained in:
Victor Giers
2026-04-27 17:19:12 +02:00
parent ad93296e6e
commit 9142330a14
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/runtime-three/runtime-host.ts
View File

@@ -1071,8 +1071,8 @@ export class RuntimeHost {
loadScene(runtimeScene: RuntimeSceneDefinition) { loadScene(runtimeScene: RuntimeSceneDefinition) {
const requestId = ++this.collisionWorldRequestId; const requestId = ++this.collisionWorldRequestId;
const preservePointerLockDuringLoad = const preservePointerLockDuringLoad =
this.activeController === this.firstPersonController && this.activeController !== null &&
this.desiredNavigationMode === "firstPerson" && this.activeController.id === this.desiredNavigationMode &&
document.pointerLockElement === this.domElement; document.pointerLockElement === this.domElement;
this.sceneReady = false; this.sceneReady = false;
@@ -1526,7 +1526,13 @@ export class RuntimeHost {
return; return;
} }
this.activeController?.deactivate(this.controllerContext); const preservePointerLockDuringControllerSwitch =
this.activeController !== null &&
document.pointerLockElement === this.domElement;
this.activeController?.deactivate(this.controllerContext, {
releasePointerLock: !preservePointerLockDuringControllerSwitch
});
this.interactionSystem.reset(); this.interactionSystem.reset();
this.setInteractionPrompt(null); this.setInteractionPrompt(null);
if (nextController === this.firstPersonController) { if (nextController === this.firstPersonController) {