diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-24 21:03:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 21:03:48 +0100 |
| commit | 5f8f6ae7f6e7d598629993fcdd4b3828f1bf2d04 (patch) | |
| tree | 111cdafbe04362527efc624428c8685b68dfee03 | |
| parent | fc09d783f4e8a6b8978c6971450f26e812268e67 (diff) | |
| parent | d7f51dd2ec60f5c237e471b65e890c11f172b24b (diff) | |
Merge pull request #57120 from KoBeWi/grandpa_issue
| -rw-r--r-- | doc/classes/TileMap.xml | 3 | ||||
| -rw-r--r-- | scene/2d/tile_map.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/classes/TileMap.xml b/doc/classes/TileMap.xml index e37031f3fd..07b9543823 100644 --- a/doc/classes/TileMap.xml +++ b/doc/classes/TileMap.xml @@ -202,7 +202,8 @@ <return type="Vector2" /> <argument index="0" name="map_position" type="Vector2i" /> <description> - Returns the local position corresponding to the given tilemap (grid-based) coordinates. + Returns a local position of the center of the cell at the given tilemap (grid-based) coordinates. + [b]Note:[/b] This doesn't correspond to the visual position of the tile, i.e. it ignores the [member TileData.texture_offset] property of individual tiles. </description> </method> <method name="move_layer"> diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 5857b6710f..25c83b0c8f 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -2725,7 +2725,7 @@ void TileMap::_get_property_list(List<PropertyInfo> *p_list) const { } Vector2 TileMap::map_to_world(const Vector2i &p_pos) const { - // SHOULD RETURN THE CENTER OF THE TILE + // SHOULD RETURN THE CENTER OF THE CELL ERR_FAIL_COND_V(!tile_set.is_valid(), Vector2()); Vector2 ret = p_pos; |