From 234e8aea79bb3e092423ada1a5c799cc5506c1bd Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 10 Jan 2024 15:11:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=A0=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0=20=D0=A0=D0=A2=D0=9E=20=D0=B8=20?= =?UTF-8?q?=D0=A0=D0=9B=D0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/tilemap/tilemap.gd | 23 ++++++++++++++++++----- scenes/работа/работа.gd | 2 +- scripts/repnetwork.gd | 2 +- scripts/signaller.gd | 4 ++-- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/scenes/tilemap/tilemap.gd b/scenes/tilemap/tilemap.gd index cfae98c5..0ff20be4 100644 --- a/scenes/tilemap/tilemap.gd +++ b/scenes/tilemap/tilemap.gd @@ -41,6 +41,11 @@ var map_tile: Rect2i ## Область одной плитки: [x-к var prev_tiles_dic = {} ## +const MAP_MODES: = { + 0: 'application/config/map_image_size_rto', + 1: 'application/config/map_image_size_rls' } + + func _ready(): map_tile_state = TASK_STATE.DONE map_request = HTTPRequest.new() @@ -48,18 +53,26 @@ func _ready(): map_request.request_completed.connect(self._map_request_completed) map_bcs = ProjectSettings.get_setting('application/config/map_bcs', Vector3(1.0, 1.0, 1.0)) map_server_addr = ProjectSettings.get_setting('application/config/map_server_addr') - var map_image_size = ProjectSettings.get_setting('application/config/map_image_size_rto', Vector2i(512, 512)) + var map_image_size = ProjectSettings.get_setting(MAP_MODES[0], Vector2i(512, 512)) var map_tile_size = ProjectSettings.get_setting('application/config/map_tile_size', 256) map_image = Image.create(map_image_size.x, map_image_size.y, true, Image.FORMAT_RGB8) map_tile = Rect2i(0, 0, map_tile_size, map_tile_size) signaller.connect('zoom_changed', Callable(self, '_on_zoom_changed')) - signaller.connect('map_image_size_changed', Callable(self, '_on_map_image_size_changed')) - log.info('Модуль географической карты готов') + signaller.connect('map_mode_changed', Callable(self, '_on_map_mode_changed')) log.info('Адрес сервера поставщика карт: \"%s\"' % map_server_addr) + log.info('Модуль географической карты готов') -func _on_map_mode_changed(mode: bool) -> void: - print_debug(mode) +func _on_map_mode_changed(mode: int) -> void: + var map_image_size = ProjectSettings.get_setting(MAP_MODES[mode]) + map_image.fill(Color(0, 0, 0, 0)) + map_image.resize(map_image_size.x, map_image_size.y) + map_tile_state = TASK_STATE.DONE + var ll = TEST_DATA['Хельсинки'] + var tile: = mercator.create_tile(ll[0], ll[1], map_zoom) + map_tile_stack.clear() + map_tile_stack.append(tile) + prev_tiles_dic.clear() func mark_image_center(image: Image, color: Color = Color.RED): diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd index 92b3191d..5a83c1bb 100644 --- a/scenes/работа/работа.gd +++ b/scenes/работа/работа.gd @@ -47,7 +47,7 @@ enum DragFSM { func on_button_view_toggled(toggled: bool): $canvas.set_view_mode(int(toggled)) - signaller.emit_signal('map_mode_changed', toggled) + signaller.emit_signal('map_mode_changed', int(toggled)) ## Обработчик сигнала изменения списка целей diff --git a/scripts/repnetwork.gd b/scripts/repnetwork.gd index 5fd74d9b..b2ff6cfd 100644 --- a/scripts/repnetwork.gd +++ b/scripts/repnetwork.gd @@ -31,7 +31,7 @@ func create_socket(nm) -> Socket: func _ready() -> void: - log.info('Сетевой модуль готов') + log.info('Модуль работы с сетью готов') poll_sockets.append(create_socket('уарэп-яу07-частный')) poll_sockets.append(create_socket('уарэп-яу07-общий')) poll_sockets.append(create_socket('уарэп-капсрпб-пол')) diff --git a/scripts/signaller.gd b/scripts/signaller.gd index ccd7a368..7b2a1f49 100644 --- a/scripts/signaller.gd +++ b/scripts/signaller.gd @@ -79,5 +79,5 @@ signal map_coords_changed(lan: float, lat: float) ## Вызывается при изменении размера изображения для отображения карты. -## [param w], [param h] - Вновь установленный размер. -signal map_mode_changed(w: int, h: int) +## [param mode] - Вновь установленный режим +signal map_mode_changed(mode: int)