Merge pull request #57120 from KoBeWi/grandpa_issue

This commit is contained in:
Rémi Verschelde 2022-01-24 21:03:48 +01:00 committed by GitHub
commit 5f8f6ae7f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -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">

View file

@ -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;