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

fix: messed up reordering of vertices for bone count

Browse Source
This commit is contained in:
Jan 2025-04-03 21:46:52 +02:00
parent e13eb256bb
commit a2c8129a13
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ObjLoading/XModel/LoaderXModel.cpp.template
View File

@ -539,13 +539,21 @@ namespace
return false; return false;
}); });
std::vector<XSurfaceTri> preSortTris(surface.triCount);
std::memcpy(preSortTris.data(), surface.triIndices, sizeof(XSurfaceTri) * surface.triCount);
std::vector<size_t> reverseLookup(reorderLookup.size());
for (auto i = 0u; i < reverseLookup.size(); i++)
reverseLookup[reorderLookup[i]] = i;
for (auto triIndex = 0u; triIndex < surface.triCount; triIndex++) for (auto triIndex = 0u; triIndex < surface.triCount; triIndex++)
{ {
const auto& preSortTriIndices = preSortTris[triIndex];
auto& triIndices = surface.triIndices[triIndex]; auto& triIndices = surface.triIndices[triIndex];
triIndices.i[0] = static_cast<uint16_t>(reorderLookup[triIndices.i[0]]); triIndices.i[0] = static_cast<uint16_t>(reverseLookup[preSortTriIndices.i[0]]);
triIndices.i[1] = static_cast<uint16_t>(reorderLookup[triIndices.i[1]]); triIndices.i[1] = static_cast<uint16_t>(reverseLookup[preSortTriIndices.i[1]]);
triIndices.i[2] = static_cast<uint16_t>(reorderLookup[triIndices.i[2]]); triIndices.i[2] = static_cast<uint16_t>(reverseLookup[preSortTriIndices.i[2]]);
} }
for (auto& entry : reorderLookup) for (auto& entry : reorderLookup)
@ -570,6 +578,7 @@ namespace
surface.triCount = static_cast<uint16_t>(commonObject.m_faces.size()); surface.triCount = static_cast<uint16_t>(commonObject.m_faces.size());
surface.triIndices = m_memory.Alloc<XSurfaceTri>(surface.triCount); surface.triIndices = m_memory.Alloc<XSurfaceTri>(surface.triCount);
xmodelToCommonVertexIndexLookup.reserve(static_cast<size_t>(surface.triCount) * std::extent_v<decltype(XModelFace::vertexIndex)>);
for (auto faceIndex = 0u; faceIndex < surface.triCount; faceIndex++) for (auto faceIndex = 0u; faceIndex < surface.triCount; faceIndex++)
{ {
const auto& face = commonObject.m_faces[faceIndex]; const auto& face = commonObject.m_faces[faceIndex];
@ -592,8 +601,6 @@ namespace
} }
} }
ReorderVerticesByWeightCount(xmodelToCommonVertexIndexLookup, surface, common);
constexpr auto maxVertices = std::numeric_limits<decltype(XSurface::vertCount)>::max(); constexpr auto maxVertices = std::numeric_limits<decltype(XSurface::vertCount)>::max();
if (vertexOffset + xmodelToCommonVertexIndexLookup.size() > maxVertices) if (vertexOffset + xmodelToCommonVertexIndexLookup.size() > maxVertices)
{ {
@ -601,6 +608,8 @@ namespace
return false; return false;
} }
ReorderVerticesByWeightCount(xmodelToCommonVertexIndexLookup, surface, common);
surface.baseVertIndex = static_cast<uint16_t>(vertexOffset); surface.baseVertIndex = static_cast<uint16_t>(vertexOffset);
surface.vertCount = static_cast<uint16_t>(xmodelToCommonVertexIndexLookup.size()); surface.vertCount = static_cast<uint16_t>(xmodelToCommonVertexIndexLookup.size());
surface.verts0 = m_memory.Alloc<GfxPackedVertex>(surface.vertCount); surface.verts0 = m_memory.Alloc<GfxPackedVertex>(surface.vertCount);