Рефактор.
This commit is contained in:
@@ -2,6 +2,9 @@
|
||||
extends CanvasGroup
|
||||
class_name MercatorTileMap
|
||||
|
||||
const VECTOR00: = Vector2(0, 0)
|
||||
const VECTOR11: = Vector2(1, 1)
|
||||
|
||||
## Отображение карт WEB Mercator
|
||||
|
||||
#http://10.1.1.220/osm_tiles/0/0/0.png
|
||||
@@ -88,7 +91,7 @@ var _marks: Dictionary = {}
|
||||
var _req_count: = 0
|
||||
var image: = Image.new()
|
||||
var image_load_proc: Callable
|
||||
var now: = 0
|
||||
var now: = 0.0
|
||||
var visible_marks_count: = 0
|
||||
var border1: ImageTexture
|
||||
var border2: ImageTexture
|
||||
@@ -276,8 +279,8 @@ func set_zoom(zoom: float, pivot: Vector2) -> void:
|
||||
func _draw() -> void:
|
||||
# Рисование плиток
|
||||
var z: float = min(max_zoom_level, _xyz.z)
|
||||
var t1: = screen_to_tile(Vector2(0, 0), z)
|
||||
var t2: = screen_to_tile($canvas.size, z) + Vector2(1, 1)
|
||||
var t1: = screen_to_tile(VECTOR00, z)
|
||||
var t2: = screen_to_tile($canvas.size, z) + VECTOR11
|
||||
is_out_border1 = true
|
||||
is_out_border2 = true
|
||||
for tx in range(t1.x, t2.x):
|
||||
@@ -363,7 +366,7 @@ func _process(delta) -> void:
|
||||
remove_child(req)
|
||||
req.queue_free()
|
||||
_req_count -= 1
|
||||
push_error('запрос \"%s\" не отправлен' % tile.url) #TODO: For Deugs
|
||||
push_error('запрос \"%s\" не отправлен' % tile.url)
|
||||
if _queue.is_empty():
|
||||
emit_signal('load_completed')
|
||||
|
||||
@@ -630,7 +633,7 @@ class Tile:
|
||||
var x: int = 0
|
||||
var y: int = 0
|
||||
var z: int = 0
|
||||
var t: int = 0
|
||||
var t: float = 0.0
|
||||
var url: String = ''
|
||||
var texture: Texture2D = null
|
||||
|
||||
|
||||
@@ -634,12 +634,12 @@ func set_btns_disabled(value: bool, btn):
|
||||
|
||||
func on_interfer_prinuditelno(prenuditelno_sectors):
|
||||
for key in prenuditelno_sectors:
|
||||
var sectors = []
|
||||
var sectors: = []
|
||||
for sector in prenuditelno_sectors[key]:
|
||||
sectors.append(prd.get_fs_param(sector))
|
||||
signaller.emit_signal('interfer_init', key, sectors, interfer.POW_DEFAULT)
|
||||
update_fs_colors()
|
||||
var btns: Array = get_tree().get_nodes_in_group('группа-режим-помехи')
|
||||
var btns: = get_tree().get_nodes_in_group('группа-режим-помехи')
|
||||
for btn in btns:
|
||||
btn.set_pressed(false)
|
||||
set_btns_disabled(true, btn)
|
||||
@@ -698,7 +698,7 @@ func on_th_aoa_update(ths):
|
||||
|
||||
|
||||
func count_threats(ths):
|
||||
$count_all_pad/count_all.text = '%02d' % ths.size()
|
||||
$count_all_pad/count_all.text = '%02d' % ths.size() if ths.size() < 100 else 99
|
||||
var c: int = 0
|
||||
if gos_flag:
|
||||
c = ths.values().filter(func(th: threats.Threat): return th.proto != '').size()
|
||||
|
||||
Reference in New Issue
Block a user