zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-23 05:12:05 +00:00
Code Activity

Updated BSP linker to load assets on the FinalizeZone step.

Browse Source
This commit is contained in:
LJW-Dev
2025-11-01 17:06:08 +08:00
parent 3d2e890e34
commit 81e0331252
17 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp
View File

@@ -1,6 +1,7 @@
#include "../BSPUtil.h"
#include "MapEntsLinker.h"
#include "../BSPUtil.h"
#include <nlohmann/json.hpp>
using namespace nlohmann;
@@ -71,7 +72,7 @@ namespace BSP
{
}
AssetCreationResult MapEntsLinker::linkMapEnts(BSPData* bsp)
MapEnts* MapEntsLinker::linkMapEnts(BSPData* bsp)
{
try
{
@@ -90,7 +91,7 @@ namespace BSP
}
std::string entityString;
if (!parseMapEntsJSON(entJs["entities"], entityString))
return AssetCreationResult::Failure();
return nullptr;
json spawnJs;
std::string spawnFileName = "spawns.json";
@@ -126,13 +127,12 @@ namespace BSP
mapEnts->trigger.slabCount = 0;
mapEnts->trigger.slabs = nullptr;
auto mapEntsAsset = m_context.AddAsset<AssetMapEnts>(mapEnts->name, mapEnts);
return AssetCreationResult::Success(mapEntsAsset);
return mapEnts;
}
catch (const json::exception& e)
{
con::error("JSON error when parsing map ents and spawns: {}", e.what());
return AssetCreationResult::Failure();
return nullptr;
}
}
} // namespace BSP