zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-02-14 19:33:02 +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/T6/FontIcon/FontIconCsvDumperT6.cpp
View File

@@ -131,14 +131,14 @@ namespace
};
} // namespace
namespace T6::font_icon
namespace font_icon
{
bool CsvDumper::ShouldDump(XAssetInfo<FontIcon>* asset)
bool CsvDumperT6::ShouldDump(XAssetInfo<FontIcon>* asset)
{
return true;
}
void CsvDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset)
void CsvDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset)
{
const auto assetFile = context.OpenAssetFile(asset->m_name);
@@ -148,4 +148,4 @@ namespace T6::font_icon
Dumper dumper(*assetFile);
dumper.Dump(*asset->Asset());
}
} // namespace T6::font_icon
} // namespace font_icon

10
src/ObjWriting/Game/T6/FontIcon/FontIconCsvDumperT6.h
View File

@@ -3,12 +3,12 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/T6/T6.h"
namespace T6::font_icon
namespace font_icon
{
class CsvDumper final : public AbstractAssetDumper<FontIcon>
class CsvDumperT6 final : public AbstractAssetDumper<T6::FontIcon>
{
protected:
bool ShouldDump(XAssetInfo<FontIcon>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset) override;
bool ShouldDump(XAssetInfo<T6::FontIcon>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::FontIcon>* asset) override;
};
} // namespace T6::font_icon
} // namespace font_icon

10
src/ObjWriting/Game/T6/FontIcon/FontIconDumperT6.cpp
View File

@@ -7,14 +7,14 @@ using namespace T6;
// #define DUMP_FONT_ICON_AS_CSV 1
namespace T6::font_icon
namespace font_icon
{
std::unique_ptr<IAssetDumper<FontIcon>> CreateDumper()
std::unique_ptr<IAssetDumper<FontIcon>> CreateDumperT6()
{
#ifdef DUMP_FONT_ICON_AS_CSV
return std::make_unique<CsvDumper>();
return std::make_unique<CsvDumperT6>();
#else
return std::make_unique<JsonDumper>();
return std::make_unique<JsonDumperT6>();
#endif
}
} // namespace T6::font_icon
} // namespace font_icon

8
src/ObjWriting/Game/T6/FontIcon/FontIconDumperT6.h
View File

@@ -3,7 +3,9 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/T6/T6.h"
namespace T6::font_icon
#include <memory>
namespace font_icon
{
std::unique_ptr<IAssetDumper<FontIcon>> CreateDumper();
} // namespace T6::font_icon
std::unique_ptr<IAssetDumper<T6::FontIcon>> CreateDumperT6();
} // namespace font_icon

12
src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.cpp
View File

@@ -1,7 +1,7 @@
#include "FontIconJsonDumperT6.h"
#include "FontIcon/FontIconCommon.h"
#include "Game/T6/CommonT6.h"
#include "Game/T6/FontIcon/FontIconCommonT6.h"
#include "Game/T6/FontIcon/JsonFontIconT6.h"
#include "KnownFontIconAliasesT6.h"
@@ -76,20 +76,20 @@ namespace
}
} // namespace
namespace T6::font_icon
namespace font_icon
{
bool JsonDumper::ShouldDump(XAssetInfo<FontIcon>* asset)
bool JsonDumperT6::ShouldDump(XAssetInfo<FontIcon>* asset)
{
return true;
}
void JsonDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset)
void JsonDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset)
{
const auto assetFile = context.OpenAssetFile(font_icon::GetJsonFileNameForAssetName(asset->m_name));
const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAssetName(asset->m_name));
if (!assetFile)
return;
DumpFontIcon(*assetFile, *asset->Asset());
}
} // namespace T6::font_icon
} // namespace font_icon

10
src/ObjWriting/Game/T6/FontIcon/FontIconJsonDumperT6.h
View File

@@ -3,12 +3,12 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/T6/T6.h"
namespace T6::font_icon
namespace font_icon
{
class JsonDumper final : public AbstractAssetDumper<FontIcon>
class JsonDumperT6 final : public AbstractAssetDumper<T6::FontIcon>
{
protected:
bool ShouldDump(XAssetInfo<FontIcon>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset) override;
bool ShouldDump(XAssetInfo<T6::FontIcon>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::FontIcon>* asset) override;
};
} // namespace T6::font_icon
} // namespace font_icon

13
src/ObjWriting/Game/T6/Image/ImageDumperT6.cpp
View File

