From 75750571dedb053d5ca85b5f25c59b5486396372 Mon Sep 17 00:00:00 2001
From: bmathews <spoonart@gmail.com>
Date: Fri, 14 Nov 2025 00:15:28 -0800
Subject: [PATCH] Improve mouse controls

---
 app/InspectorControls.tsx |  6 ++++-
 app/ObserverControls.tsx  | 51 +++++++++++++++++++++++++++++++++++----
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/app/InspectorControls.tsx b/app/InspectorControls.tsx
index c0a5ade0..011084f8 100644
--- a/app/InspectorControls.tsx
+++ b/app/InspectorControls.tsx
@@ -24,7 +24,11 @@ export function InspectorControls({
   onChangeFogEnabled: (enabled: boolean) => void;
 }) {
   return (
-    <div id="controls">
+    <div
+      id="controls"
+      onPointerDown={(e) => e.stopPropagation()}
+      onClick={(e) => e.stopPropagation()}
+    >
       <select
         id="missionList"
         value={missionName}
diff --git a/app/ObserverControls.tsx b/app/ObserverControls.tsx
index 1238f29b..f3e15bf9 100644
--- a/app/ObserverControls.tsx
+++ b/app/ObserverControls.tsx
@@ -1,9 +1,10 @@
-import { KeyboardControls, PointerLockControls } from "@react-three/drei";
+import { KeyboardControls } from "@react-three/drei";
 
-import { useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useFrame, useThree } from "@react-three/fiber";
 import { useKeyboardControls } from "@react-three/drei";
 import * as THREE from "three";
+import { PointerLockControls } from "three-stdlib";
 
 enum Controls {
   forward = "forward",
@@ -18,13 +19,54 @@ const BASE_SPEED = 100; // units per second
 
 function CameraMovement() {
   const [subscribe, getKeys] = useKeyboardControls<Controls>();
-  const { camera } = useThree();
+  const { camera, gl } = useThree();
+  const [speedMultiplier, setSpeedMultiplier] = useState(1);
+  const controlsRef = useRef<PointerLockControls | null>(null);
 
   // Scratch vectors to avoid allocations each frame
   const forwardVec = useRef(new THREE.Vector3());
   const sideVec = useRef(new THREE.Vector3());
   const moveVec = useRef(new THREE.Vector3());
 
+  // Setup pointer lock controls
+  useEffect(() => {
+    const controls = new PointerLockControls(camera, gl.domElement);
+    controlsRef.current = controls;
+
+    const handleClick = (e: MouseEvent) => {
+      // Only lock if clicking directly on the canvas (not on UI elements)
+      if (e.target === gl.domElement) {
+        controls.lock();
+      }
+    };
+
+    gl.domElement.addEventListener("click", handleClick);
+
+    return () => {
+      gl.domElement.removeEventListener("click", handleClick);
+      controls.dispose();
+    };
+  }, [camera, gl]);
+
+  // Handle mousewheel for speed adjustment
+  useEffect(() => {
+    const handleWheel = (e: WheelEvent) => {
+      e.preventDefault();
+
+      // Adjust speed based on wheel direction
+      const delta = e.deltaY > 0 ? 0.75 : 1.25;
+
+      setSpeedMultiplier((prev) => Math.max(0.05, Math.min(5, prev * delta)));
+    };
+
+    const canvas = gl.domElement;
+    canvas.addEventListener("wheel", handleWheel, { passive: false });
+
+    return () => {
+      canvas.removeEventListener("wheel", handleWheel);
+    };
+  }, [gl]);
+
   useFrame((_, delta) => {
     const { forward, backward, left, right, up, down } = getKeys();
 
@@ -32,7 +74,7 @@ function CameraMovement() {
       return;
     }
 
-    const speed = BASE_SPEED;
+    const speed = BASE_SPEED * speedMultiplier;
 
     // Forward/backward: take complete camera angle into account (including Y)
     camera.getWorldDirection(forwardVec.current);
@@ -84,7 +126,6 @@ export function ObserverControls() {
   return (
     <KeyboardControls map={KEYBOARD_CONTROLS}>
       <CameraMovement />
-      <PointerLockControls makeDefault />
     </KeyboardControls>
   );
 }