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

Merge remote-tracking branch 'origin/master' into master-prd

Browse Source
This commit is contained in:
Maxim
2025-08-25 11:59:39 +03:00
parent a2c7f5185f 116827041b
commit a32e09e73b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scenes/tilemap/tilemap.gd
View File

@@ -288,7 +288,7 @@ func _draw() -> void:
visible_marks_count = 0
for dot in _marks.values():
var scr_pos: Vector2 = world_to_screen(dot.position)
scr_pos.x = posmod(scr_pos.x, dx)
scr_pos.x = posmod(int(scr_pos.x), int(dx))
dot.mark.position = scr_pos
dot.mark.visible = is_mark_visible(dot)
dot.mark.visible = c.distance_to(scr_pos) < (r - dot.gap_size)
@@ -432,7 +432,7 @@ func check_borders(p1, p2, h):
func _draw_tile(tx: int, ty: int, z: float) -> void:
var tz: float = floor(z)
var tz: = int(floor(z))
var p1: = tile_to_screen(tx, ty, z)
var p2: = tile_to_screen(tx + 1, ty + 1, z)
var tile: = get_tile(tx, ty, tz)
@@ -441,7 +441,7 @@ func _draw_tile(tx: int, ty: int, z: float) -> void:
check_borders(p1, p2, $canvas.size.y)
draw_texture_rect(tile.texture, Rect2(p1, p2 - p1), false, Color.WHITE, false)
else:
var zzz: float = tz
var zzz: = tz
var txx: = tx
var tyy: = ty
while zzz > 1:
@@ -562,14 +562,15 @@ func get_tile(x: int, y: int, z: int) -> Tile:
var idx: int = xyz_to_idx(x, y, z)
var tile = null
var req: = get_node_or_null(NodePath(TILE_REQUEST_NAME % idx))
if req:
var tile = req.get_meta('tile')
tile = req.get_meta('tile')
if tile != null:
tile.t = now
return tile
var tile = _cache.get(idx)
tile = _cache.get(idx)
if tile:
tile.t = now
return tile