@@ -13,7 +13,6 @@
#include <format>
using namespace T6;
using namespace ::image;
namespace
{
@@ -55,7 +54,7 @@ namespace
}
}
const auto imageFileName = std::format("images/{}.iwi", image.name);
const auto imageFileName = image::GetFileNameForAsset(image.name, ".iwi");
const auto filePathImage = searchPath.Open(imageFileName);
if (!filePathImage.IsOpen())
{
@@ -75,9 +74,9 @@ namespace
}
} // namespace
namespace T6::image
namespace image
{
Dumper::Dumper()
DumperT6::DumperT6()
{
switch (ObjWriting::Configuration.ImageOutputFormat)
{
@@ -94,12 +93,12 @@ namespace T6::image
}
}
bool Dumper::ShouldDump(XAssetInfo<GfxImage>* asset)
bool DumperT6::ShouldDump(XAssetInfo<GfxImage>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset)
{
const auto* image = asset->Asset();
const auto texture = LoadImageData(context.m_obj_search_path, *image);
@@ -114,4 +113,4 @@ namespace T6::image
auto& stream = *assetFile;
m_writer->DumpImage(stream, texture.get());
}
} // namespace T6::image
} // namespace image

12
src/ObjWriting/Game/T6/Image/ImageDumperT6.h
View File

@@ -6,18 +6,18 @@
#include <memory>
namespace T6::image
namespace image
{
class Dumper final : public AbstractAssetDumper<GfxImage>
class DumperT6 final : public AbstractAssetDumper<T6::GfxImage>
{
public:
Dumper();
DumperT6();
protected:
bool ShouldDump(XAssetInfo<GfxImage>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset) override;
bool ShouldDump(XAssetInfo<T6::GfxImage>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::GfxImage>* asset) override;
private:
std::unique_ptr<IImageWriter> m_writer;
};
} // namespace T6::image
} // namespace image

9
src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.cpp
View File

@@ -10,7 +10,6 @@
using namespace nlohmann;
using namespace T6;
using namespace ::leaderboard;
namespace
{
@@ -97,14 +96,14 @@ namespace
};
} // namespace
namespace T6::leaderboard
namespace leaderboard
{
bool JsonDumper::ShouldDump(XAssetInfo<LeaderboardDef>* asset)
bool JsonDumperT6::ShouldDump(XAssetInfo<LeaderboardDef>* asset)
{
return true;
}
void JsonDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset)
void JsonDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset)
{
const auto assetFile = context.OpenAssetFile(GetJsonFileNameForAsset(asset->m_name));
@@ -114,4 +113,4 @@ namespace T6::leaderboard
Dumper dumper(*assetFile);
dumper.Dump(*asset->Asset());
}
} // namespace T6::leaderboard
} // namespace leaderboard

10
src/ObjWriting/Game/T6/Leaderboard/LeaderboardJsonDumperT6.h
View File

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

6
src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.cpp
View File

@@ -8,9 +8,9 @@
using namespace T6;
namespace T6::localize
namespace localize
{
void Dumper::DumpPool(AssetDumpingContext& context, AssetPool<LocalizeEntry>* pool)
void DumperT6::DumpPool(AssetDumpingContext& context, AssetPool<LocalizeEntry>* pool)
{
if (pool->m_asset_lookup.empty())
return;
@@ -41,4 +41,4 @@ namespace T6::localize
std::cerr << std::format("Could not create string file for dumping localized strings of zone '{}'\n", context.m_zone.m_name);
}
}
} // namespace T6::localize
} // namespace localize

8
src/ObjWriting/Game/T6/Localize/LocalizeDumperT6.h
View File

@@ -3,11 +3,11 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/T6/T6.h"
namespace T6::localize
namespace localize
{
class Dumper final : public IAssetDumper<LocalizeEntry>
class DumperT6 final : public IAssetDumper<T6::LocalizeEntry>
{
public:
void DumpPool(AssetDumpingContext& context, AssetPool<LocalizeEntry>* pool) override;
void DumpPool(AssetDumpingContext& context, AssetPool<T6::LocalizeEntry>* pool) override;
};
} // namespace T6::localize
} // namespace localize

8
src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.cpp
View File

@@ -4,14 +4,14 @@
using namespace T6;
namespace T6::map_ents
namespace map_ents
{
bool Dumper::ShouldDump(XAssetInfo<MapEnts>* asset)
bool DumperT6::ShouldDump(XAssetInfo<MapEnts>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset)
{
const auto* mapEnts = asset->Asset();
@@ -23,4 +23,4 @@ namespace T6::map_ents
auto& stream = *mapEntsFile;
stream.write(mapEnts->entityString, mapEnts->numEntityChars - 1);
}
} // namespace T6::map_ents
} // namespace map_ents

10
src/ObjWriting/Game/T6/Maps/MapEntsDumperT6.h
View File

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

48
src/ObjWriting/Game/T6/ObjWriterT6.cpp
View File

