rnd(M02): extract third-person camera rig

Work-Package: M02-RND-CAMERA-001

src/scenes/player/camera_collision_policy.gd

@@ -0,0 +1,15 @@
+class_name CameraCollisionPolicy
+extends RefCounted
+
+## Replaceable third-person camera-distance policy.
+## Implementations may inspect the explicit pivot/world boundary but must return
+## a distance in Godot units without mutating the rig or camera nodes.
+
+
+## Resolves the camera distance for the current pivot and requested zoom.
+## The base policy preserves the request unchanged.
+func resolve_camera_distance(
+		_camera_pivot: Node3D,
+		requested_distance_units: float
+) -> float:
+	return requested_distance_units

src/scenes/player/camera_collision_policy.gd.uid

@@ -0,0 +1 @@
+uid://bgd41bb3hvbl1

src/scenes/player/no_camera_collision_policy.gd

@@ -0,0 +1,12 @@
+class_name NoCameraCollisionPolicy
+extends CameraCollisionPolicy
+
+## Identity collision policy preserving the pre-M02 sandbox camera behavior.
+
+
+## Returns the requested distance without physics queries or allocations.
+func resolve_camera_distance(
+		_camera_pivot: Node3D,
+		requested_distance_units: float
+) -> float:
+	return requested_distance_units

src/scenes/player/no_camera_collision_policy.gd.uid

@@ -0,0 +1 @@
+uid://csts45n5rnxro

src/scenes/player/third_person_camera_rig.gd

