mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-10-30 10:06:57 +00:00
refactor: streamline namespaces of xmodel dumping and loading
This commit is contained in:
@@ -47,6 +47,7 @@
|
||||
#include <format>
|
||||
|
||||
using namespace GAME;
|
||||
using namespace ::xmodel;
|
||||
|
||||
namespace
|
||||
{
|
||||
@@ -830,7 +831,7 @@ namespace
|
||||
|
||||
void DumpXModelJson(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
|
||||
{
|
||||
const auto assetFile = context.OpenAssetFile(std::format("xmodel/{}.json", asset->m_name));
|
||||
const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAssetName(asset->m_name));
|
||||
if (!assetFile)
|
||||
return;
|
||||
|
||||
@@ -839,13 +840,16 @@ namespace
|
||||
}
|
||||
} // namespace
|
||||
|
||||
bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
|
||||
namespace GAME::xmodel
|
||||
{
|
||||
return !asset->m_name.empty() && asset->m_name[0] != ',';
|
||||
}
|
||||
bool Dumper::ShouldDump(XAssetInfo<XModel>* asset)
|
||||
{
|
||||
return !asset->m_name.empty() && asset->m_name[0] != ',';
|
||||
}
|
||||
|
||||
void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
|
||||
{
|
||||
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
|
||||
{
|
||||
DumpXModelJson(context, asset);
|
||||
DumpXModelSurfs(context, asset);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
#include "Dumping/AbstractAssetDumper.h"
|
||||
#include GAME_HEADER
|
||||
|
||||
namespace GAME
|
||||
namespace GAME::xmodel
|
||||
{
|
||||
class AssetDumperXModel final : public AbstractAssetDumper<XModel>
|
||||
class Dumper final : public AbstractAssetDumper<XModel>
|
||||
{
|
||||
protected:
|
||||
bool ShouldDump(XAssetInfo<XModel>* asset) override;
|
||||
|
||||
Reference in New Issue
Block a user