phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-07 09:33:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat(wob): tryLoadByGamePath helper, used by editor + terrain_manager

Browse source 
Mirrors the WOM tryLoadByGamePath API: probes custom_zones/buildings/ +
output/buildings/ by default, with optional extraPrefixes (e.g. per-zone
output/<map>/buildings/) checked first. Both the editor and the main
game's terrain_manager now use the helper, removing duplicate inline
lookup loops in two more places.
This commit is contained in:
Kelsi 2026-05-06 04:10:12 -07:00
parent f36309a96f
commit db068d480b
4 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/rendering/terrain_manager.cpp
View file

@ -614,22 +614,17 @@ std::shared_ptr<PendingTile> TerrainManager::prepareTile(int x, int y) {
bool wobLoaded = false;
pipeline::WMOModel wmoModel;
{
std::string wobBase = wmoPath;
auto wobDot = wobBase.rfind('.');
if (wobDot != std::string::npos) wobBase = wobBase.substr(0, wobDot);
std::replace(wobBase.begin(), wobBase.end(), '\\', '/');
std::vector<std::string> wobPrefixes = {"custom_zones/buildings/", "output/" + mapName + "/buildings/"};
for (const auto& prefix : wobPrefixes) {
if (pipeline::WoweeBuildingLoader::exists(prefix + wobBase)) {
auto wob = pipeline::WoweeBuildingLoader::load(prefix + wobBase);
if (wob.isValid()) {
if (pipeline::WoweeBuildingLoader::toWMOModel(wob, wmoModel)) {
LOG_INFO("Loaded WOB building: ", prefix + wobBase);
wobLoaded = true;
}
}
break;
}
// Per-zone overrides win over global custom_zones/ overrides.
std::vector<std::string> extraPrefixes = {
"output/" + mapName + "/buildings/",
"custom_zones/" + mapName + "/buildings/",
};
auto wob = pipeline::WoweeBuildingLoader::tryLoadByGamePath(
wmoPath, extraPrefixes);
if (wob.isValid() &&
pipeline::WoweeBuildingLoader::toWMOModel(wob, wmoModel)) {
LOG_INFO("Loaded WOB building: ", wmoPath);
wobLoaded = true;
}
}