Рефактор.

This commit is contained in:
sasha80
2026-01-22 14:55:00 +03:00
parent 42ca66d61d
commit baff756648
3 changed files with 10 additions and 20 deletions

View File

@@ -26,7 +26,6 @@ const TILE_REQUEST_NAME: = 'tile_request_%d'
@export_color_no_alpha() var back_color: = Color.BLACK
@export var show_ship_radius: bool = true
@export var ship_radius_km: float = 8.0
@onready var scale_label: String
@onready var coordinates_label: String
@onready var threat_mark: PackedScene = load("res://scenes/tilemap/threat.tscn")
@onready var ship_mark: PackedScene = load("res://scenes/tilemap/ship-mark.tscn")
@@ -227,9 +226,11 @@ func _input(e) -> void:
if e.button_index == MOUSE_BUTTON_WHEEL_DOWN:
if (not is_out_border1) and (not is_out_border2):
increment_zoom(-zoom_step, lmp)
update_scale_label()
queue_redraw()
elif e.button_index == MOUSE_BUTTON_WHEEL_UP:
increment_zoom( zoom_step, lmp)
update_scale_label()
queue_redraw()
if e.button_index == MOUSE_BUTTON_LEFT:
_dragging = e.pressed
@@ -256,22 +257,12 @@ func _input(e) -> void:
signaller.emmit(signaller.map_user_panning)
func multiply_zoom(multiplier: float, pivot: Vector2) -> void:
var p1: = screen_to_world(_xyz, pivot)
_xyz.z = clampf(_xyz.z * multiplier, min_zoom_level, max_zoom_level)
var p2: = screen_to_world(_xyz, pivot)
_xyz.x -= p2.x - p1.x
_xyz.y -= p2.y - p1.y
update_scale_label()
func increment_zoom(increment: float, pivot: Vector2) -> void:
var p1: = screen_to_world(_xyz, pivot)
_xyz.z = clampf(_xyz.z + increment, min_zoom_level, max_zoom_level)
var p2: = screen_to_world(_xyz, pivot)
_xyz.x -= p2.x - p1.x
_xyz.y -= p2.y - p1.y
update_scale_label()
func set_zoom(zoom: float, pivot: Vector2) -> void:
@@ -280,7 +271,6 @@ func set_zoom(zoom: float, pivot: Vector2) -> void:
var p2: = screen_to_world(_xyz, pivot)
_xyz.x -= p2.x - p1.x
_xyz.y -= p2.y - p1.y
update_scale_label()
func _draw() -> void:
@@ -377,8 +367,6 @@ func _process(delta) -> void:
if _queue.is_empty():
emit_signal('load_completed')
update_scale_label()
func process_online(result):
# ERROR: res://scenes/tilemap/tilemap.gd:396 - Invalid access to property or key 'online' on a base object of type 'Nil'.
@@ -732,7 +720,7 @@ func update_coordinates_label(lon: float, lat: float) -> void:
func update_scale_label() -> void:
scale_label = 'Масштаб: ' + str(round(_xyz.z))
var scale_label: = 'Масштаб: %f' % round(_xyz.z)
signaller.emit_signal('update_scale_map', scale_label)
@@ -766,6 +754,7 @@ func zoom_in() -> void:
return
var center: Vector2 = $canvas.size / 2.0
increment_zoom(zoom_step, center)
update_scale_label()
queue_redraw()
@@ -774,6 +763,7 @@ func zoom_out() -> void:
return
var center: Vector2 = $canvas.size / 2.0
increment_zoom(-zoom_step, center)
update_scale_label()
queue_redraw()

View File

@@ -663,12 +663,12 @@ func on_btn_activate_toggled(toggled_on: bool) -> void:
$btn_activate.self_modulate = Color.WHITE
func on_update_coordinates_label(coordinates_label) -> void:
$coordinates_map.text = str(coordinates_label)
func on_update_coordinates_label(coordinates_label: String) -> void:
$coordinates_map.text = coordinates_label
func on_update_scale_label(scale_label) -> void:
$scale_map.text = str(scale_label)
func on_update_scale_label(scale_label: String) -> void:
$scale_map.text = scale_label
func on_btn_close():

View File

@@ -197,7 +197,7 @@ signal emit_changed(state)
## Вызывается при изменении детализации карты.[br]
## [param new_scale] - обновленное значение масштаба ([b]true[/b]
signal update_scale_map(new_scale)
signal update_scale_map(new_scale: String)
## Вызывается при изменении текущих координат.[br]