Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-15 08:32:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TileMap::world_to_map Ensure half offset is added according to the returned value

Browse Source 
Decide whether half offset should be added based on the value used for calculating the return value of this method.
This commit is contained in:
kleonc 2021-05-02 23:34:51 +02:00
parent 8abd50359b
commit f1420c7cbf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scene/2d/tile_map.cpp
View File

@ -1526,6 +1526,12 @@ Vector2 TileMap::map_to_world(const Vector2 &p_pos, bool p_ignore_ofs) const {
Vector2 TileMap::world_to_map(const Vector2 &p_pos) const { Vector2 TileMap::world_to_map(const Vector2 &p_pos) const {
Vector2 ret = get_cell_transform().affine_inverse().xform(p_pos); Vector2 ret = get_cell_transform().affine_inverse().xform(p_pos);
// Account for precision errors on the border (GH-23250).
// 0.00005 is 5*CMP_EPSILON, results would start being unpredictable if
// cell size is > 15,000, but we can hardly have more precision anyway with
// floating point.
ret += Vector2(0.00005, 0.00005);
switch (half_offset) { switch (half_offset) {
case HALF_OFFSET_X: { case HALF_OFFSET_X: {
if (int(floor(ret.y)) & 1) { if (int(floor(ret.y)) & 1) {
@ -1552,11 +1558,6 @@ Vector2 TileMap::world_to_map(const Vector2 &p_pos) const {
} }
} }
// Account for precision errors on the border (GH-23250).
// 0.00005 is 5*CMP_EPSILON, results would start being unpredictable if
// cell size is > 15,000, but we can hardly have more precision anyway with
// floating point.
ret += Vector2(0.00005, 0.00005);
return ret.floor(); return ret.floor();
} }