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

chore: add names to exported gltf models

Browse Source
This commit is contained in:
Jan 2024-05-11 01:51:28 +02:00
parent 5c06b6e5e4
commit 499b752272
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
7 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ObjCommon/XModel/XModelCommon.h
View File

@ -96,6 +96,7 @@ struct XModelObject
struct XModelCommon struct XModelCommon
{ {
std::string m_name;
std::vector<XModelObject> m_objects; std::vector<XModelObject> m_objects;
std::vector<XModelBone> m_bones; std::vector<XModelBone> m_bones;
std::vector<XModelMaterial> m_materials; std::vector<XModelMaterial> m_materials;

1
src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperXModel.cpp
View File

@ -412,6 +412,7 @@ namespace
DistinctMapper<Material*> materialMapper(model->numsurfs); DistinctMapper<Material*> materialMapper(model->numsurfs);
AllocateXModelBoneWeights(model, lod, out.m_bone_weight_data); AllocateXModelBoneWeights(model, lod, out.m_bone_weight_data);
out.m_name = std::format("{}_lod{}", model->name, lod);
AddXModelBones(out, context, model); AddXModelBones(out, context, model);
AddXModelMaterials(out, materialMapper, model); AddXModelMaterials(out, materialMapper, model);
AddXModelObjects(out, model, lod, materialMapper); AddXModelObjects(out, model, lod, materialMapper);

1
src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp
View File

@ -394,6 +394,7 @@ namespace
DistinctMapper<Material*> materialMapper(model->numsurfs); DistinctMapper<Material*> materialMapper(model->numsurfs);
AllocateXModelBoneWeights(modelSurfs, out.m_bone_weight_data); AllocateXModelBoneWeights(modelSurfs, out.m_bone_weight_data);
out.m_name = modelSurfs->name;
AddXModelBones(out, context, model); AddXModelBones(out, context, model);
AddXModelMaterials(out, materialMapper, model); AddXModelMaterials(out, materialMapper, model);
AddXModelObjects(out, modelSurfs, materialMapper, model->lodInfo[lod].surfIndex); AddXModelObjects(out, modelSurfs, materialMapper, model->lodInfo[lod].surfIndex);

1
src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp
View File

@ -394,6 +394,7 @@ namespace
DistinctMapper<Material*> materialMapper(model->numsurfs); DistinctMapper<Material*> materialMapper(model->numsurfs);
AllocateXModelBoneWeights(modelSurfs, out.m_bone_weight_data); AllocateXModelBoneWeights(modelSurfs, out.m_bone_weight_data);
out.m_name = modelSurfs->name;
AddXModelBones(out, context, model); AddXModelBones(out, context, model);
AddXModelMaterials(out, materialMapper, model); AddXModelMaterials(out, materialMapper, model);
AddXModelObjects(out, modelSurfs, materialMapper, model->lodInfo[lod].surfIndex); AddXModelObjects(out, modelSurfs, materialMapper, model->lodInfo[lod].surfIndex);

1
src/ObjWriting/Game/T5/AssetDumpers/AssetDumperXModel.cpp
View File

@ -412,6 +412,7 @@ namespace
DistinctMapper<Material*> materialMapper(model->numsurfs); DistinctMapper<Material*> materialMapper(model->numsurfs);
AllocateXModelBoneWeights(model, lod, out.m_bone_weight_data); AllocateXModelBoneWeights(model, lod, out.m_bone_weight_data);
out.m_name = std::format("{}_lod{}", model->name, lod);
AddXModelBones(out, context, model); AddXModelBones(out, context, model);
AddXModelMaterials(out, materialMapper, model); AddXModelMaterials(out, materialMapper, model);
AddXModelObjects(out, model, lod, materialMapper); AddXModelObjects(out, model, lod, materialMapper);

1
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperXModel.cpp
View File

@ -436,6 +436,7 @@ namespace
DistinctMapper<Material*> materialMapper(model->numsurfs); DistinctMapper<Material*> materialMapper(model->numsurfs);
AllocateXModelBoneWeights(model, lod, out.m_bone_weight_data); AllocateXModelBoneWeights(model, lod, out.m_bone_weight_data);
out.m_name = std::format("{}_lod{}", model->name, lod);
AddXModelBones(out, context, model); AddXModelBones(out, context, model);
AddXModelMaterials(out, materialMapper, model); AddXModelMaterials(out, materialMapper, model);
AddXModelObjects(out, model, lod, materialMapper); AddXModelObjects(out, model, lod, materialMapper);

6
src/ObjWriting/XModel/Gltf/GltfWriter.cpp
View File

@ -69,6 +69,9 @@ namespace
{ {
JsonNode meshNode; JsonNode meshNode;
if (!xmodel.m_name.empty())
meshNode.name = xmodel.m_name;
// We only have one mesh // We only have one mesh
meshNode.mesh = 0u; meshNode.mesh = 0u;
@ -90,6 +93,9 @@ namespace
{ {
JsonNode rootNode; JsonNode rootNode;
if (!xmodel.m_name.empty())
rootNode.name = std::format("{}_skel", xmodel.m_name);
if (!gltf.nodes.has_value()) if (!gltf.nodes.has_value())
gltf.nodes.emplace(); gltf.nodes.emplace();