zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: make material json loader use anonymous namespace

Browse Source
This commit is contained in:
Jan 2024-03-24 13:29:35 +01:00
parent fc9f265f0c
commit af37476e23
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp
View File

@ -4,13 +4,13 @@
#include "Game/T6/Json/JsonMaterial.h" #include "Game/T6/Json/JsonMaterial.h"
#include <format> #include <format>
#include <iomanip>
#include <iostream> #include <iostream>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
using namespace nlohmann; using namespace nlohmann;
using namespace T6;
namespace T6 namespace
{ {
class JsonLoader class JsonLoader
{ {
@ -362,7 +362,10 @@ namespace T6
IAssetLoadingManager& m_manager; IAssetLoadingManager& m_manager;
std::vector<XAssetInfoGeneric*>& m_dependencies; std::vector<XAssetInfoGeneric*>& m_dependencies;
}; };
} // namespace
namespace T6
{
bool LoadMaterialAsJson( bool LoadMaterialAsJson(
std::istream& stream, Material& material, MemoryManager* memory, IAssetLoadingManager* manager, std::vector<XAssetInfoGeneric*>& dependencies) std::istream& stream, Material& material, MemoryManager* memory, IAssetLoadingManager* manager, std::vector<XAssetInfoGeneric*>& dependencies)
{ {