@@ -46,54 +46,54 @@ bool ObjWriter::DumpZone(AssetDumpingContext& context) const
const auto* assetPools = dynamic_cast<GameAssetPoolT6*>(context.m_zone.m_pools.get());
DUMP_ASSET_POOL(phys_preset::InfoStringDumper, m_phys_preset, ASSET_TYPE_PHYSPRESET)
DUMP_ASSET_POOL(phys_constraints::InfoStringDumper, m_phys_constraints, ASSET_TYPE_PHYSCONSTRAINTS)
DUMP_ASSET_POOL(phys_preset::InfoStringDumperT6, m_phys_preset, ASSET_TYPE_PHYSPRESET)
DUMP_ASSET_POOL(phys_constraints::InfoStringDumperT6, m_phys_constraints, ASSET_TYPE_PHYSCONSTRAINTS)
// DUMP_ASSET_POOL(AssetDumperDestructibleDef, m_destructible_def, ASSET_TYPE_DESTRUCTIBLEDEF)
// DUMP_ASSET_POOL(AssetDumperXAnimParts, m_xanim_parts, ASSET_TYPE_XANIMPARTS)
DUMP_ASSET_POOL(xmodel::Dumper, m_xmodel, ASSET_TYPE_XMODEL)
DUMP_ASSET_POOL(material::JsonDumper, m_material, ASSET_TYPE_MATERIAL)
DUMP_ASSET_POOL(techset::Dumper, m_technique_set, ASSET_TYPE_TECHNIQUE_SET)
DUMP_ASSET_POOL(image::Dumper, m_image, ASSET_TYPE_IMAGE)
DUMP_ASSET_POOL(sound::SndBankDumper, m_sound_bank, ASSET_TYPE_SOUND)
DUMP_ASSET_POOL(xmodel::DumperT6, m_xmodel, ASSET_TYPE_XMODEL)
DUMP_ASSET_POOL(material::JsonDumperT6, m_material, ASSET_TYPE_MATERIAL)
DUMP_ASSET_POOL(techset::DumperT6, m_technique_set, ASSET_TYPE_TECHNIQUE_SET)
DUMP_ASSET_POOL(image::DumperT6, m_image, ASSET_TYPE_IMAGE)
DUMP_ASSET_POOL(sound::SndBankDumperT6, m_sound_bank, ASSET_TYPE_SOUND)
// DUMP_ASSET_POOL(AssetDumperSndPatch, m_sound_patch, ASSET_TYPE_SOUND_PATCH)
// DUMP_ASSET_POOL(AssetDumperClipMap, m_clip_map, ASSET_TYPE_CLIPMAP_PVS)
// DUMP_ASSET_POOL(AssetDumperComWorld, m_com_world, ASSET_TYPE_COMWORLD)
// DUMP_ASSET_POOL(AssetDumperGameWorldSp, m_game_world_sp, ASSET_TYPE_GAMEWORLD_SP)
// DUMP_ASSET_POOL(AssetDumperGameWorldMp, m_game_world_mp, ASSET_TYPE_GAMEWORLD_MP)
DUMP_ASSET_POOL(map_ents::Dumper, m_map_ents, ASSET_TYPE_MAP_ENTS)
DUMP_ASSET_POOL(map_ents::DumperT6, m_map_ents, ASSET_TYPE_MAP_ENTS)
// DUMP_ASSET_POOL(AssetDumperGfxWorld, m_gfx_world, ASSET_TYPE_GFXWORLD)
// DUMP_ASSET_POOL(AssetDumperGfxLightDef, m_gfx_light_def, ASSET_TYPE_LIGHT_DEF)
// DUMP_ASSET_POOL(AssetDumperFont, m_font, ASSET_TYPE_FONT)
DUMP_ASSET_POOL_WITH_FACTORY(font_icon::CreateDumper(), m_font_icon, ASSET_TYPE_FONTICON)
DUMP_ASSET_POOL_WITH_FACTORY(font_icon::CreateDumperT6(), m_font_icon, ASSET_TYPE_FONTICON)
// DUMP_ASSET_POOL(AssetDumperMenuList, m_menu_list, ASSET_TYPE_MENULIST)
// DUMP_ASSET_POOL(AssetDumperMenuDef, m_menu_def, ASSET_TYPE_MENU)
DUMP_ASSET_POOL(localize::Dumper, m_localize, ASSET_TYPE_LOCALIZE_ENTRY)
DUMP_ASSET_POOL(weapon::Dumper, m_weapon, ASSET_TYPE_WEAPON)
DUMP_ASSET_POOL(attachment::Dumper, m_attachment, ASSET_TYPE_ATTACHMENT)
DUMP_ASSET_POOL(attachment_unique::Dumper, m_attachment_unique, ASSET_TYPE_ATTACHMENT_UNIQUE)
DUMP_ASSET_POOL(camo::JsonDumper, m_camo, ASSET_TYPE_WEAPON_CAMO)
DUMP_ASSET_POOL(sound::SndDriverGlobalsDumper, m_snd_driver_globals, ASSET_TYPE_SNDDRIVER_GLOBALS)
DUMP_ASSET_POOL(localize::DumperT6, m_localize, ASSET_TYPE_LOCALIZE_ENTRY)
DUMP_ASSET_POOL(weapon::DumperT6, m_weapon, ASSET_TYPE_WEAPON)
DUMP_ASSET_POOL(attachment::DumperT6, m_attachment, ASSET_TYPE_ATTACHMENT)
DUMP_ASSET_POOL(attachment_unique::DumperT6, m_attachment_unique, ASSET_TYPE_ATTACHMENT_UNIQUE)
DUMP_ASSET_POOL(camo::JsonDumperT6, m_camo, ASSET_TYPE_WEAPON_CAMO)
DUMP_ASSET_POOL(sound::SndDriverGlobalsDumperT6, m_snd_driver_globals, ASSET_TYPE_SNDDRIVER_GLOBALS)
// DUMP_ASSET_POOL(AssetDumperFxEffectDef, m_fx, ASSET_TYPE_FX)
// DUMP_ASSET_POOL(AssetDumperFxImpactTable, m_fx_impact_table, ASSET_TYPE_IMPACT_FX)
DUMP_ASSET_POOL(raw_file::Dumper, m_raw_file, ASSET_TYPE_RAWFILE)
DUMP_ASSET_POOL(string_table::Dumper, m_string_table, ASSET_TYPE_STRINGTABLE)
DUMP_ASSET_POOL(leaderboard::JsonDumper, m_leaderboard, ASSET_TYPE_LEADERBOARD)
DUMP_ASSET_POOL(raw_file::DumperT6, m_raw_file, ASSET_TYPE_RAWFILE)
DUMP_ASSET_POOL(string_table::DumperT6, m_string_table, ASSET_TYPE_STRINGTABLE)
DUMP_ASSET_POOL(leaderboard::JsonDumperT6, m_leaderboard, ASSET_TYPE_LEADERBOARD)
// DUMP_ASSET_POOL(AssetDumperXGlobals, m_xglobals, ASSET_TYPE_XGLOBALS)
// DUMP_ASSET_POOL(AssetDumperDDLRoot, m_ddl, ASSET_TYPE_DDL)
// DUMP_ASSET_POOL(AssetDumperGlasses, m_glasses, ASSET_TYPE_GLASSES)
// DUMP_ASSET_POOL(AssetDumperEmblemSet, m_emblem_set, ASSET_TYPE_EMBLEMSET)
DUMP_ASSET_POOL(script::Dumper, m_script, ASSET_TYPE_SCRIPTPARSETREE)
DUMP_ASSET_POOL(script::DumperT6, m_script, ASSET_TYPE_SCRIPTPARSETREE)
// DUMP_ASSET_POOL(AssetDumperKeyValuePairs, m_key_value_pairs, ASSET_TYPE_KEYVALUEPAIRS)
DUMP_ASSET_POOL(vehicle::Dumper, m_vehicle, ASSET_TYPE_VEHICLEDEF)
DUMP_ASSET_POOL(vehicle::DumperT6, m_vehicle, ASSET_TYPE_VEHICLEDEF)
// DUMP_ASSET_POOL(AssetDumperMemoryBlock, m_memory_block, ASSET_TYPE_MEMORYBLOCK)
// DUMP_ASSET_POOL(AssetDumperAddonMapEnts, m_addon_map_ents, ASSET_TYPE_ADDON_MAP_ENTS)
DUMP_ASSET_POOL(tracer::Dumper, m_tracer, ASSET_TYPE_TRACER)
DUMP_ASSET_POOL(tracer::DumperT6, m_tracer, ASSET_TYPE_TRACER)
// DUMP_ASSET_POOL(AssetDumperSkinnedVertsDef, m_skinned_verts, ASSET_TYPE_SKINNEDVERTS)
DUMP_ASSET_POOL(qdb::Dumper, m_qdb, ASSET_TYPE_QDB)
DUMP_ASSET_POOL(slug::Dumper, m_slug, ASSET_TYPE_SLUG)
DUMP_ASSET_POOL(qdb::DumperT6, m_qdb, ASSET_TYPE_QDB)
DUMP_ASSET_POOL(slug::DumperT6, m_slug, ASSET_TYPE_SLUG)
// DUMP_ASSET_POOL(AssetDumperFootstepTableDef, m_footstep_table, ASSET_TYPE_FOOTSTEP_TABLE)
// DUMP_ASSET_POOL(AssetDumperFootstepFXTableDef, m_footstep_fx_table, ASSET_TYPE_FOOTSTEPFX_TABLE)
DUMP_ASSET_POOL(z_barrier::Dumper, m_zbarrier, ASSET_TYPE_ZBARRIER)
DUMP_ASSET_POOL(z_barrier::DumperT6, m_zbarrier, ASSET_TYPE_ZBARRIER)
return true;

