zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-05-16 06:51:42 +00:00
Code Activity

chore: get rid of unnecessary class in XModelDumper

Browse Source
This commit is contained in:
Jan Laupetin
2026-05-03 13:02:48 +02:00
parent 2527f23c10
commit 4886767e67
1 changed files with 131 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjWriting/XModel/XModelDumper.cpp.template
+19 -43
View File
@@ -695,38 +695,7 @@ namespace
} }
} }
class JsonDumper const char* GetExtensionForModelByConfig()
{
public:
explicit JsonDumper(std::ostream& stream)
: m_stream(stream)
{
}
void Dump(AssetDumpingContext& context, const XModel& model) const
{
JsonXModel jsonXModel;
CreateJsonXModel(context, jsonXModel, model);
nlohmann::json jRoot = jsonXModel;
jRoot["$schema"] = "http://openassettools.dev/schema/xmodel.v1.json";
jRoot["_type"] = "xmodel";
jRoot["_version"] = 2;
jRoot["_game"] = GAME_LOWER;
m_stream << std::setw(4) << jRoot << "\n";
}
private:
static const char* AssetName(const char* input)
{
if (input && input[0] == ',')
return &input[1];
return input;
}
static const char* GetExtensionForModelByConfig()
{ {
switch (ObjWriting::Configuration.ModelOutputFormat) switch (ObjWriting::Configuration.ModelOutputFormat)
{ {
@@ -746,7 +715,7 @@ namespace
} }
} }
static bool IsAnimated(const XModel& model) bool IsAnimated(const XModel& model)
{ {
#if defined(FEATURE_IW4) || defined(FEATURE_IW5) #if defined(FEATURE_IW4) || defined(FEATURE_IW5)
for (auto i = 0u; i < model.numLods; i++) for (auto i = 0u; i < model.numLods; i++)
@@ -774,7 +743,7 @@ namespace
return false; return false;
} }
static bool HasNulledTrans(const XModel& model) bool HasNulledTrans(const XModel& model)
{ {
if (model.trans == nullptr) if (model.trans == nullptr)
return true; return true;
@@ -789,7 +758,7 @@ namespace
return true; return true;
} }
static bool HasNonNullBoneInfoTrans(const XModel& model) bool HasNonNullBoneInfoTrans(const XModel& model)
{ {
if (model.boneInfo == nullptr) if (model.boneInfo == nullptr)
return false; return false;
@@ -809,7 +778,7 @@ namespace
return false; return false;
} }
static JsonXModelType GetType(const XModel& model) JsonXModelType GetType(const XModel& model)
{ {
if (!IsAnimated(model)) if (!IsAnimated(model))
return JsonXModelType::RIGID; return JsonXModelType::RIGID;
@@ -820,7 +789,7 @@ namespace
return JsonXModelType::ANIMATED; return JsonXModelType::ANIMATED;
} }
static void SetJsonRootBoneName(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model) void SetJsonRootBoneName(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model)
{ {
assert(model.boneNames); assert(model.boneNames);
assert(model.boneNames[0] < context.m_zone.m_script_strings.Count()); assert(model.boneNames[0] < context.m_zone.m_script_strings.Count());
@@ -832,7 +801,7 @@ namespace
jXModel.rootBoneName = context.m_zone.m_script_strings[model.boneNames[0]]; jXModel.rootBoneName = context.m_zone.m_script_strings[model.boneNames[0]];
} }
static void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model) void CreateJsonXModel(AssetDumpingContext& context, JsonXModel& jXModel, const XModel& model)
{ {
if (model.collLod >= 0) if (model.collLod >= 0)
jXModel.collLod = model.collLod; jXModel.collLod = model.collLod;
@@ -879,17 +848,24 @@ namespace
#endif #endif
} }
std::ostream& m_stream;
};
void DumpXModelJson(AssetDumpingContext& context, const XAssetInfo<XModel>& asset) void DumpXModelJson(AssetDumpingContext& context, const XAssetInfo<XModel>& asset)
{ {
const auto assetFile = context.OpenAssetFile(xmodel::GetJsonFileNameForAssetName(asset.m_name)); const auto assetFile = context.OpenAssetFile(xmodel::GetJsonFileNameForAssetName(asset.m_name));
if (!assetFile) if (!assetFile)
return; return;
const JsonDumper dumper(*assetFile); const auto& model = *asset.Asset();
dumper.Dump(context, *asset.Asset());
JsonXModel jsonXModel;
CreateJsonXModel(context, jsonXModel, model);
nlohmann::json jRoot = jsonXModel;
jRoot["$schema"] = "http://openassettools.dev/schema/xmodel.v1.json";
jRoot["_type"] = "xmodel";
jRoot["_version"] = 2;
jRoot["_game"] = GAME_LOWER;
*assetFile << std::setw(4) << jRoot << "\n";
} }
} // namespace } // namespace