From 38a7a23c5f22e54eeb60696e229dbf742abbe2da Mon Sep 17 00:00:00 2001 From: dingo Date: Sun, 29 Mar 2026 09:39:11 -0400 Subject: [PATCH] Fix browser multi-touch: prevent camera spin during pinch gestures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add _was_multi_touch flag: set when second finger lands, cleared only when all fingers lift — prevents single-finger orbit logic from running during a pinch even if ScreenDrag(finger-0) arrives before ScreenTouch(finger-1) - Handle InputEventMagnifyGesture (trackpad/browser pinch-to-zoom) and InputEventPanGesture (two-finger pan) which browsers emit instead of raw dual ScreenDrag events - Initialize _last_mouse from touch pair midpoint when second finger lands so two-finger pan has a correct delta baseline Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy --- .../origin-client/scenes/game/game_screen.gd | 50 ++++++++++++++++--- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/Client/origin-client/scenes/game/game_screen.gd b/Client/origin-client/scenes/game/game_screen.gd index 8dbd8d4..cc63f2c 100644 --- a/Client/origin-client/scenes/game/game_screen.gd +++ b/Client/origin-client/scenes/game/game_screen.gd @@ -116,10 +116,14 @@ var _cam_pivot : Vector3 = Vector3.ZERO var _drag_active : bool = false var _press_was_on_board: bool = false # true only when the PRESS came from unhandled_input (board, not a UI card) var _camera_oriented : bool = false -var _pan_active : bool = false -var _last_mouse : Vector2 = Vector2.ZERO -var _touch_points : Dictionary = {} -var _pinch_dist : float = 0.0 +var _pan_active : bool = false +var _last_mouse : Vector2 = Vector2.ZERO +var _touch_points : Dictionary = {} +var _pinch_dist : float = 0.0 +# True from the moment a second finger lands until ALL fingers lift. +# Prevents single-finger orbit from triggering during a pinch gesture even +# if a ScreenDrag for finger-0 arrives before finger-1's ScreenTouch is processed. +var _was_multi_touch : bool = false # ── Selection state ─────────────────────────────────────────────────────────── @@ -842,22 +846,26 @@ func _unhandled_input(event: InputEvent) -> void: var st := event as InputEventScreenTouch if st.pressed: _touch_points[st.index] = st.position - if _touch_points.size() == 2: - _pinch_dist = _touch_pair_dist() + if _touch_points.size() >= 2: + _pinch_dist = _touch_pair_dist() + _last_mouse = _touch_pair_mid() + _was_multi_touch = true _hold_timer.stop() else: _touch_points.erase(st.index) + if _touch_points.is_empty(): + _was_multi_touch = false elif event is InputEventScreenDrag: var sd := event as InputEventScreenDrag _touch_points[sd.index] = sd.position - if _touch_points.size() == 1: + if _touch_points.size() == 1 and not _was_multi_touch: _cam_yaw -= sd.relative.x * 0.4 _cam_pitch = clampf(_cam_pitch + sd.relative.y * 0.3, 15.0, 75.0) _apply_camera() if sd.relative.length() > 2.0: _hold_timer.stop() - elif _touch_points.size() == 2: + elif _touch_points.size() >= 2: var keys := _touch_points.keys() var pos_a : Vector2 = _touch_points[keys[0]] var pos_b : Vector2 = _touch_points[keys[1]] @@ -878,11 +886,37 @@ func _unhandled_input(event: InputEvent) -> void: _apply_camera() + # ── Browser high-level gesture events (Chromium / WebKit) ────────────────── + # Browsers sometimes emit these *instead of* dual ScreenDrag events. + # factor > 1.0 = spreading (zoom in), < 1.0 = pinching (zoom out). + elif event is InputEventMagnifyGesture: + var mg := event as InputEventMagnifyGesture + _zoom((mg.factor - 1.0) * 8.0) + + elif event is InputEventPanGesture: + var pg := event as InputEventPanGesture + var ps := _cam_distance * 0.004 + var right := _camera_rig.global_basis.x * -pg.delta.x * ps + var fwd := Vector3(_camera_rig.global_basis.z.x, 0, + _camera_rig.global_basis.z.z).normalized() + _cam_pivot += right + fwd * pg.delta.y * ps + var pan_lim3 := clampf(max(Game.board_width(), Game.board_height()) * TILE_SPACING * 0.5, 6.0, 20.0) + _cam_pivot.x = clampf(_cam_pivot.x, -pan_lim3, pan_lim3) + _cam_pivot.z = clampf(_cam_pivot.z, -pan_lim3, pan_lim3) + _apply_camera() + + func _touch_pair_dist() -> float: var keys := _touch_points.keys() if keys.size() < 2: return 0.0 return (_touch_points[keys[0]] as Vector2).distance_to(_touch_points[keys[1]]) + +func _touch_pair_mid() -> Vector2: + var keys := _touch_points.keys() + if keys.size() < 2: return Vector2.ZERO + return ((_touch_points[keys[0]] as Vector2) + (_touch_points[keys[1]] as Vector2)) * 0.5 + # ── Coord helpers ───────────────────────────────────────────────────────────── ## Grid spacing: 1.0 tile + 0.1 gap between tiles (visual only).