9
src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.cpp
View File

@@ -9,7 +9,6 @@
#include <type_traits>
using namespace T6;
using namespace ::phys_constraints;
namespace
{
@@ -60,14 +59,14 @@ namespace
}
} // namespace
namespace T6::phys_constraints
namespace phys_constraints
{
bool InfoStringDumper::ShouldDump(XAssetInfo<PhysConstraints>* asset)
bool InfoStringDumperT6::ShouldDump(XAssetInfo<PhysConstraints>* asset)
{
return true;
}
void InfoStringDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset)
void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset)
{
// Only dump raw when no gdt available
if (context.m_gdt)
@@ -90,4 +89,4 @@ namespace T6::phys_constraints
stream.write(stringValue.c_str(), stringValue.size());
}
}
} // namespace T6::phys_constraints
} // namespace phys_constraints

10
src/ObjWriting/Game/T6/PhysConstraints/PhysConstraintsInfoStringDumperT6.h
View File

@@ -4,12 +4,12 @@
#include "Game/T6/T6.h"
#include "InfoString/InfoString.h"
namespace T6::phys_constraints
namespace phys_constraints
{
class InfoStringDumper final : public AbstractAssetDumper<PhysConstraints>
class InfoStringDumperT6 final : public AbstractAssetDumper<T6::PhysConstraints>
{
protected:
bool ShouldDump(XAssetInfo<PhysConstraints>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset) override;
bool ShouldDump(XAssetInfo<T6::PhysConstraints>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::PhysConstraints>* asset) override;
};
} // namespace T6::phys_constraints
} // namespace phys_constraints

