maxim/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sasha80/master'

Browse Source
This commit is contained in:
Maxim
2026-01-23 15:01:40 +03:00
parent 27adb42238 abfb98db46
commit 61bf491425
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scenes/tilemap/tilemap.gd
View File

@@ -30,8 +30,8 @@ const TILE_REQUEST_NAME: = 'tile_request_%d'
@export var show_ship_radius: bool = true @export var show_ship_radius: bool = true
@export var ship_radius_km: float = 8.0 @export var ship_radius_km: float = 8.0
@onready var coordinates_label: String @onready var coordinates_label: String
@onready var threat_mark: PackedScene = load("res://scenes/tilemap/threat.tscn") @onready var threat_mark: PackedScene = load('res://scenes/tilemap/threat.tscn')
@onready var ship_mark: PackedScene = load("res://scenes/tilemap/ship-mark.tscn") @onready var ship_mark: PackedScene = load('res://scenes/tilemap/ship-mark.tscn')
var ship_id := 9999 var ship_id := 9999
var ship_instance: Node2D = null var ship_instance: Node2D = null
const default_size: = 400.0 const default_size: = 400.0
@@ -771,19 +771,19 @@ func zoom_out() -> void:
func _on_zoom_plus_button_down() -> void: func _on_zoom_plus_button_down() -> void:
zoom_action = "in" zoom_action = 'in'
perform_zoom() perform_zoom()
zoom_timer.start(0.3) zoom_timer.start(0.3)
func _on_zoom_minus_button_down() -> void: func _on_zoom_minus_button_down() -> void:
zoom_action = "out" zoom_action = 'out'
perform_zoom() perform_zoom()
zoom_timer.start(0.3) zoom_timer.start(0.3)
func _on_zoom_button_up() -> void: func _on_zoom_button_up() -> void:
zoom_action = "" zoom_action = ''
zoom_timer.stop() zoom_timer.stop()
@@ -793,8 +793,8 @@ func _on_zoom_timeout():
func perform_zoom(): func perform_zoom():
if zoom_action != "": if zoom_action != '':
if zoom_action == "in": if zoom_action == 'in':
zoom_in() zoom_in()
else: else:
zoom_out() zoom_out()

1
scenes/tilemap/tilemap.tscn
View File

@@ -28,6 +28,7 @@ size = Vector2(400, 400)
[node name="tilemap" type="CanvasGroup" groups=["gui_items"]] [node name="tilemap" type="CanvasGroup" groups=["gui_items"]]
script = ExtResource("1_l64tp") script = ExtResource("1_l64tp")
max_zoom_level_server = 11
[node name="canvas" type="TextureRect" parent="." groups=["gui_items"]] [node name="canvas" type="TextureRect" parent="." groups=["gui_items"]]
clip_contents = true clip_contents = true