INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-10 23:08:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: move materialIndex to XModelObject

Browse Source
This commit is contained in:
Jan
2024-04-02 18:47:54 +02:00
parent 1bc1c12244
commit 0a65c93aa5
7 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,12 +317,16 @@ namespace
}
}
void AddXModelObjects(AbstractXModelWriter& writer, const XModelSurfs* modelSurfs)
void AddXModelObjects(AbstractXModelWriter& writer,
const XModelSurfs* modelSurfs,
const DistinctMapper<Material*>& materialMapper,
const int baseSurfaceIndex)
{
for (auto surfIndex = 0u; surfIndex < modelSurfs->numsurfs; surfIndex++)
{
XModelObject object;
object.name = "surf" + std::to_string(surfIndex);
object.materialIndex = static_cast<int>(materialMapper.GetDistinctPositionByInputPosition(surfIndex + baseSurfaceIndex));
writer.AddObject(std::move(object));
}
@ -500,8 +504,7 @@ namespace
}
}
void
AddXModelFaces(AbstractXModelWriter& writer, const DistinctMapper<Material*>& materialMapper, const XModelSurfs* modelSurfs, const int baseSurfaceIndex)
void AddXModelFaces(AbstractXModelWriter& writer, const XModelSurfs* modelSurfs)
{
for (auto surfIndex = 0u; surfIndex < modelSurfs->numsurfs; surfIndex++)
{
@ -515,7 +518,6 @@ namespace
face.vertexIndex[1] = tri[1] + surface.baseVertIndex;
face.vertexIndex[2] = tri[2] + surface.baseVertIndex;
face.objectIndex = static_cast<int>(surfIndex);
face.materialIndex = static_cast<int>(materialMapper.GetDistinctPositionByInputPosition(surfIndex + baseSurfaceIndex));
writer.AddFace(face);
}
}
@ -531,10 +533,10 @@ namespace
AddXModelBones(context, writer, model);
AddXModelMaterials(writer, materialMapper, model);
AddXModelObjects(writer, modelSurfs);
AddXModelObjects(writer, modelSurfs, materialMapper, model->lodInfo[lod].surfIndex);
AddXModelVertices(writer, modelSurfs);
AddXModelVertexBoneWeights(writer, modelSurfs, boneWeightCollection);
AddXModelFaces(writer, materialMapper, modelSurfs, model->lodInfo[lod].surfIndex);
AddXModelFaces(writer, modelSurfs);
}
void DumpXModelExportLod(const AssetDumpingContext& context, const XAssetInfo<XModel>* asset, const unsigned lod)