2
0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-10-27 00:26:57 +00:00

refactor: do not nest asset namespaces in game namespaces

* Duplicated namespace names are kind of annoying
This commit is contained in:
Jan Laupetin
2025-08-06 00:50:35 +02:00
parent 33c09dfe61
commit 46fb919a52
336 changed files with 1430 additions and 1480 deletions

View File

@@ -48,7 +48,8 @@
using namespace nlohmann;
using namespace GAME;
using namespace ::material;
#set CLASS_NAME "JsonDumper" + GAME
namespace
{
@@ -358,9 +359,9 @@ namespace
};
} // namespace
namespace GAME::material
namespace material
{
void JsonDumper::DumpPool(AssetDumpingContext& context, AssetPool<Material>* pool)
void CLASS_NAME::DumpPool(AssetDumpingContext& context, AssetPool<Material>* pool)
{
auto* materialConstantState = context.GetZoneAssetDumperState<MaterialConstantZoneState>();
materialConstantState->ExtractNamesFromZone();
@@ -368,12 +369,12 @@ namespace GAME::material
AbstractAssetDumper::DumpPool(context, pool);
}
bool JsonDumper::ShouldDump(XAssetInfo<Material>* asset)
bool CLASS_NAME::ShouldDump(XAssetInfo<Material>* asset)
{
return true;
}
void JsonDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<Material>* asset)
void CLASS_NAME::DumpAsset(AssetDumpingContext& context, XAssetInfo<Material>* asset)
{
const auto assetFile = context.OpenAssetFile(GetFileNameForAssetName(asset->m_name));
@@ -393,5 +394,5 @@ namespace GAME::material
JsonDumperImpl dumper(context, *assetFile);
dumper.Dump(*material);
}
} // namespace T6::leaderboard
} // namespace material

View File

@@ -13,15 +13,17 @@
#set GAME_HEADER "\"Game/" + GAME + "/" + GAME + ".h\""
#include GAME_HEADER
namespace GAME::material
#set CLASS_NAME "JsonDumper" + GAME
namespace material
{
class JsonDumper final : public AbstractAssetDumper<Material>
class CLASS_NAME final : public AbstractAssetDumper<GAME::Material>
{
public:
void DumpPool(AssetDumpingContext& context, AssetPool<Material>* pool) override;
void DumpPool(AssetDumpingContext& context, AssetPool<GAME::Material>* pool) override;
protected:
[[nodiscard]] bool ShouldDump(XAssetInfo<Material>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<Material>* asset) override;
[[nodiscard]] bool ShouldDump(XAssetInfo<GAME::Material>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<GAME::Material>* asset) override;
};
} // namespace GAME::material
} // namespace material