godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31949 from myhalibobo/TilemapFix 

Fix tilemap world_to_map return error map coordinates
This commit is contained in:
Rémi Verschelde 2019-09-26 10:56:26 +02:00 committed by GitHub
parent 452741f333 943471dd02
commit fba8ee4702
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/2d/tile_map.cpp
View File

@ -1549,7 +1549,8 @@ Vector2 TileMap::_map_to_world(int p_x, int p_y, bool p_ignore_ofs) const {
ret += get_cell_transform()[1] * (half_offset == HALF_OFFSET_Y ? 0.5 : -0.5); ret += get_cell_transform()[1] * (half_offset == HALF_OFFSET_Y ? 0.5 : -0.5);
} }
} break; } break;
default: { case HALF_OFFSET_DISABLED: {
// Nothing to do.
} }
} }
} }
@ -1612,26 +1613,27 @@ Vector2 TileMap::world_to_map(const Vector2 &p_pos) const {
switch (half_offset) { switch (half_offset) {
case HALF_OFFSET_X: { case HALF_OFFSET_X: {
if (ret.y > 0 ? int(ret.y) & 1 : (int(ret.y) - 1) & 1) { if (int(floor(ret.y)) & 1) {
ret.x -= 0.5; ret.x -= 0.5;
} }
} break; } break;
case HALF_OFFSET_NEGATIVE_X: { case HALF_OFFSET_NEGATIVE_X: {
if (ret.y > 0 ? int(ret.y) & 1 : (int(ret.y) - 1) & 1) { if (int(floor(ret.y)) & 1) {
ret.x += 0.5; ret.x += 0.5;
} }
} break; } break;
case HALF_OFFSET_Y: { case HALF_OFFSET_Y: {
if (ret.x > 0 ? int(ret.x) & 1 : (int(ret.x) - 1) & 1) { if (int(floor(ret.x)) & 1) {
ret.y -= 0.5; ret.y -= 0.5;
} }
} break; } break;
case HALF_OFFSET_NEGATIVE_Y: { case HALF_OFFSET_NEGATIVE_Y: {
if (ret.x > 0 ? int(ret.x) & 1 : (int(ret.x) - 1) & 1) { if (int(floor(ret.x)) & 1) {
ret.y += 0.5; ret.y += 0.5;
} }
} break; } break;
default: { case HALF_OFFSET_DISABLED: {
// Nothing to do.
} }
} }