zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-26 22:42:06 +00:00
Code Activity

Updated Json Material loader to support passing JSON instead of a stream, and added techset loading code

Browse Source
This commit is contained in:
LJW-Dev
2025-10-09 01:10:21 +08:00
parent 249e6426ff
commit 8737fdf2e7
4 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ObjLoading/Game/T6/ObjLoaderT6.cpp
View File

@@ -43,6 +43,7 @@
#include "ZBarrier/GdtLoaderZBarrierT6.h"
#include "ZBarrier/RawLoaderZBarrierT6.h"
#include "CustomMap/LoaderCustomMapT6.h"
#include "TechniqueSet/LoaderTechniqueSetT6.h"
#include <format>
#include <memory>
@@ -393,7 +394,7 @@ namespace T6
// collection.AddAssetCreator(std::make_unique<AssetLoaderXAnim>(memory));
collection.AddAssetCreator(xmodel::CreateLoaderT6(memory, searchPath, zone));
collection.AddAssetCreator(material::CreateLoaderT6(memory, searchPath));
// collection.AddAssetCreator(std::make_unique<AssetLoaderTechniqueSet>(memory));
collection.AddAssetCreator(technique_set::CreateLoaderT6(memory, searchPath));
collection.AddAssetCreator(image::CreateLoaderT6(memory, searchPath));
collection.AddAssetCreator(sound::CreateSoundBankLoaderT6(memory, searchPath));
// collection.AddAssetCreator(std::make_unique<AssetLoaderSoundPatch>(memory));

6
src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp
View File

@@ -175,10 +175,10 @@ namespace
};
} // namespace
namespace T6
namespace technique_set
{
std::unique_ptr<AssetCreator<AssetTechniqueSet>> CreateTechniqueSetLoader(MemoryManager& memory, ISearchPath& searchPath)
std::unique_ptr<AssetCreator<AssetTechniqueSet>> CreateLoaderT6(MemoryManager& memory, ISearchPath& searchPath)
{
return std::make_unique<TechniqueSetLoader>(memory, searchPath);
}
} // namespace T6
} // namespace technique_set

6
src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.h
View File

@@ -7,7 +7,7 @@
#include <memory>
namespace T6
namespace technique_set
{
std::unique_ptr<AssetCreator<AssetTechniqueSet>> CreateTechniqueSetLoader(MemoryManager& memory, ISearchPath& searchPath);
} // namespace T6
std::unique_ptr<AssetCreator<T6::AssetTechniqueSet>> CreateLoaderT6(MemoryManager& memory, ISearchPath& searchPath);
} // namespace technique_set