9
src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.cpp
View File

@@ -11,7 +11,6 @@
#include <type_traits>
using namespace T6;
using namespace ::phys_preset;
namespace
{
@@ -81,14 +80,14 @@ namespace
}
} // namespace
namespace T6::phys_preset
namespace phys_preset
{
bool InfoStringDumper::ShouldDump(XAssetInfo<PhysPreset>* asset)
bool InfoStringDumperT6::ShouldDump(XAssetInfo<PhysPreset>* asset)
{
return true;
}
void InfoStringDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset)
void InfoStringDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset)
{
// Only dump raw when no gdt available
if (context.m_gdt)
@@ -111,4 +110,4 @@ namespace T6::phys_preset
stream.write(stringValue.c_str(), stringValue.size());
}
}
} // namespace T6::phys_preset
} // namespace phys_preset

10
src/ObjWriting/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6.h
View File

@@ -4,12 +4,12 @@
#include "Game/T6/T6.h"
#include "InfoString/InfoString.h"
namespace T6::phys_preset
namespace phys_preset
{
class InfoStringDumper final : public AbstractAssetDumper<PhysPreset>
class InfoStringDumperT6 final : public AbstractAssetDumper<T6::PhysPreset>
{
protected:
bool ShouldDump(XAssetInfo<PhysPreset>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset) override;
bool ShouldDump(XAssetInfo<T6::PhysPreset>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::PhysPreset>* asset) override;
};
} // namespace T6::phys_preset
} // namespace phys_preset

8
src/ObjWriting/Game/T6/Qdb/QdbDumperT6.cpp
View File

@@ -2,14 +2,14 @@
using namespace T6;
namespace T6::qdb
namespace qdb
{
bool Dumper::ShouldDump(XAssetInfo<Qdb>* asset)
bool DumperT6::ShouldDump(XAssetInfo<Qdb>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<Qdb>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<Qdb>* asset)
{
const auto* qdb = asset->Asset();
const auto assetFile = context.OpenAssetFile(asset->m_name);
@@ -20,4 +20,4 @@ namespace T6::qdb
auto& stream = *assetFile;
stream.write(qdb->buffer, qdb->len);
}
} // namespace T6::qdb
} // namespace qdb

10
src/ObjWriting/Game/T6/Qdb/QdbDumperT6.h
View File

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

8
src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.cpp
View File

@@ -73,14 +73,14 @@ namespace
}
} // namespace
namespace T6::raw_file
namespace raw_file
{
bool Dumper::ShouldDump(XAssetInfo<RawFile>* asset)
bool DumperT6::ShouldDump(XAssetInfo<RawFile>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
{
const auto* rawFile = asset->Asset();
const auto assetFile = context.OpenAssetFile(asset->m_name);
@@ -101,4 +101,4 @@ namespace T6::raw_file
stream.write(rawFile->buffer, rawFile->len);
}
}
} // namespace T6::raw_file
} // namespace raw_file

10
src/ObjWriting/Game/T6/RawFile/RawFileDumperT6.h
View File

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

8
src/ObjWriting/Game/T6/Script/ScriptDumperT6.cpp
View File

@@ -2,14 +2,14 @@
using namespace T6;
namespace T6::script
namespace script
{
bool Dumper::ShouldDump(XAssetInfo<ScriptParseTree>* asset)
bool DumperT6::ShouldDump(XAssetInfo<ScriptParseTree>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<ScriptParseTree>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<ScriptParseTree>* asset)
{
const auto* scriptParseTree = asset->Asset();
const auto assetFile = context.OpenAssetFile(asset->m_name);
@@ -20,4 +20,4 @@ namespace T6::script
auto& stream = *assetFile;
stream.write(scriptParseTree->buffer, scriptParseTree->len);
}
} // namespace T6::script
} // namespace script

