Merge remote-tracking branch 'sasha80/master'
This commit is contained in:
@@ -30,8 +30,8 @@ const TILE_REQUEST_NAME: = 'tile_request_%d'
|
||||
@export var show_ship_radius: bool = true
|
||||
@export var ship_radius_km: float = 8.0
|
||||
@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")
|
||||
@onready var threat_mark: PackedScene = load('res://scenes/tilemap/threat.tscn')
|
||||
@onready var ship_mark: PackedScene = load('res://scenes/tilemap/ship-mark.tscn')
|
||||
var ship_id := 9999
|
||||
var ship_instance: Node2D = null
|
||||
const default_size: = 400.0
|
||||
@@ -771,19 +771,19 @@ func zoom_out() -> void:
|
||||
|
||||
|
||||
func _on_zoom_plus_button_down() -> void:
|
||||
zoom_action = "in"
|
||||
zoom_action = 'in'
|
||||
perform_zoom()
|
||||
zoom_timer.start(0.3)
|
||||
|
||||
|
||||
func _on_zoom_minus_button_down() -> void:
|
||||
zoom_action = "out"
|
||||
zoom_action = 'out'
|
||||
perform_zoom()
|
||||
zoom_timer.start(0.3)
|
||||
|
||||
|
||||
func _on_zoom_button_up() -> void:
|
||||
zoom_action = ""
|
||||
zoom_action = ''
|
||||
zoom_timer.stop()
|
||||
|
||||
|
||||
@@ -793,8 +793,8 @@ func _on_zoom_timeout():
|
||||
|
||||
|
||||
func perform_zoom():
|
||||
if zoom_action != "":
|
||||
if zoom_action == "in":
|
||||
if zoom_action != '':
|
||||
if zoom_action == 'in':
|
||||
zoom_in()
|
||||
else:
|
||||
zoom_out()
|
||||
|
||||
@@ -28,6 +28,7 @@ size = Vector2(400, 400)
|
||||
|
||||
[node name="tilemap" type="CanvasGroup" groups=["gui_items"]]
|
||||
script = ExtResource("1_l64tp")
|
||||
max_zoom_level_server = 11
|
||||
|
||||
[node name="canvas" type="TextureRect" parent="." groups=["gui_items"]]
|
||||
clip_contents = true
|
||||
|
||||
Reference in New Issue
Block a user