zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-10-30 10:06:57 +00:00
Code Activity

refactor: do not nest asset namespaces in game namespaces

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ObjWriting/XModel/XModelDumper.cpp.template
View File

@@ -47,7 +47,8 @@
#include <format>
using namespace GAME;
using namespace ::xmodel;
#set CLASS_NAME "Dumper" + GAME
namespace
{
@@ -831,7 +832,7 @@ namespace
void DumpXModelJson(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
{
const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAssetName(asset->m_name));
const auto assetFile = context.OpenAssetFile(xmodel::GetJsonFileNameForAssetName(asset->m_name));
if (!assetFile)
return;
@@ -840,14 +841,14 @@ namespace
}
} // namespace
namespace GAME::xmodel
namespace xmodel
{
bool Dumper::ShouldDump(XAssetInfo<XModel>* asset)
bool CLASS_NAME::ShouldDump(XAssetInfo<XModel>* asset)
{
return !asset->m_name.empty() && asset->m_name[0] != ',';
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
void CLASS_NAME::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
{
DumpXModelJson(context, asset);
DumpXModelSurfs(context, asset);

12
src/ObjWriting/XModel/XModelDumper.h.template
View File

@@ -13,12 +13,14 @@
#include "Dumping/AbstractAssetDumper.h"
#include GAME_HEADER
namespace GAME::xmodel
#set CLASS_NAME "Dumper" + GAME
namespace xmodel
{
class Dumper final : public AbstractAssetDumper<XModel>
class CLASS_NAME final : public AbstractAssetDumper<GAME::XModel>
{
protected:
bool ShouldDump(XAssetInfo<XModel>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
bool ShouldDump(XAssetInfo<GAME::XModel>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<GAME::XModel>* asset) override;
};
} // namespace GAME
} // namespace xmodel