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

Merge pull request #27763 from maksloboda/priority-improvement 

Changed autotile priority picking algorithm
This commit is contained in:
Rémi Verschelde 2019-04-30 11:07:41 +02:00 committed by GitHub
parent 4f10a08d1b d9f0d9cdac
commit 9d42565f81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scene/resources/tile_set.cpp
View File

@ -600,6 +600,8 @@ Vector2 TileSet::autotile_get_subtile_for_bitmask(int p_id, uint16_t p_bitmask,
}
List<Vector2> coords;
List<uint32_t> priorities;
uint32_t priority_sum = 0;
uint32_t mask;
uint16_t mask_;
uint16_t mask_ignore;
@ -613,16 +615,34 @@ Vector2 TileSet::autotile_get_subtile_for_bitmask(int p_id, uint16_t p_bitmask,
mask_ignore = mask >> 16;
if (((mask_ & (~mask_ignore)) == (p_bitmask & (~mask_ignore))) && (((~mask_) | mask_ignore) == ((~p_bitmask) | mask_ignore))) {
for (int i = 0; i < autotile_get_subtile_priority(p_id, E->key()); i++) {
coords.push_back(E->key());
}
uint32_t priority = autotile_get_subtile_priority(p_id, E->key());
priority_sum += priority;
priorities.push_back(priority);
coords.push_back(E->key());
}
}
if (coords.size() == 0) {
return autotile_get_icon_coordinate(p_id);
} else {
return coords[Math::rand() % coords.size()];
uint32_t picked_value = Math::rand() % priority_sum;
uint32_t upper_bound;
uint32_t lower_bound = 0;
Vector2 result = coords.front()->get();
List<Vector2>::Element *coords_E = coords.front();
List<uint32_t>::Element *priorities_E = priorities.front();
while (priorities_E) {
upper_bound = lower_bound + priorities_E->get();
if (lower_bound <= picked_value && picked_value < upper_bound) {
result = coords_E->get();
break;
}
lower_bound = upper_bound;
priorities_E = priorities_E->next();
coords_E = coords_E->next();
}
return result;
}
}