10
src/ObjWriting/Game/T6/Script/ScriptDumperT6.h
View File

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

8
src/ObjWriting/Game/T6/Slug/SlugDumperT6.cpp
View File

@@ -2,14 +2,14 @@
using namespace T6;
namespace T6::slug
namespace slug
{
bool Dumper::ShouldDump(XAssetInfo<Slug>* asset)
bool DumperT6::ShouldDump(XAssetInfo<Slug>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<Slug>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<Slug>* asset)
{
const auto* slug = asset->Asset();
const auto assetFile = context.OpenAssetFile(asset->m_name);
@@ -20,4 +20,4 @@ namespace T6::slug
auto& stream = *assetFile;
stream.write(slug->buffer, slug->len);
}
} // namespace T6::slug
} // namespace slug

10
src/ObjWriting/Game/T6/Slug/SlugDumperT6.h
View File

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

6
src/ObjWriting/Game/T6/Sound/SndBankDumperT6.cpp
View File

@@ -910,9 +910,9 @@ namespace
}
} // namespace
namespace T6::sound
namespace sound
{
void SndBankDumper::DumpPool(AssetDumpingContext& context, AssetPool<SndBank>* pool)
void SndBankDumperT6::DumpPool(AssetDumpingContext& context, AssetPool<SndBank>* pool)
{
LoadedSoundBankHashes soundBankHashes;
soundBankHashes.Initialize();
@@ -924,4 +924,4 @@ namespace T6::sound
DumpSndBank(context, soundBankHashes, *assetInfo);
}
}
} // namespace T6::sound
} // namespace sound

8
src/ObjWriting/Game/T6/Sound/SndBankDumperT6.h
View File

@@ -3,11 +3,11 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/T6/T6.h"
namespace T6::sound
namespace sound
{
class SndBankDumper final : public IAssetDumper<SndBank>
class SndBankDumperT6 final : public IAssetDumper<T6::SndBank>
{
public:
void DumpPool(AssetDumpingContext& context, AssetPool<SndBank>* pool) override;
void DumpPool(AssetDumpingContext& context, AssetPool<T6::SndBank>* pool) override;
};
} // namespace T6::sound
} // namespace sound

6
src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.cpp
View File

@@ -382,11 +382,11 @@ namespace
};
} // namespace
namespace T6::sound
namespace sound
{
void SndDriverGlobalsDumper::DumpPool(AssetDumpingContext& context, AssetPool<SndDriverGlobals>* pool)
void SndDriverGlobalsDumperT6::DumpPool(AssetDumpingContext& context, AssetPool<SndDriverGlobals>* pool)
{
Internal internal(context);
internal.DumpPool(pool);
}
} // namespace T6::sound
} // namespace sound

8
src/ObjWriting/Game/T6/Sound/SndDriverGlobalsDumperT6.h
View File

@@ -3,11 +3,11 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/T6/T6.h"
namespace T6::sound
namespace sound
{
class SndDriverGlobalsDumper final : public IAssetDumper<SndDriverGlobals>
class SndDriverGlobalsDumperT6 final : public IAssetDumper<T6::SndDriverGlobals>
{
public:
void DumpPool(AssetDumpingContext& context, AssetPool<SndDriverGlobals>* pool) override;
void DumpPool(AssetDumpingContext& context, AssetPool<T6::SndDriverGlobals>* pool) override;
};
} // namespace T6::sound
} // namespace sound

8
src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.cpp
View File

@@ -4,14 +4,14 @@
using namespace T6;
namespace T6::string_table
namespace string_table
{
bool Dumper::ShouldDump(XAssetInfo<StringTable>* asset)
bool DumperT6::ShouldDump(XAssetInfo<StringTable>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
{
const auto* stringTable = asset->Asset();
const auto assetFile = context.OpenAssetFile(asset->m_name);
@@ -39,4 +39,4 @@ namespace T6::string_table
csv.NextRow();
}
}
} // namespace T6::string_table
} // namespace string_table

10
src/ObjWriting/Game/T6/StringTable/StringTableDumperT6.h
View File

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

8
src/ObjWriting/Game/T6/Techset/TechsetDumperT6.cpp
View File

@@ -75,14 +75,14 @@ namespace
}
} // namespace
namespace T6::techset
namespace techset
{
bool Dumper::ShouldDump(XAssetInfo<MaterialTechniqueSet>* asset)
bool DumperT6::ShouldDump(XAssetInfo<MaterialTechniqueSet>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<MaterialTechniqueSet>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<MaterialTechniqueSet>* asset)
{
const auto* techniqueSet = asset->Asset();
auto* shaderState = context.GetZoneAssetDumperState<ShaderZoneState>();
@@ -104,4 +104,4 @@ namespace T6::techset
}
}
}
} // namespace T6::techset
} // namespace techset