@@ -0,0 +1,169 @@
+class_name ThirdPersonCameraRig
+extends Node3D
+
+## Third-person orbit/zoom state and Camera3D presentation adapter.
+## The rig owns camera input state and local transforms. Character movement,
+## terrain, rendering and collision-policy decisions remain external boundaries.
+
+const NO_CAMERA_COLLISION_POLICY_SCRIPT := preload("res://src/scenes/player/no_camera_collision_policy.gd")
+
+## Relative Camera3D child used by this rig.
+@export var camera_path: NodePath = NodePath("Camera3D")
+## Mouse radians applied per input pixel.
+@export var mouse_sensitivity_radians_per_pixel: float = 0.003
+## Minimum orbit pitch in radians.
+@export var minimum_pitch_radians: float = deg_to_rad(-65.0)
+## Maximum orbit pitch in radians.
+@export var maximum_pitch_radians: float = deg_to_rad(35.0)
+## Pivot height above the character origin in Godot units.
+@export var pivot_height_units: float = 1.7
+## Initial requested camera distance in Godot units.
+@export var initial_distance_units: float = 8.0
+## Minimum user-requested zoom distance in Godot units.
+@export var minimum_distance_units: float = 2.0
+## Maximum user-requested zoom distance in Godot units.
+@export var maximum_distance_units: float = 18.0
+## Distance change per zoom action in Godot units.
+@export var zoom_step_units: float = 1.0
+## Camera far plane retained from the renderer sandbox baseline.
+@export var camera_far_plane_units: float = 50000.0
+
+var yaw_radians: float:
+	get:
+		return _yaw_radians
+
+var pitch_radians: float:
+	get:
+		return _pitch_radians
+
+var requested_distance_units: float:
+	get:
+		return _requested_distance_units
+
+var resolved_distance_units: float:
+	get:
+		return _resolved_distance_units
+
+var is_mouse_captured: bool:
+	get:
+		return _is_mouse_captured
+
+var _character_body: Node3D
+var _camera: Camera3D
+var _collision_policy: CameraCollisionPolicy
+var _yaw_radians := 0.0
+var _pitch_radians := deg_to_rad(-18.0)
+var _requested_distance_units := 8.0
+var _resolved_distance_units := 8.0
+var _is_mouse_captured := false
+
+
+func _ready() -> void:
+	_camera = get_node_or_null(camera_path) as Camera3D
+	if _camera == null:
+		push_error("ThirdPersonCameraRig: Camera3D not found at %s" % camera_path)
+	if _collision_policy == null:
+		_collision_policy = NO_CAMERA_COLLISION_POLICY_SCRIPT.new()
+	_pitch_radians = clampf(_pitch_radians, minimum_pitch_radians, maximum_pitch_radians)
+	_requested_distance_units = clampf(
+		initial_distance_units,
+		minimum_distance_units,
+		maximum_distance_units
+	)
+	if _camera != null:
+		_camera.current = true
+		_camera.far = camera_far_plane_units
+	refresh_camera_transform()
+
+
+func _physics_process(_delta_seconds: float) -> void:
+	refresh_camera_transform()
+
+
+func _exit_tree() -> void:
+	if _is_mouse_captured:
+		_is_mouse_captured = false
+		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
+
+
+## Attaches the character transform rotated by orbit input and captures its initial yaw.
+func initialize_for_character(character_body: Node3D) -> void:
+	_character_body = character_body
+	if _character_body != null:
+		_yaw_radians = _character_body.rotation.y
+	refresh_camera_transform()
+
+
+## Replaces camera-distance collision behavior and immediately refreshes the camera.
+## Passing null is rejected and preserves the current policy.
+func set_collision_policy(collision_policy: CameraCollisionPolicy) -> void:
+	if collision_policy == null:
+		push_error("ThirdPersonCameraRig: collision policy cannot be null")
+		return
+	_collision_policy = collision_policy
+	refresh_camera_transform()
+
+
+## Applies remappable camera actions and orbit mouse motion.
+## Returns true when the event changed or consumed camera state.
+func handle_camera_input(event: InputEvent) -> bool:
+	if event.is_action_pressed(PlayerInputActions.CAMERA_ROTATE):
+		_is_mouse_captured = true
+		Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
+		return true
+	if event.is_action_released(PlayerInputActions.CAMERA_ROTATE):
+		_is_mouse_captured = false
+		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
+		return true
+	if event.is_action_pressed(PlayerInputActions.CAMERA_ZOOM_IN):
+		_requested_distance_units = clampf(
+			_requested_distance_units - zoom_step_units,
+			minimum_distance_units,
+			maximum_distance_units
+		)
+		refresh_camera_transform()
+		return true
+	if event.is_action_pressed(PlayerInputActions.CAMERA_ZOOM_OUT):
+		_requested_distance_units = clampf(
+			_requested_distance_units + zoom_step_units,
+			minimum_distance_units,
+			maximum_distance_units
+		)
+		refresh_camera_transform()
+		return true
+	if event.is_action_pressed(PlayerInputActions.RELEASE_CURSOR):
+		_is_mouse_captured = false
+		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
+		return true
+	if _is_mouse_captured and event is InputEventMouseMotion:
+		_yaw_radians -= event.relative.x * mouse_sensitivity_radians_per_pixel
+		_pitch_radians = clampf(
+			_pitch_radians - event.relative.y * mouse_sensitivity_radians_per_pixel,
+			minimum_pitch_radians,
+			maximum_pitch_radians
+		)
+		if _character_body != null:
+			_character_body.rotation.y = _yaw_radians
+		refresh_camera_transform()
+		return true
+	return false
+
+
+## Returns the pivot's Godot-world basis for camera-relative sandbox flight.
+func godot_world_flight_movement_basis() -> Basis:
+	return global_basis
+
+
+## Applies pivot and Camera3D local transforms using the active collision policy.
+func refresh_camera_transform() -> void:
+	position = Vector3(0.0, pivot_height_units, 0.0)
+	rotation.x = _pitch_radians
+	if _camera == null:
+		return
+	var policy_distance := _collision_policy.resolve_camera_distance(
+		self,
+		_requested_distance_units
+	) if _collision_policy != null else _requested_distance_units
+	_resolved_distance_units = clampf(policy_distance, 0.0, _requested_distance_units)
+	_camera.position = Vector3(0.0, 0.0, _resolved_distance_units)
+	_camera.rotation = Vector3.ZERO

src/scenes/player/third_person_camera_rig.gd.uid

@@ -0,0 +1 @@
+uid://cq60al4uw0mgo

src/scenes/player/third_person_wow_controller.gd

