zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-12-08 12:17:48 +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/ObjLoading/Game/T6/ZBarrier/GdtLoaderZBarrierT6.cpp
View File

@@ -40,14 +40,14 @@ namespace
private:
IGdtQueryable& m_gdt;
T6::z_barrier::InfoStringLoader m_info_string_loader;
z_barrier::InfoStringLoaderT6 m_info_string_loader;
};
} // namespace
namespace T6::z_barrier
namespace z_barrier
{
std::unique_ptr<AssetCreator<AssetZBarrier>> CreateGdtLoader(MemoryManager& memory, ISearchPath& searchPath, IGdtQueryable& gdt, Zone& zone)
std::unique_ptr<AssetCreator<AssetZBarrier>> CreateGdtLoaderT6(MemoryManager& memory, ISearchPath& searchPath, IGdtQueryable& gdt, Zone& zone)
{
return std::make_unique<GdtLoaderZBarrier>(memory, searchPath, gdt, zone);
}
} // namespace T6::z_barrier
} // namespace z_barrier

6
src/ObjLoading/Game/T6/ZBarrier/GdtLoaderZBarrierT6.h
View File

@@ -8,7 +8,7 @@
#include <memory>
namespace T6::z_barrier
namespace z_barrier
{
std::unique_ptr<AssetCreator<AssetZBarrier>> CreateGdtLoader(MemoryManager& memory, ISearchPath& searchPath, IGdtQueryable& gdt, Zone& zone);
} // namespace T6::z_barrier
std::unique_ptr<AssetCreator<T6::AssetZBarrier>> CreateGdtLoaderT6(MemoryManager& memory, ISearchPath& searchPath, IGdtQueryable& gdt, Zone& zone);
} // namespace z_barrier

8
src/ObjLoading/Game/T6/ZBarrier/InfoStringLoaderZBarrierT6.cpp
View File

@@ -55,16 +55,16 @@ namespace
}
} // namespace
namespace T6::z_barrier
namespace z_barrier
{
InfoStringLoader::InfoStringLoader(MemoryManager& memory, ISearchPath& searchPath, Zone& zone)
InfoStringLoaderT6::InfoStringLoaderT6(MemoryManager& memory, ISearchPath& searchPath, Zone& zone)
: m_memory(memory),
m_search_path(searchPath),
m_zone(zone)
{
}
AssetCreationResult InfoStringLoader::CreateAsset(const std::string& assetName, const InfoString& infoString, AssetCreationContext& context)
AssetCreationResult InfoStringLoaderT6::CreateAsset(const std::string& assetName, const InfoString& infoString, AssetCreationContext& context)
{
auto* zbarrier = m_memory.Alloc<ZBarrierDef>();
zbarrier->name = m_memory.Dup(assetName.c_str());
@@ -83,4 +83,4 @@ namespace T6::z_barrier
return AssetCreationResult::Success(context.AddAsset(std::move(registration)));
}
} // namespace T6::z_barrier
} // namespace z_barrier

8
src/ObjLoading/Game/T6/ZBarrier/InfoStringLoaderZBarrierT6.h
View File

@@ -4,12 +4,12 @@
#include "Asset/AssetCreationResult.h"
#include "InfoString/InfoString.h"
namespace T6::z_barrier
namespace z_barrier
{
class InfoStringLoader
class InfoStringLoaderT6
{
public:
InfoStringLoader(MemoryManager& memory, ISearchPath& searchPath, Zone& zone);
InfoStringLoaderT6(MemoryManager& memory, ISearchPath& searchPath, Zone& zone);
AssetCreationResult CreateAsset(const std::string& assetName, const InfoString& infoString, AssetCreationContext& context);
@@ -18,4 +18,4 @@ namespace T6::z_barrier
ISearchPath& m_search_path;
Zone& m_zone;
};
} // namespace T6::z_barrier
} // namespace z_barrier

11
src/ObjLoading/Game/T6/ZBarrier/RawLoaderZBarrierT6.cpp
View File

@@ -11,7 +11,6 @@
#include <iostream>
using namespace T6;
using namespace ::z_barrier;
namespace
{
@@ -26,7 +25,7 @@ namespace
AssetCreationResult CreateAsset(const std::string& assetName, AssetCreationContext& context) override
{
const auto fileName = GetFileNameForAssetName(assetName);
const auto fileName = z_barrier::GetFileNameForAssetName(assetName);
const auto file = m_search_path.Open(fileName);
if (!file.IsOpen())
return AssetCreationResult::NoAction();
@@ -43,14 +42,14 @@ namespace
private:
ISearchPath& m_search_path;
T6::z_barrier::InfoStringLoader m_info_string_loader;
z_barrier::InfoStringLoaderT6 m_info_string_loader;
};
} // namespace
namespace T6::z_barrier
namespace z_barrier
{
std::unique_ptr<AssetCreator<AssetZBarrier>> CreateRawLoader(MemoryManager& memory, ISearchPath& searchPath, Zone& zone)
std::unique_ptr<AssetCreator<AssetZBarrier>> CreateRawLoaderT6(MemoryManager& memory, ISearchPath& searchPath, Zone& zone)
{
return std::make_unique<RawLoaderZBarrier>(memory, searchPath, zone);
}
} // namespace T6::z_barrier
} // namespace z_barrier

6
src/ObjLoading/Game/T6/ZBarrier/RawLoaderZBarrierT6.h
View File

@@ -7,7 +7,7 @@
#include <memory>
namespace T6::z_barrier
namespace z_barrier
{
std::unique_ptr<AssetCreator<AssetZBarrier>> CreateRawLoader(MemoryManager& memory, ISearchPath& searchPath, Zone& zone);
} // namespace T6::z_barrier
std::unique_ptr<AssetCreator<T6::AssetZBarrier>> CreateRawLoaderT6(MemoryManager& memory, ISearchPath& searchPath, Zone& zone);
} // namespace z_barrier