zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-10-24 15:25:52 +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

8
src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.cpp
View File

@@ -22,14 +22,14 @@ namespace
}
} // namespace
namespace IW4::sound
namespace sound
{
bool LoadedSoundDumper::ShouldDump(XAssetInfo<LoadedSound>* asset)
bool LoadedSoundDumperIW4::ShouldDump(XAssetInfo<LoadedSound>* asset)
{
return true;
}
void LoadedSoundDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset)
void LoadedSoundDumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset)
{
const auto* loadedSound = asset->Asset();
const auto assetFile = context.OpenAssetFile(std::format("sound/{}", asset->m_name));
@@ -49,4 +49,4 @@ namespace IW4::sound
break;
}
}
} // namespace IW4::sound
} // namespace sound

10
src/ObjWriting/Game/IW4/Sound/LoadedSoundDumperIW4.h
View File

@@ -3,12 +3,12 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/IW4/IW4.h"
namespace IW4::sound
namespace sound
{
class LoadedSoundDumper final : public AbstractAssetDumper<LoadedSound>
class LoadedSoundDumperIW4 final : public AbstractAssetDumper<IW4::LoadedSound>
{
protected:
bool ShouldDump(XAssetInfo<LoadedSound>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset) override;
bool ShouldDump(XAssetInfo<IW4::LoadedSound>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::LoadedSound>* asset) override;
};
} // namespace IW4::sound
} // namespace sound

9
src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.cpp
View File

@@ -6,16 +6,15 @@
#include <sstream>
using namespace IW4;
using namespace ::sound_curve;
namespace IW4::sound_curve
namespace sound_curve
{
bool Dumper::ShouldDump(XAssetInfo<SndCurve>* asset)
bool DumperIW4::ShouldDump(XAssetInfo<SndCurve>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<SndCurve>* asset)
void DumperIW4::DumpAsset(AssetDumpingContext& context, XAssetInfo<SndCurve>* asset)
{
const auto* sndCurve = asset->Asset();
@@ -32,4 +31,4 @@ namespace IW4::sound_curve
for (auto i = 0u; i < knotCount; i++)
dumper.WriteKnot(sndCurve->knots[i][0], sndCurve->knots[i][1]);
}
} // namespace IW4::sound_curve
} // namespace sound_curve

10
src/ObjWriting/Game/IW4/Sound/SndCurveDumperIW4.h
View File

@@ -3,12 +3,12 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/IW4/IW4.h"
namespace IW4::sound_curve
namespace sound_curve
{
class Dumper final : public AbstractAssetDumper<SndCurve>
class DumperIW4 final : public AbstractAssetDumper<IW4::SndCurve>
{
protected:
bool ShouldDump(XAssetInfo<SndCurve>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<SndCurve>* asset) override;
bool ShouldDump(XAssetInfo<IW4::SndCurve>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<IW4::SndCurve>* asset) override;
};
} // namespace IW4::sound_curve
} // namespace sound_curve