zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-06-06 08:42:35 +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
committed by Jan Laupetin
parent 7908549dc8
commit 68435e8c74
4 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Game/T6/ObjLoaderT6.cpp
+2 -1
View File
@@ -49,6 +49,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(CreateTechniqueSetLoader(memory, searchPath));
collection.AddAssetCreator(technique_set::CreateLoaderT6(memory, searchPath));
collection.AddAssetCreator(image::CreateLoaderEmbeddedT6(memory, searchPath));
collection.AddAssetCreator(image::CreateLoaderExternalT6(memory, searchPath));
collection.AddAssetCreator(image::CreateLoadDefLoaderT6(memory, searchPath));
src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp
+3 -3
View File
@@ -176,10 +176,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
src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.h
+3 -3
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
src/ObjLoading/Material/JsonMaterialLoader.cpp.template
+30 -29
View File
@@ -42,7 +42,9 @@
#include <format>
#include <iostream>
#include <nlohmann/json.hpp>
using namespace nlohmann;
using namespace GAME;
namespace
@@ -59,39 +61,30 @@ namespace
bool Load(json& jRoot, Material& material) const
{
try
{
std::string type;
unsigned version;
std::string type;
unsigned version;
jRoot.at("_type").get_to(type);
jRoot.at("_version").get_to(version);
jRoot.at("_type").get_to(type);
jRoot.at("_version").get_to(version);
if (type != "material" || version != 1u)
{
con::error("Tried to load material \"{}\" but did not find expected type material of version 1", material.info.name);
return false;
}
if (type != "material" || version != 1u)
{
con::error("Tried to load material \"{}\" but did not find expected type material of version 1", material.info.name);
return false;
}
#ifndef FEATURE_T6 // T6 did not have this check in version 1, so to stay backwards compatible, let it stay that way
std::string game;
jRoot.at("_game").get_to(game);
if (game != GAME_LOWER)
{
con::error("Tried to load material \"{}\" but \"_game\" did not find expected type value {}", material.info.name, GAME_LOWER);
return false;
}
std::string game;
jRoot.at("_game").get_to(game);
if (game != GAME_LOWER)
{
con::error("Tried to load material \"{}\" but \"_game\" did not find expected type value {}", material.info.name, GAME_LOWER);
return false;
}
#endif
const auto jMaterial = jRoot.get<JsonMaterial>();
return CreateMaterialFromJson(jMaterial, material);
}
catch (const json::exception& e)
{
con::error("Failed to parse json of material: {}", e.what());
}
return false;
const auto jMaterial = jRoot.get<JsonMaterial>();
return CreateMaterialFromJson(jMaterial, material);
}
private:
@@ -528,9 +521,17 @@ namespace GAME
{
const JsonLoader loader(memory, context, registration);
auto jRoot = json::parse(stream);
try
{
auto jRoot = json::parse(stream);
return loader.Load(jRoot, material);
return loader.Load(jRoot, material);
}
catch (const json::exception& e)
{
con::error("Failed to parse json of material: {}", e.what());
return false;
}
}
bool LoadMaterialAsJson(