hud ja camera change

camera_iso.gd

@@ -1,88 +1,90 @@
 extends Camera3D
 
-@export var height: float = 28.0
-@export var horizontal_distance: float = 28.0
+@export var height: float = 25.0
+@export var horizontal_distance: float = 25.0
 @export var horizontal_angle_deg: float = 45.0
 
-@export var size_min: float = 5.0
-@export var size_max: float = 30.0
-@export var default_size: float = 15.0
+# Perspective zoom (FOV)
+@export var fov_min: float = 20.0
+@export var fov_max: float = 75.0
+@export var default_fov: float = 30.0
 
 @export var focus_slice_thickness: float = 6.0
 @export var blur_transition: float = 15.0
 
 var _shake_amount: float = 0.0
-var _shake_decay:  float = 0.0
-var _user_size:    float = 0.0
+var _shake_decay: float = 0.0
+var _user_fov: float = 0.0
 
 
 func _ready() -> void:
 	set_as_top_level(true)
-	projection = Camera3D.PROJECTION_ORTHOGONAL
-	_user_size = default_size
-	size = default_size
+
+	projection = Camera3D.PROJECTION_PERSPECTIVE
+	fov = default_fov
+	_user_fov = default_fov
+
 	near = 0.1
-	far  = 150.0
+	far = 150.0
 
 
 func _unhandled_input(event: InputEvent) -> void:
 	if event.is_action_pressed("zoom_in"):
-		_user_size = clamp(_user_size / 1.2, size_min, size_max)
+		_user_fov = clamp(_user_fov / 1.1, fov_min, fov_max)
+
 	if event.is_action_pressed("zoom_out"):
-		_user_size = clamp(_user_size * 1.2, size_min, size_max)
+		_user_fov = clamp(_user_fov * 1.1, fov_min, fov_max)
 
 
 func _process(delta: float) -> void:
-	size = lerpf(size, _user_size, delta * 8.0)
+	fov = lerpf(fov, _user_fov, delta * 8.0)
 
 	var angle_rad := deg_to_rad(horizontal_angle_deg)
+
 	var offset := Vector3(
 		sin(angle_rad) * horizontal_distance,
 		height,
-		cos(angle_rad) * horizontal_distance,
+		cos(angle_rad) * horizontal_distance
 	)
+
 	var target := get_parent() as Node3D
+
 	global_position = target.global_position + offset
 	look_at(target.global_position, Vector3.UP)
 
-	_update_ortho_tilt_shift_dof(target.global_position)
+	_update_dof(target.global_position)
 
 	if _shake_amount > 0.005:
 		global_position += Vector3(
 			randf_range(-_shake_amount, _shake_amount),
 			randf_range(-_shake_amount * 0.25, _shake_amount * 0.25),
-			randf_range(-_shake_amount, _shake_amount),
+			randf_range(-_shake_amount, _shake_amount)
 		)
+
 		_shake_amount = move_toward(_shake_amount, 0.0, _shake_decay * delta)
 
 
 func trigger_hit(strength: float) -> void:
 	_shake_amount = strength * 0.5
-	_shake_decay  = _shake_amount / 0.4
+	_shake_decay = _shake_amount / 0.4
 
 
-func _update_ortho_tilt_shift_dof(target_pos: Vector3) -> void:
+func _update_dof(target_pos: Vector3) -> void:
 	var cam_attr: CameraAttributesPractical = null
 
-	if "attributes" in self and self.attributes is CameraAttributesPractical:
-		cam_attr = self.attributes
-	elif "camera_attributes" in self and self.camera_attributes is CameraAttributesPractical:
-		cam_attr = self.camera_attributes
+	if attributes is CameraAttributesPractical:
+		cam_attr = attributes
 
-	if cam_attr != null:
-		var to_target := target_pos - global_position
-		var forward_vector := -global_transform.basis.z
-		var ortho_depth := to_target.dot(forward_vector)
+	if cam_attr == null:
+		return
 
-		var zoom_factor := size / default_size
-		var dynamic_slice := focus_slice_thickness * zoom_factor
-		var half_slice := dynamic_slice * 0.5
+	var distance := global_position.distance_to(target_pos)
 
-		var base_transition := blur_transition * zoom_factor
+	cam_attr.dof_blur_near_distance = max(distance - focus_slice_thickness * 0.5, near + 0.1)
+	cam_attr.dof_blur_far_distance = distance + focus_slice_thickness * 0.5
 
-		cam_attr.dof_blur_far_distance  = ortho_depth + half_slice
-		cam_attr.dof_blur_near_distance = maxf(near + 0.1, ortho_depth - half_slice)
-		cam_attr.dof_blur_far_transition  = maxf(0.1, base_transition * 0.5)
-		cam_attr.dof_blur_near_transition = maxf(1.0, base_transition * 1.5)
-		cam_attr.dof_blur_far_enabled  = false
-		cam_attr.dof_blur_near_enabled = false
+	cam_attr.dof_blur_near_transition = blur_transition
+	cam_attr.dof_blur_far_transition = blur_transition
+
+	cam_attr.dof_blur_near_enabled = false
+	cam_attr.dof_blur_far_enabled = false

scene.tscn

@@ -55,14 +55,14 @@ shape = SubResource("BoxShape3D_ulcgi")
 
 [node name="arena_placeholder_v01" parent="Node3D" unique_id=1341659233 instance=ExtResource("2_nxogm")]
 
+[node name="Arena_draft" parent="Node3D/arena_placeholder_v01" index="0" unique_id=603097973]
+visible = false
+
+[node name="Wall" parent="Node3D/arena_placeholder_v01" index="1" unique_id=171701243]
+visible = false
+
 [node name="Arena2" parent="Node3D/arena_placeholder_v01" unique_id=524718167 instance=ExtResource("3_fy5k1")]
 
-[node name="Arena_draft" parent="Node3D/arena_placeholder_v01" index="1" unique_id=603097973]
-visible = false
-
-[node name="Wall" parent="Node3D/arena_placeholder_v01" index="2" unique_id=171701243]
-visible = false
-
 [node name="arena model2026" parent="Node3D/arena_placeholder_v01" unique_id=179544183 instance=ExtResource("10_5juve")]
 transform = Transform3D(0.99999994, 0, 0, 0, 0.99999994, 0, 0, 0, 0.99999994, -0.901, -0.6, 0)
 visible = false