From 7b145d1998a4bc8b0674542b91c7e383408f3fd9 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 19 May 2025 15:34:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5.=20=D0=92=20=D1=80=D0=B5=D0=B6=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=20"=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0",=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D1=83=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BC=D0=B0=D1=81=D1=88=D1=82=D0=B0=D0=B1=D0=B0?= =?UTF-8?q?=20=D0=B7=D0=B0=20=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=BD=D0=BE=D0=B9=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B5=20=D0=B4?= =?UTF-8?q?=D0=B5=D1=82=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8,?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=B8=D1=82?= =?UTF-8?q?=20=D0=BD=D0=B5=D0=BF=D1=80=D0=B5=D1=80=D1=8B=D0=B2=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=20=D0=BF=D0=BB?= =?UTF-8?q?=D0=B8=D1=82=D0=BE=D0=BA=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B=20?= =?UTF-8?q?=D1=81=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/tilemap/tilemap.gd | 11 ++--------- scenes/tilemap/tilemap.tscn | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/scenes/tilemap/tilemap.gd b/scenes/tilemap/tilemap.gd index 269259a..cf07359 100644 --- a/scenes/tilemap/tilemap.gd +++ b/scenes/tilemap/tilemap.gd @@ -557,19 +557,12 @@ func get_tile(x: int, y: int, z: int, create: bool = true) -> Tile: var queue_size: = _queue.size() if create and (not $canvas/player.is_playing()): - if z > max_zoom_level_server: - z = max_zoom_level_server - n = pow(2, z) - 1 - x = clamp(x, 0, n) - y = clamp(y, 0, n) - idx = xyz_to_idx(x, y, z) - if _queue.has(idx): - tile = _queue[idx] if not tile: tile = Tile.new(idx, x, y, z) tile.url = base_url.replace('{x}', str(x)).replace('{y}', str(y)).replace('{z}', str(z)) tile.t = now - _queue[idx] = tile + if z <= max_zoom_level_server: + _queue[idx] = tile if queue_size == 0 and _queue.size(): emit_signal('load_started') diff --git a/scenes/tilemap/tilemap.tscn b/scenes/tilemap/tilemap.tscn index 3246801..aa619a9 100644 --- a/scenes/tilemap/tilemap.tscn +++ b/scenes/tilemap/tilemap.tscn @@ -29,7 +29,7 @@ size = Vector2(400, 400) [node name="tilemap" type="CanvasGroup" groups=["gui_items"]] script = ExtResource("1_l64tp") base_url = "http://192.168.11.105:8001/osm_tiles/{z}/{x}/{y}.png" -max_zoom_level = 10 +max_zoom_level = 15 max_zoom_level_server = 10 az = 2.0