This commit is contained in:
bee
2026-07-10 17:26:23 +02:00
parent db201081f5
commit 90bae5f3e5
14 changed files with 308 additions and 9 deletions
+41
View File
@@ -7,6 +7,7 @@ extends Node
current_controlled.desired_throttle = 0.0
current_controlled.steer_input = 0.0
current_controlled.fire_intents.clear()
current_controlled.aim_point = null
current_controlled = value
if is_node_ready():
if current_controlled != null:
@@ -32,6 +33,9 @@ extends Node
_possess()
@export var throttle_ramp := 0.5
@export var aim_ray_length := 2000.0
@export_flags_3d_physics var aim_collision_mask := 0b1100111 # terrain, player, enemies, water, subsystems
@export var aim_marker: Node3D
var desired_throttle := 0.0
@@ -41,6 +45,18 @@ func _ready() -> void:
desired_throttle = current_controlled.throttle
_possess()
func _physics_process(_delta: float) -> void:
if current_controlled == null:
if aim_marker != null:
aim_marker.visible = false
return
current_controlled.aim_point = _compute_aim_point()
if aim_marker != null:
var p = current_controlled.aim_point
aim_marker.visible = p != null
if p != null:
aim_marker.global_position = p
func _process(delta: float) -> void:
if current_controlled == null:
return
@@ -78,3 +94,28 @@ func _possess_next() -> void:
return
var idx := boats.find(current_controlled)
current_controlled = boats[(idx + 1) % boats.size()]
func _compute_aim_point():
if camera_rig == null or camera_rig.cam == null:
return null
var cam := camera_rig.cam
var mouse := get_viewport().get_mouse_position()
var from := cam.project_ray_origin(mouse)
var dir := cam.project_ray_normal(mouse)
var query := PhysicsRayQueryParameters3D.create(
from, from + dir * aim_ray_length,
aim_collision_mask, current_controlled.aim_ray_exclusions()
)
var hit := current_controlled.get_world_3d().direct_space_state.intersect_ray(query)
if hit.is_empty():
return from + dir * aim_ray_length # above the horizon
if hit.collider.is_in_group(&"water"):
# Flat-plane hit → refine to the actual wave surface.
var ocean := get_tree().get_first_node_in_group(&"ocean") as Ocean
if ocean != null:
var refined = Plane(Vector3.UP, ocean.get_wave_height(hit.position)).intersects_ray(from, dir)
if refined != null:
return refined
return hit.position