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

refactor: get rid of unnecessary AssetDumper wrapper class

This commit is contained in:
Jan Laupetin
2025-07-25 17:52:10 +01:00
parent be2a33b869
commit 64bd89dc46
17 changed files with 20 additions and 158 deletions

View File

@@ -1,15 +0,0 @@
#include "AssetDumperXModel.h"
#include "Game/IW3/XModel/XModelDumperIW3.h"
using namespace IW3;
bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
{
return !asset->m_name.empty() && asset->m_name[0] != ',';
}
void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
{
DumpXModel(context, asset);
}

View File

@@ -1,14 +0,0 @@
#pragma once
#include "Dumping/AbstractAssetDumper.h"
#include "Game/IW3/IW3.h"
namespace IW3
{
class AssetDumperXModel final : public AbstractAssetDumper<XModel>
{
protected:
bool ShouldDump(XAssetInfo<XModel>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
};
} // namespace IW3

View File

@@ -7,8 +7,8 @@
#include "AssetDumpers/AssetDumperRawFile.h"
#include "AssetDumpers/AssetDumperStringTable.h"
#include "AssetDumpers/AssetDumperWeapon.h"
#include "AssetDumpers/AssetDumperXModel.h"
#include "Game/IW3/GameAssetPoolIW3.h"
#include "Game/IW3/XModel/XModelDumperIW3.h"
#include "Material/DumperMaterialIW3.h"
#include "ObjWriting.h"

View File

@@ -1,15 +0,0 @@
#include "AssetDumperXModel.h"
#include "Game/IW4/XModel/XModelDumperIW4.h"
using namespace IW4;
bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
{
return !asset->m_name.empty() && asset->m_name[0] != ',';
}
void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
{
DumpXModel(context, asset);
}

View File

@@ -1,14 +0,0 @@
#pragma once
#include "Dumping/AbstractAssetDumper.h"
#include "Game/IW4/IW4.h"
namespace IW4
{
class AssetDumperXModel final : public AbstractAssetDumper<XModel>
{
protected:
bool ShouldDump(XAssetInfo<XModel>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
};
} // namespace IW4

View File

@@ -20,8 +20,8 @@
#include "AssetDumpers/AssetDumperVehicle.h"
#include "AssetDumpers/AssetDumperVertexShader.h"
#include "AssetDumpers/AssetDumperWeapon.h"
#include "AssetDumpers/AssetDumperXModel.h"
#include "Game/IW4/GameAssetPoolIW4.h"
#include "Game/IW4/XModel/XModelDumperIW4.h"
#include "Material/DumperMaterialIW4.h"
#include "ObjWriting.h"

View File

@@ -1,15 +0,0 @@
#include "AssetDumperXModel.h"
#include "Game/IW5/XModel/XModelDumperIW5.h"
using namespace IW5;
bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
{
return !asset->m_name.empty() && asset->m_name[0] != ',';
}
void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
{
DumpXModel(context, asset);
}

View File

@@ -1,14 +0,0 @@
#pragma once
#include "Dumping/AbstractAssetDumper.h"
#include "Game/IW5/IW5.h"
namespace IW5
{
class AssetDumperXModel final : public AbstractAssetDumper<XModel>
{
protected:
bool ShouldDump(XAssetInfo<XModel>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
};
} // namespace IW5

View File

@@ -12,8 +12,8 @@
#include "AssetDumpers/AssetDumperStringTable.h"
#include "AssetDumpers/AssetDumperWeapon.h"
#include "AssetDumpers/AssetDumperWeaponAttachment.h"
#include "AssetDumpers/AssetDumperXModel.h"
#include "Game/IW5/GameAssetPoolIW5.h"
#include "Game/IW5/XModel/XModelDumperIW5.h"
#include "Material/DumperMaterialIW5.h"
#include "ObjWriting.h"

View File

@@ -1,15 +0,0 @@
#include "AssetDumperXModel.h"
#include "Game/T5/XModel/XModelDumperT5.h"
using namespace T5;
bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
{
return !asset->m_name.empty() && asset->m_name[0] != ',';
}
void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
{
DumpXModel(context, asset);
}

View File

@@ -1,14 +0,0 @@
#pragma once
#include "Dumping/AbstractAssetDumper.h"
#include "Game/T5/T5.h"
namespace T5
{
class AssetDumperXModel final : public AbstractAssetDumper<XModel>
{
protected:
bool ShouldDump(XAssetInfo<XModel>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
};
} // namespace T5

View File

@@ -8,8 +8,8 @@
#include "AssetDumpers/AssetDumperSndBank.h"
#include "AssetDumpers/AssetDumperStringTable.h"
#include "AssetDumpers/AssetDumperWeapon.h"
#include "AssetDumpers/AssetDumperXModel.h"
#include "Game/T5/GameAssetPoolT5.h"
#include "Game/T5/XModel/XModelDumperT5.h"
#include "Material/DumperMaterialT5.h"
#include "ObjWriting.h"

View File

@@ -1,15 +0,0 @@
#include "AssetDumperXModel.h"
#include "Game/T6/XModel/XModelDumperT6.h"
using namespace T6;
bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
{
return !asset->m_name.empty() && asset->m_name[0] != ',';
}
void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
{
DumpXModel(context, asset);
}

View File

@@ -1,14 +0,0 @@
#pragma once
#include "Dumping/AbstractAssetDumper.h"
#include "Game/T6/T6.h"
namespace T6
{
class AssetDumperXModel final : public AbstractAssetDumper<XModel>
{
protected:
bool ShouldDump(XAssetInfo<XModel>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
};
} // namespace T6

View File

@@ -20,10 +20,10 @@
#include "AssetDumpers/AssetDumperWeaponAttachment.h"
#include "AssetDumpers/AssetDumperWeaponAttachmentUnique.h"
#include "AssetDumpers/AssetDumperWeaponCamo.h"
#include "AssetDumpers/AssetDumperXModel.h"
#include "AssetDumpers/AssetDumperZBarrier.h"
#include "FontIcon/DumperFontIconT6.h"
#include "Game/T6/GameAssetPoolT6.h"
#include "Game/T6/XModel/XModelDumperT6.h"
#include "Material/DumperMaterialT6.h"
#include "ObjWriting.h"

View File

@@ -839,11 +839,13 @@ namespace
}
} // namespace
namespace GAME
bool AssetDumperXModel::ShouldDump(XAssetInfo<XModel>* asset)
{
return !asset->m_name.empty() && asset->m_name[0] != ',';
}
void AssetDumperXModel::DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
{
void DumpXModel(AssetDumpingContext& context, XAssetInfo<XModel>* asset)
{
DumpXModelJson(context, asset);
DumpXModelSurfs(context, asset);
}
} // namespace GAME
}

View File

@@ -10,10 +10,15 @@
#pragma once
#include "Dumping/AssetDumpingContext.h"
#include "Dumping/AbstractAssetDumper.h"
#include GAME_HEADER
namespace GAME
{
void DumpXModel(AssetDumpingContext& context, XAssetInfo<XModel>* asset);
}
class AssetDumperXModel final : public AbstractAssetDumper<XModel>
{
protected:
bool ShouldDump(XAssetInfo<XModel>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<XModel>* asset) override;
};
} // namespace GAME