@@ -24,19 +24,10 @@ const ADT_TERRAIN_QUERY_SCRIPT := preload("res://src/gameplay/terrain/adt_terrai
 @export var sprint_multiplier: float = 6.0
 @export var flight_vertical_speed: float = 7.0
 @export var acceleration: float = 28.0
-@export var mouse_sensitivity: float = 0.003
-@export var camera_pitch_min: float = deg_to_rad(-65.0)
-@export var camera_pitch_max: float = deg_to_rad(35.0)
-@export var camera_height: float = 1.7
-@export var camera_distance: float = 8.0
-@export var camera_min_distance: float = 2.0
-@export var camera_max_distance: float = 18.0
-@export var camera_zoom_step: float = 1.0
 @export var ground_offset: float = 0.05
 @export var ground_snap_speed: float = 24.0
 
 @export var camera_pivot_path: NodePath = NodePath("CameraPivot")
-@export var camera_path: NodePath = NodePath("CameraPivot/Camera3D")
 @export var visual_path: NodePath = NodePath("Visual")
 @export var character_model_path: String = "res://src/resources/characters/HUMAN/MALE/HumanMale.glb"
 @export var character_class_id: int = 1
@@ -44,15 +35,11 @@ const ADT_TERRAIN_QUERY_SCRIPT := preload("res://src/gameplay/terrain/adt_terrai
 @export var character_yaw_offset_degrees: float = 90.0
 @export var animation_blend_time: float = 0.15
 
-var _camera_pivot: Node3D
-var _camera: Camera3D
+var _camera_rig: ThirdPersonCameraRig
 var _visual: Node3D
 var _character_root: Node3D
 var _animation_player: AnimationPlayer
 var _active_animation := ""
-var _captured := false
-var _yaw := 0.0
-var _pitch := deg_to_rad(-18.0)
 var _player_input_source: PlayerInputSource
 var _local_movement_controller: LocalPlayerMovementController
 var _terrain_query: TerrainQuery
@@ -79,12 +66,12 @@ func _ready() -> void:
 		acceleration,
 		sprint_multiplier
 	)
-	_camera_pivot = get_node_or_null(camera_pivot_path) as Node3D
-	_camera = get_node_or_null(camera_path) as Camera3D
+	_camera_rig = get_node_or_null(camera_pivot_path) as ThirdPersonCameraRig
 	_visual = get_node_or_null(visual_path) as Node3D
-	if _camera:
-		_camera.current = true
-		_camera.far = 50000.0
+	if _camera_rig == null:
+		push_error("ThirdPersonWowController: ThirdPersonCameraRig not found at %s" % camera_pivot_path)
+	else:
+		_camera_rig.initialize_for_character(self)
 	if spawn_at_tile_center:
 		var spawn_tile = ADT_TILE_COORDINATE_SCRIPT.new(spawn_tile_x, spawn_tile_y)
 		var half_tile_size := COORDINATE_MAPPER_SCRIPT.ADT_TILE_SIZE_YARDS * 0.5
@@ -95,41 +82,20 @@ func _ready() -> void:
 	var spawn_ground_sample := _sample_ground_height(global_position)
 	if spawn_ground_sample.is_available:
 		global_position.y = spawn_ground_sample.height_units + ground_offset
-	_yaw = rotation.y
-	_apply_camera_transform()
 
 
 func _unhandled_input(event: InputEvent) -> void:
-	if event.is_action_pressed(PLAYER_INPUT_ACTIONS_SCRIPT.CAMERA_ROTATE):
-		_captured = true
-		Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
-	elif event.is_action_released(PLAYER_INPUT_ACTIONS_SCRIPT.CAMERA_ROTATE):
-		_captured = false
-		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
-	elif event.is_action_pressed(PLAYER_INPUT_ACTIONS_SCRIPT.CAMERA_ZOOM_IN):
-		camera_distance = clampf(camera_distance - camera_zoom_step, camera_min_distance, camera_max_distance)
-		_apply_camera_transform()
-	elif event.is_action_pressed(PLAYER_INPUT_ACTIONS_SCRIPT.CAMERA_ZOOM_OUT):
-		camera_distance = clampf(camera_distance + camera_zoom_step, camera_min_distance, camera_max_distance)
-		_apply_camera_transform()
-	elif event.is_action_pressed(PLAYER_INPUT_ACTIONS_SCRIPT.RELEASE_CURSOR):
-		_captured = false
-		Input.mouse_mode = Input.MOUSE_MODE_CAPTURED if _captured else Input.MOUSE_MODE_VISIBLE
-	elif event.is_action_pressed(PLAYER_INPUT_ACTIONS_SCRIPT.DEBUG_TOGGLE_FLIGHT) and not event.is_echo():
+	if _camera_rig != null:
+		_camera_rig.handle_camera_input(event)
+	if event.is_action_pressed(PLAYER_INPUT_ACTIONS_SCRIPT.DEBUG_TOGGLE_FLIGHT) and not event.is_echo():
 		_local_movement_controller.toggle_sandbox_flight()
 
-	if _captured and event is InputEventMouseMotion:
-		_yaw -= event.relative.x * mouse_sensitivity
-		_pitch = clampf(_pitch - event.relative.y * mouse_sensitivity, camera_pitch_min, camera_pitch_max)
-		rotation.y = _yaw
-		_apply_camera_transform()
-
 
 func _physics_process(delta: float) -> void:
 	var move_intent := _player_input_source.sample_move_intent()
 	var godot_world_movement_basis := global_basis
-	if _local_movement_controller.is_flight_enabled and _camera_pivot:
-		godot_world_movement_basis = _camera_pivot.global_basis
+	if _local_movement_controller.is_flight_enabled and _camera_rig != null:
+		godot_world_movement_basis = _camera_rig.godot_world_flight_movement_basis()
 	global_position += _local_movement_controller.advance(move_intent, godot_world_movement_basis, delta)
 
 	if not _local_movement_controller.is_flight_enabled:
@@ -145,8 +111,6 @@ func _physics_process(delta: float) -> void:
 
 	_update_character_animation(horizontal_motion.length_squared() > 0.04)
 
-	_apply_camera_transform()
-
 func _load_character_visual() -> void:
 	if character_model_path.is_empty() or _visual == null:
 		return
@@ -298,15 +262,6 @@ func _character_textures_dir(model_path: String) -> String:
 	return model_path.get_base_dir().path_join(model_path.get_file().get_basename() + "_textures")
 
 
-func _apply_camera_transform() -> void:
-	if _camera_pivot:
-		_camera_pivot.position = Vector3(0.0, camera_height, 0.0)
-		_camera_pivot.rotation.x = _pitch
-	if _camera:
-		_camera.position = Vector3(0.0, 0.0, camera_distance)
-		_camera.rotation = Vector3.ZERO
-
-
 func _sample_ground_height(godot_world_position: Vector3) -> TerrainGroundSample:
 	return _terrain_query.sample_ground_height(
 		GODOT_WORLD_POSITION_SCRIPT.new(

src/scenes/streaming/eastern_kingdoms_streaming.tscn

@@ -3,6 +3,7 @@
 [ext_resource type="Script" uid="uid://yi6lawwjgocg" path="res://src/scenes/streaming/streaming_world_loader.gd" id="1_stream"]
 [ext_resource type="Script" uid="uid://ltn2ko5kxvo4" path="res://src/scenes/player/third_person_wow_controller.gd" id="2_player"]
 [ext_resource type="Script" uid="uid://didjth34ut0v1" path="res://src/scenes/sky/wow_sky_controller.gd" id="3_sky"]
+[ext_resource type="Script" path="res://src/scenes/player/third_person_camera_rig.gd" id="4_camera_rig"]
 
 [sub_resource type="CapsuleShape3D" id="PlayerCapsuleShape_1"]
 radius = 0.45
@@ -107,6 +108,7 @@ mesh = SubResource("PlayerCapsuleMesh_1")
 
 [node name="CameraPivot" type="Node3D" parent="ThirdPersonPlayer" unique_id=499263249]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.7, 0)
+script = ExtResource("4_camera_rig")
 
 [node name="Camera3D" type="Camera3D" parent="ThirdPersonPlayer/CameraPivot" unique_id=2142337971]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 8)

src/scenes/streaming/kalimdor_streaming.tscn

@@ -3,6 +3,7 @@
 [ext_resource type="Script" uid="uid://yi6lawwjgocg" path="res://src/scenes/streaming/streaming_world_loader.gd" id="1_sisqv"]
 [ext_resource type="Script" uid="uid://ltn2ko5kxvo4" path="res://src/scenes/player/third_person_wow_controller.gd" id="2_puy8r"]
 [ext_resource type="Script" uid="uid://didjth34ut0v1" path="res://src/scenes/sky/wow_sky_controller.gd" id="3_43ha7"]
+[ext_resource type="Script" path="res://src/scenes/player/third_person_camera_rig.gd" id="4_camera_rig"]
 
 [sub_resource type="CapsuleShape3D" id="PlayerCapsuleShape_1"]
 radius = 0.45
@@ -108,6 +109,7 @@ mesh = SubResource("PlayerCapsuleMesh_1")
 
 [node name="CameraPivot" type="Node3D" parent="ThirdPersonPlayer" unique_id=499263249]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.7, 0)
+script = ExtResource("4_camera_rig")
 
 [node name="Camera3D" type="Camera3D" parent="ThirdPersonPlayer/CameraPivot" unique_id=2142337971]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 8)