10
src/ObjWriting/Game/T6/Techset/TechsetDumperT6.h
View File

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

9
src/ObjWriting/Game/T6/Tracer/TracerDumperT6.cpp
View File

@@ -9,7 +9,6 @@
#include <type_traits>
using namespace T6;
using namespace ::tracer;
namespace
{
@@ -59,14 +58,14 @@ namespace
}
} // namespace
namespace T6::tracer
namespace tracer
{
bool Dumper::ShouldDump(XAssetInfo<TracerDef>* asset)
bool DumperT6::ShouldDump(XAssetInfo<TracerDef>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset)
{
// Only dump raw when no gdt available
if (context.m_gdt)
@@ -89,4 +88,4 @@ namespace T6::tracer
stream.write(stringValue.c_str(), stringValue.size());
}
}
} // namespace T6::tracer
} // namespace tracer

10
src/ObjWriting/Game/T6/Tracer/TracerDumperT6.h
View File

@@ -4,12 +4,12 @@
#include "Game/T6/T6.h"
#include "InfoString/InfoString.h"
namespace T6::tracer
namespace tracer
{
class Dumper final : public AbstractAssetDumper<TracerDef>
class DumperT6 final : public AbstractAssetDumper<T6::TracerDef>
{
protected:
bool ShouldDump(XAssetInfo<TracerDef>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset) override;
bool ShouldDump(XAssetInfo<T6::TracerDef>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::TracerDef>* asset) override;
};
} // namespace T6::tracer
} // namespace tracer

8
src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.cpp
View File

@@ -109,14 +109,14 @@ namespace
}
} // namespace
namespace T6::vehicle
namespace vehicle
{
bool Dumper::ShouldDump(XAssetInfo<VehicleDef>* asset)
bool DumperT6::ShouldDump(XAssetInfo<VehicleDef>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset)
{
// Only dump raw when no gdt available
if (context.m_gdt)
@@ -139,4 +139,4 @@ namespace T6::vehicle
stream.write(stringValue.c_str(), stringValue.size());
}
}
} // namespace T6::vehicle
} // namespace vehicle

10
src/ObjWriting/Game/T6/Vehicle/VehicleDumperT6.h
View File

@@ -4,12 +4,12 @@
#include "Game/T6/T6.h"
#include "InfoString/InfoString.h"
namespace T6::vehicle
namespace vehicle
{
class Dumper final : public AbstractAssetDumper<VehicleDef>
class DumperT6 final : public AbstractAssetDumper<T6::VehicleDef>
{
protected:
bool ShouldDump(XAssetInfo<VehicleDef>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset) override;
bool ShouldDump(XAssetInfo<T6::VehicleDef>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::VehicleDef>* asset) override;
};
} // namespace T6::vehicle
} // namespace vehicle

9
src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.cpp
View File

@@ -10,7 +10,6 @@
#include <type_traits>
using namespace T6;
using namespace ::attachment;
namespace
{
@@ -66,14 +65,14 @@ namespace
}
} // namespace
namespace T6::attachment
namespace attachment
{
bool Dumper::ShouldDump(XAssetInfo<WeaponAttachment>* asset)
bool DumperT6::ShouldDump(XAssetInfo<WeaponAttachment>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset)
{
// Only dump raw when no gdt available
if (context.m_gdt)
@@ -96,4 +95,4 @@ namespace T6::attachment
stream.write(stringValue.c_str(), stringValue.size());
}
}
} // namespace T6::attachment
} // namespace attachment

10
src/ObjWriting/Game/T6/Weapon/AttachmentDumperT6.h
View File

@@ -4,12 +4,12 @@
#include "Game/T6/T6.h"
#include "InfoString/InfoString.h"
namespace T6::attachment
namespace attachment
{
class Dumper final : public AbstractAssetDumper<WeaponAttachment>
class DumperT6 final : public AbstractAssetDumper<T6::WeaponAttachment>
{
protected:
bool ShouldDump(XAssetInfo<WeaponAttachment>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset) override;
bool ShouldDump(XAssetInfo<T6::WeaponAttachment>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::WeaponAttachment>* asset) override;
};
} // namespace T6::attachment
} // namespace attachment

9
src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.cpp
View File

@@ -12,7 +12,6 @@
#include <type_traits>
using namespace T6;
using namespace ::attachment_unique;
namespace
{
@@ -130,14 +129,14 @@ namespace
}
} // namespace
namespace T6::attachment_unique
namespace attachment_unique
{
bool Dumper::ShouldDump(XAssetInfo<WeaponAttachmentUnique>* asset)
bool DumperT6::ShouldDump(XAssetInfo<WeaponAttachmentUnique>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset)
{
// Only dump raw when no gdt available
if (context.m_gdt)
@@ -160,4 +159,4 @@ namespace T6::attachment_unique
stream.write(stringValue.c_str(), stringValue.size());
}
}
} // namespace T6::attachment_unique
} // namespace attachment_unique

