zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-22 21:02:07 +00:00
Code Activity

The FinalizeZone step can now fail and the zone link will not ouput a fastfile if the FinalizeZone step fails.

Browse Source
This commit is contained in:
LJW-Dev
2025-11-01 17:25:14 +08:00
parent 81e0331252
commit 56186d1d80
8 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Linker/ZoneCreation/ZoneCreator.cpp
View File

@@ -84,7 +84,8 @@ namespace zone_creator
++zoneDefinitionContext.m_asset_index_in_definition;
}
creatorCollection.FinalizeZone(creationContext);
if (!creatorCollection.FinalizeZone(creationContext))
return nullptr;
return zone;
}

6
src/ObjCompiling/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6.cpp
View File

@@ -32,12 +32,12 @@ namespace
return AssetCreationResult::NoAction();
}
void FinalizeZone(AssetCreationContext& context) override
bool FinalizeZone(AssetCreationContext& context) override
{
m_kvp_creator.Finalize(m_zone_definition);
const auto commonKvps = m_kvp_creator.GetFinalKeyValuePairs();
if (commonKvps.empty())
return;
return true;
auto* gameKvps = m_memory.Alloc<KeyValuePairs>();
gameKvps->name = m_memory.Dup(m_zone.m_name.c_str());
@@ -61,6 +61,8 @@ namespace
}
context.AddAsset(AssetRegistration<AssetKeyValuePairs>(m_zone.m_name, gameKvps));
return true;
}
private:

9
src/ObjLoading/Asset/AssetCreatorCollection.cpp
View File

@@ -79,10 +79,15 @@ AssetCreationResult AssetCreatorCollection::CreateDefaultAsset(const asset_type_
return AssetCreationResult::NoAction();
}
void AssetCreatorCollection::FinalizeZone(AssetCreationContext& context) const
bool AssetCreatorCollection::FinalizeZone(AssetCreationContext& context) const
{
for (const auto& creator : m_asset_creators)
creator->FinalizeZone(context);
{
if (!creator->FinalizeZone(context))
return false;
}
for (const auto& postProcessor : m_asset_post_processors)
postProcessor->FinalizeZone(context);
return true;
}

2
src/ObjLoading/Asset/AssetCreatorCollection.h
View File

@@ -27,7 +27,7 @@ public:
AssetCreationResult CreateAsset(asset_type_t assetType, const std::string& assetName, AssetCreationContext& context) const;
AssetCreationResult CreateDefaultAsset(asset_type_t assetType, const std::string& assetName, AssetCreationContext& context) const;
void FinalizeZone(AssetCreationContext& context) const;
bool FinalizeZone(AssetCreationContext& context) const;
private:
std::vector<std::vector<IAssetCreator*>> m_asset_creators_by_type;

6
src/ObjLoading/Asset/IAssetCreator.h
View File

@@ -25,7 +25,11 @@ public:
[[nodiscard]] virtual std::optional<asset_type_t> GetHandlingAssetType() const = 0;
virtual AssetCreationResult CreateAsset(const std::string& assetName, AssetCreationContext& context) = 0;
virtual void FinalizeZone(AssetCreationContext& context) {};
virtual bool FinalizeZone(AssetCreationContext& context)
{
return true;
};
};
template<typename AssetType> class AssetCreator : public IAssetCreator

4
src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp
View File

@@ -73,9 +73,11 @@ namespace
return AssetCreationResult::Success(context.AddAsset(std::move(registration)));
}
void FinalizeZone(AssetCreationContext& context) override
bool FinalizeZone(AssetCreationContext& context) override
{
context.GetZoneAssetCreationState<MenuConversionZoneState>().FinalizeSupportingData();
return true;
}
private:

4
src/ObjLoading/Game/IW5/Menu/LoaderMenuListIW5.cpp
View File

@@ -73,9 +73,11 @@ namespace
return AssetCreationResult::Success(context.AddAsset(std::move(registration)));
}
void FinalizeZone(AssetCreationContext& context) override
bool FinalizeZone(AssetCreationContext& context) override
{
context.GetZoneAssetCreationState<MenuConversionZoneState>().FinalizeSupportingData();
return true;
}
private:

15
src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp
View File

@@ -30,23 +30,18 @@ namespace
return AssetCreationResult::NoAction();
}
void FinalizeZone(AssetCreationContext& context) override
bool FinalizeZone(AssetCreationContext& context) override
{
// custom maps must have a map_gfx file
std::string mapGfxFileName = "map_gfx.fbx";
auto mapGfxFile = m_search_path.Open(BSPUtil::getFileNameForBSPAsset(mapGfxFileName));
if (!mapGfxFile.IsOpen())
return;
std::unique_ptr<BSPData> bsp = BSP::createBSPData(m_zone.m_name, m_search_path);
if (bsp == nullptr)
return;
return false;
BSPLinker linker(m_memory, m_search_path, context);
if (!linker.linkBSP(bsp.get()))
bool result = linker.linkBSP(bsp.get());
if (!result)
con::error("BSP link has failed.");
return;
return result;
}
private: