teatov/tli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove the whole frustrum collider from SelectionManager and make units add themselves to visible

Browse Source
This commit is contained in:
Teatov
2024-10-13 20:47:58 +10:00
parent 2e66680d52
commit d89c177521
2 changed files with 18 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
scripts/globals/selection_manager.gd
View File

@@ -11,15 +11,6 @@ const MAX_VISIBLE_UNITS = 120
var selecting: bool = false var selecting: bool = false
var advance_anim_step: int = 1 var advance_anim_step: int = 1
var _frustrum_polygon: ConvexPolygonShape3D = ConvexPolygonShape3D.new()
var _frustrum_polygon_points: PackedVector3Array = [
Vector3.ZERO,
Vector3.UP,
Vector3.RIGHT,
Vector3.BACK,
Vector3.ONE,
]
var _visible_units: Dictionary = {} var _visible_units: Dictionary = {}
var _mouse_pressed: bool = false var _mouse_pressed: bool = false
@@ -28,25 +19,14 @@ var _selection_rect: Rect2 = Rect2()
var _rect_style := preload("res://resources/styles/selection_rect.tres") var _rect_style := preload("res://resources/styles/selection_rect.tres")
@onready var camera: Camera3D = StaticNodesManager.main_camera @onready var camera: Camera3D = StaticNodesManager.main_camera
@onready var frustrum_area: Area3D = Area3D.new()
@onready var frustrum_collision_shape: CollisionShape3D = CollisionShape3D.new()
@onready var rect_panel: Panel = Panel.new() @onready var rect_panel: Panel = Panel.new()
func _ready() -> void: func _ready() -> void:
_frustrum_polygon.points = _frustrum_polygon_points
frustrum_collision_shape.shape = _frustrum_polygon
rect_panel.visible = false rect_panel.visible = false
frustrum_area.body_entered.connect(_on_frustrum_area_body_entered)
frustrum_area.body_exited.connect(_on_frustrum_area_body_exited)
frustrum_area.input_ray_pickable = false
frustrum_area.set_collision_mask_value(1, false)
frustrum_area.set_collision_mask_value(2, true)
rect_panel.mouse_filter = Control.MOUSE_FILTER_IGNORE rect_panel.mouse_filter = Control.MOUSE_FILTER_IGNORE
rect_panel.add_theme_stylebox_override("panel", _rect_style) rect_panel.add_theme_stylebox_override("panel", _rect_style)
add_child(rect_panel) add_child(rect_panel)
add_child(frustrum_area)
frustrum_area.add_child(frustrum_collision_shape)
func _process(_delta: float) -> void: func _process(_delta: float) -> void:
@@ -55,7 +35,6 @@ func _process(_delta: float) -> void:
and _selection_rect.size.length() >= MIN_DRAG_DISTANCE and _selection_rect.size.length() >= MIN_DRAG_DISTANCE
) )
_handle_frustrum_shape()
_handle_selection_box() _handle_selection_box()
_handle_unit_selection() _handle_unit_selection()
_handle_advance_anim_step() _handle_advance_anim_step()
@@ -78,6 +57,22 @@ func _input(event: InputEvent) -> void:
_selection_rect.size = mouse_pos - _selection_rect.position _selection_rect.size = mouse_pos - _selection_rect.position
func add_unit_to_visible(unit: Unit) -> void:
var unit_id := unit.get_instance_id()
if _visible_units.keys().has(unit_id):
return
_visible_units[unit_id] = unit as Unit
func remove_unit_from_visible(unit: Unit) -> void:
var unit_id := unit.get_instance_id()
if not _visible_units.keys().has(unit_id):
return
_visible_units.erase(unit_id)
func _handle_advance_anim_step() -> void: func _handle_advance_anim_step() -> void:
var remapped_unclamped := remap( var remapped_unclamped := remap(
_visible_units.size(), _visible_units.size(),
@@ -90,25 +85,6 @@ func _handle_advance_anim_step() -> void:
advance_anim_step = roundi(lerpf(1, ANIM_MAX_STEP, clamped)) advance_anim_step = roundi(lerpf(1, ANIM_MAX_STEP, clamped))
func _handle_frustrum_shape() -> void:
var viewport_size := get_viewport().get_visible_rect().size
var origin := camera.global_position
var far := camera.far - 1
var corner_1 := camera.project_position(Vector2.ZERO, far)
var corner_2 := camera.project_position(Vector2(viewport_size.x, 0), far)
var corner_3 := camera.project_position(Vector2(0, viewport_size.y), far)
var corner_4 := camera.project_position(viewport_size, far)
_frustrum_polygon_points[0] = origin
_frustrum_polygon_points[1] = corner_1
_frustrum_polygon_points[2] = corner_2
_frustrum_polygon_points[3] = corner_3
_frustrum_polygon_points[4] = corner_4
_frustrum_polygon.points = _frustrum_polygon_points
func _handle_selection_box() -> void: func _handle_selection_box() -> void:
rect_panel.visible = selecting rect_panel.visible = selecting
if not selecting: if not selecting:
@@ -143,22 +119,3 @@ func _set_selection_state(hover: bool) -> void:
else: else:
controlled_unit.set_selected(rect_abs.has_point(point)) controlled_unit.set_selected(rect_abs.has_point(point))
controlled_unit.set_hovered_rect(false) controlled_unit.set_hovered_rect(false)
func _on_frustrum_area_body_entered(unit: Node3D) -> void:
if unit is not Unit:
return
var unit_id := unit.get_instance_id()
if _visible_units.keys().has(unit_id):
return
_visible_units[unit_id] = unit as Unit
func _on_frustrum_area_body_exited(unit: Node3D) -> void:
var unit_id := unit.get_instance_id()
if not _visible_units.keys().has(unit_id):
return
_visible_units.erase(unit_id)

2
scripts/units/abstract/unit.gd
View File

@@ -139,7 +139,9 @@ func _on_nav_agent_velocity_computed(safe_velocity: Vector3) -> void:
func _on_visibility_notifier_screen_entered() -> void: func _on_visibility_notifier_screen_entered() -> void:
_is_on_screen = true _is_on_screen = true
SelectionManager.add_unit_to_visible(self)
func _on_visibility_notifier_screen_exited() -> void: func _on_visibility_notifier_screen_exited() -> void:
_is_on_screen = false _is_on_screen = false
SelectionManager.remove_unit_from_visible(self)