10
src/ObjWriting/Game/T6/Weapon/AttachmentUniqueDumperT6.h
View File

@@ -4,12 +4,12 @@
#include "Game/T6/T6.h"
#include "InfoString/InfoString.h"
namespace T6::attachment_unique
namespace attachment_unique
{
class Dumper final : public AbstractAssetDumper<WeaponAttachmentUnique>
class DumperT6 final : public AbstractAssetDumper<T6::WeaponAttachmentUnique>
{
protected:
bool ShouldDump(XAssetInfo<WeaponAttachmentUnique>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset) override;
bool ShouldDump(XAssetInfo<T6::WeaponAttachmentUnique>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::WeaponAttachmentUnique>* asset) override;
};
} // namespace T6::attachment_unique
} // namespace attachment_unique

9
src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.cpp
View File

@@ -9,7 +9,6 @@
using namespace nlohmann;
using namespace T6;
using namespace ::camo;
namespace
{
@@ -103,14 +102,14 @@ namespace
};
} // namespace
namespace T6::camo
namespace camo
{
bool JsonDumper::ShouldDump(XAssetInfo<WeaponCamo>* asset)
bool JsonDumperT6::ShouldDump(XAssetInfo<WeaponCamo>* asset)
{
return true;
}
void JsonDumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponCamo>* asset)
void JsonDumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponCamo>* asset)
{
const auto fileName = GetJsonFileNameForAssetName(asset->m_name);
const auto assetFile = context.OpenAssetFile(fileName);
@@ -121,4 +120,4 @@ namespace T6::camo
const JsonDumperImpl dumper(*assetFile);
dumper.Dump(asset->Asset());
}
} // namespace T6::camo
} // namespace camo

10
src/ObjWriting/Game/T6/Weapon/CamoJsonDumperT6.h
View File

@@ -3,12 +3,12 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/T6/T6.h"
namespace T6::camo
namespace camo
{
class JsonDumper final : public AbstractAssetDumper<WeaponCamo>
class JsonDumperT6 final : public AbstractAssetDumper<T6::WeaponCamo>
{
protected:
bool ShouldDump(XAssetInfo<WeaponCamo>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponCamo>* asset) override;
bool ShouldDump(XAssetInfo<T6::WeaponCamo>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::WeaponCamo>* asset) override;
};
} // namespace T6::camo
} // namespace camo

9
src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.cpp
View File

@@ -14,7 +14,6 @@
#include <type_traits>
using namespace T6;
using namespace ::weapon;
namespace
{
@@ -460,14 +459,14 @@ namespace
}
} // namespace
namespace T6::weapon
namespace weapon
{
bool Dumper::ShouldDump(XAssetInfo<WeaponVariantDef>* asset)
bool DumperT6::ShouldDump(XAssetInfo<WeaponVariantDef>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset)
{
// Only dump raw when no gdt available
if (context.m_gdt)
@@ -492,4 +491,4 @@ namespace T6::weapon
DumpAccuracyGraphs(context, asset);
}
} // namespace T6::weapon
} // namespace weapon

10
src/ObjWriting/Game/T6/Weapon/WeaponDumperT6.h
View File

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

9
src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.cpp
View File

@@ -9,7 +9,6 @@
#include <type_traits>
using namespace T6;
using namespace ::z_barrier;
namespace
{
@@ -49,14 +48,14 @@ namespace
}
} // namespace
namespace T6::z_barrier
namespace z_barrier
{
bool Dumper::ShouldDump(XAssetInfo<ZBarrierDef>* asset)
bool DumperT6::ShouldDump(XAssetInfo<ZBarrierDef>* asset)
{
return true;
}
void Dumper::DumpAsset(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset)
void DumperT6::DumpAsset(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset)
{
// Only dump raw when no gdt available
if (context.m_gdt)
@@ -79,4 +78,4 @@ namespace T6::z_barrier
stream.write(stringValue.c_str(), stringValue.size());
}
}
} // namespace T6::z_barrier
} // namespace z_barrier

10
src/ObjWriting/Game/T6/ZBarrier/ZBarrierDumperT6.h
View File

@@ -4,12 +4,12 @@
#include "Game/T6/T6.h"
#include "InfoString/InfoString.h"
namespace T6::z_barrier
namespace z_barrier
{
class Dumper final : public AbstractAssetDumper<ZBarrierDef>
class DumperT6 final : public AbstractAssetDumper<T6::ZBarrierDef>
{
protected:
bool ShouldDump(XAssetInfo<ZBarrierDef>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset) override;
bool ShouldDump(XAssetInfo<T6::ZBarrierDef>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<T6::ZBarrierDef>* asset) override;
};
} // namespace T6::z_barrier
} // namespace z_barrier