2
0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-01-11 11:11:50 +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

@@ -9,7 +9,6 @@
using namespace nlohmann;
using namespace IW4;
using namespace ::leaderboard;
namespace
{
@@ -76,14 +75,14 @@ namespace
};
} // namespace
namespace IW4::leaderboard
namespace leaderboard
{
bool JsonDumper::ShouldDump(XAssetInfo<LeaderboardDef>* asset)
bool JsonDumperIW4::ShouldDump(XAssetInfo<LeaderboardDef>* asset)
{
return true;
}
void JsonDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset)
void JsonDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset)
{
const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAsset(asset->m_name));
@@ -93,4 +92,4 @@ namespace IW4::leaderboard
Dumper dumper(*assetFile);
dumper.Dump(*asset->Asset());
}
} // namespace IW4::leaderboard
} // namespace leaderboard

View File

@@ -3,12 +3,12 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/IW4/IW4.h"
namespace IW4::leaderboard
namespace leaderboard
{
class JsonDumper final : public AbstractAssetDumper<LeaderboardDef>
class JsonDumperIW4 final : public AbstractAssetDumper<IW4::LeaderboardDef>
{
protected:
[[nodiscard]] bool ShouldDump(XAssetInfo<LeaderboardDef>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset) override;
[[nodiscard]] bool ShouldDump(XAssetInfo<IW4::LeaderboardDef>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::LeaderboardDef>* asset) override;
};
} // namespace IW4::leaderboard
} // namespace leaderboard