From ff7b31a34b34ac4986b06cc2cef1ba99b8740c1a Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Wed, 22 Apr 2026 17:04:28 +0200
Subject: [PATCH] auto-git:  [change]
 src/runtime-three/third-person-navigation-controller.ts

---
 .../third-person-navigation-controller.ts     | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/runtime-three/third-person-navigation-controller.ts b/src/runtime-three/third-person-navigation-controller.ts
index f3b6f02f..b061c981 100644
--- a/src/runtime-three/third-person-navigation-controller.ts
+++ b/src/runtime-three/third-person-navigation-controller.ts
@@ -278,18 +278,26 @@ export class ThirdPersonNavigationController implements NavigationController {
       runtimeScene.playerInputBindings
     );
 
-    if (lookInput.horizontal !== 0 || lookInput.vertical !== 0) {
+    if (
+      this.context.isCameraDrivenExternally() !== true &&
+      (lookInput.horizontal !== 0 || lookInput.vertical !== 0)
+    ) {
       this.cameraYawRadians -= lookInput.horizontal * GAMEPAD_LOOK_SPEED * dt;
       this.pitchRadians = clampPitch(
         this.pitchRadians - lookInput.vertical * GAMEPAD_LOOK_SPEED * dt
       );
     }
 
+    const movementYawRadians =
+      this.context.isCameraDrivenExternally() === true
+        ? this.context.getCameraYawRadians()
+        : this.cameraYawRadians;
+
     const locomotionStep = stepPlayerLocomotion(
       {
         dt,
         feetPosition: this.feetPosition,
-        movementYawRadians: this.cameraYawRadians,
+        movementYawRadians,
         airDirectionYawRadians: this.yawRadians,
         standingShape: this.standingPlayerShape,
         verticalVelocity: this.verticalVelocity,
@@ -500,7 +508,8 @@ export class ThirdPersonNavigationController implements NavigationController {
   private handlePointerDown = (event: PointerEvent) => {
     if (
       event.button !== 0 ||
-      this.context?.isInputSuspended() === true
+      this.context?.isInputSuspended() === true ||
+      this.context?.isCameraDrivenExternally() === true
     ) {
       return;
     }
@@ -513,7 +522,8 @@ export class ThirdPersonNavigationController implements NavigationController {
   private handlePointerMove = (event: PointerEvent) => {
     if (
       !this.dragging ||
-      this.context?.isInputSuspended() === true
+      this.context?.isInputSuspended() === true ||
+      this.context?.isCameraDrivenExternally() === true
     ) {
       return;
     }
@@ -534,7 +544,10 @@ export class ThirdPersonNavigationController implements NavigationController {
   };
 
   private handleWheel = (event: WheelEvent) => {
-    if (this.context?.isInputSuspended() === true) {
+    if (
+      this.context?.isInputSuspended() === true ||
+      this.context?.isCameraDrivenExternally() === true
+    ) {
       return;
     }