mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33452 from Chaosus/fix_tilemap

Browse Source 
Fix incorrect offset for old-format tilemaps
This commit is contained in:
Rémi Verschelde 2019-11-10 10:10:29 +01:00 committed by GitHub
commit e711534c46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
scene/resources/tile_set.cpp
View File

@ -148,20 +148,45 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
}
}
} else if (what == "shape")
for (int i = 0; i < tile_get_shape_count(id); i++)
tile_set_shape(id, i, p_value);
if (tile_get_shape_count(id) > 0) {
for (int i = 0; i < tile_get_shape_count(id); i++) {
tile_set_shape(id, i, p_value);
}
} else {
tile_set_shape(id, 0, p_value);
}
else if (what == "shape_offset")
for (int i = 0; i < tile_get_shape_count(id); i++)
tile_set_shape_offset(id, i, p_value);
if (tile_get_shape_count(id) > 0) {
for (int i = 0; i < tile_get_shape_count(id); i++) {
tile_set_shape_offset(id, i, p_value);
}
} else {
tile_set_shape_offset(id, 0, p_value);
}
else if (what == "shape_transform")
for (int i = 0; i < tile_get_shape_count(id); i++)
tile_set_shape_transform(id, i, p_value);
if (tile_get_shape_count(id) > 0) {
for (int i = 0; i < tile_get_shape_count(id); i++) {
tile_set_shape_transform(id, i, p_value);
}
} else {
tile_set_shape_transform(id, 0, p_value);
}
else if (what == "shape_one_way")
for (int i = 0; i < tile_get_shape_count(id); i++)
tile_set_shape_one_way(id, i, p_value);
if (tile_get_shape_count(id) > 0) {
for (int i = 0; i < tile_get_shape_count(id); i++) {
tile_set_shape_one_way(id, i, p_value);
}
} else {
tile_set_shape_one_way(id, 0, p_value);
}
else if (what == "shape_one_way_margin")
for (int i = 0; i < tile_get_shape_count(id); i++)
tile_set_shape_one_way_margin(id, i, p_value);
if (tile_get_shape_count(id) > 0) {
for (int i = 0; i < tile_get_shape_count(id); i++) {
tile_set_shape_one_way_margin(id, i, p_value);
}
} else {
tile_set_shape_one_way_margin(id, 0, p_value);
}
else if (what == "shapes")
_tile_set_shapes(id, p_value);
else if (what == "occluder")