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

chore: properly calculate model and bone bounds

Browse Source
This commit is contained in:
Jan 2024-08-10 20:48:29 +02:00
parent 75e22b1750
commit 4db13de471
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ObjLoading/Game/T6/XModel/JsonXModelLoader.cpp
View File

@ -479,16 +479,50 @@ namespace
}); });
} }
static void CalculateModelBounds(XModel& xmodel)
{
if (!xmodel.surfs)
return;
for (auto surfaceIndex = 0u; surfaceIndex < xmodel.lodInfo[0].numsurfs; surfaceIndex++)
{
const auto& surface = xmodel.surfs[surfaceIndex + xmodel.lodInfo[0].surfIndex];
if (!surface.verts0)
continue;
for (auto vertIndex = 0u; vertIndex < surface.vertCount; vertIndex++)
{
const auto& vertex = surface.verts0[vertIndex];
xmodel.mins.x = std::min(xmodel.mins.x, vertex.xyz.v[0]);
xmodel.mins.y = std::min(xmodel.mins.y, vertex.xyz.v[1]);
xmodel.mins.z = std::min(xmodel.mins.z, vertex.xyz.v[2]);
xmodel.maxs.x = std::max(xmodel.maxs.x, vertex.xyz.v[0]);
xmodel.maxs.y = std::max(xmodel.maxs.y, vertex.xyz.v[1]);
xmodel.maxs.z = std::max(xmodel.maxs.z, vertex.xyz.v[2]);
}
}
const auto maxX = std::max(std::abs(xmodel.mins.x), std::abs(xmodel.maxs.x));
const auto maxY = std::max(std::abs(xmodel.mins.y), std::abs(xmodel.maxs.y));
const auto maxZ = std::max(std::abs(xmodel.mins.z), std::abs(xmodel.maxs.z));
xmodel.radius = Eigen::Vector3f(maxX, maxY, maxZ).norm();
}
bool CreateXModelFromJson(const JsonXModel& jXModel, XModel& xmodel) bool CreateXModelFromJson(const JsonXModel& jXModel, XModel& xmodel)
{ {
auto lodNumber = 0u; auto lodNumber = 0u;
for (const auto& jLod : jXModel.lods) for (const auto& jLod : jXModel.lods)
LoadLod(jLod, xmodel, lodNumber++); LoadLod(jLod, xmodel, lodNumber++);
xmodel.numLods = static_cast<uint16_t>(jXModel.lods.size());
xmodel.numsurfs = static_cast<unsigned char>(m_surfaces.size()); xmodel.numsurfs = static_cast<unsigned char>(m_surfaces.size());
xmodel.surfs = m_memory.Alloc<XSurface>(xmodel.numsurfs); xmodel.surfs = m_memory.Alloc<XSurface>(xmodel.numsurfs);
memcpy(xmodel.surfs, m_surfaces.data(), sizeof(XSurface) * xmodel.numsurfs); memcpy(xmodel.surfs, m_surfaces.data(), sizeof(XSurface) * xmodel.numsurfs);
CalculateModelBounds(xmodel);
if (jXModel.collLod && jXModel.collLod.value() >= 0) if (jXModel.collLod && jXModel.collLod.value() >= 0)
{ {
if (static_cast<unsigned>(jXModel.collLod.value()) >= jXModel.lods.size()) if (static_cast<unsigned>(jXModel.collLod.value()) >= jXModel.lods.size())

11
src/ObjLoading/XModel/Gltf/GltfLoader.cpp
View File

@ -267,13 +267,22 @@ namespace
unsigned joints[4]; unsigned joints[4];
float weights[4]; float weights[4];
if (!positionAccessor->GetFloatVec3(vertexIndex, vertex.coordinates) || !normalAccessor->GetFloatVec3(vertexIndex, vertex.normal) float coordinates[3];
float normal[3];
if (!positionAccessor->GetFloatVec3(vertexIndex, coordinates) || !normalAccessor->GetFloatVec3(vertexIndex, normal)
|| !colorAccessor->GetFloatVec4(vertexIndex, vertex.color) || !colorAccessor->GetFloatVec2(vertexIndex, vertex.uv) || !colorAccessor->GetFloatVec4(vertexIndex, vertex.color) || !colorAccessor->GetFloatVec2(vertexIndex, vertex.uv)
|| !jointsAccessor->GetUnsignedVec4(vertexIndex, joints) || !weightsAccessor->GetFloatVec4(vertexIndex, weights)) || !jointsAccessor->GetUnsignedVec4(vertexIndex, joints) || !weightsAccessor->GetFloatVec4(vertexIndex, weights))
{ {
return false; return false;
} }
vertex.coordinates[0] = coordinates[0];
vertex.coordinates[1] = -coordinates[2];
vertex.coordinates[2] = coordinates[1];
vertex.normal[0] = normal[0];
vertex.normal[1] = -normal[2];
vertex.normal[2] = normal[1];
common.m_vertices.emplace_back(vertex); common.m_vertices.emplace_back(vertex);
XModelVertexBoneWeights vertexWeights{common.m_bone_weight_data.weights.size(), 0u}; XModelVertexBoneWeights vertexWeights{common.m_bone_weight_data.weights.size(), 0u};