zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-06-17 14:02:12 +00:00
Code Activity

fix: no support for gltf using vec3 for vertex colors (#832)

Browse Source 
* fix: gltf loder not supporting vec3 for color info

* fix: collision tree creator accessing invalid index via array accessor
This commit is contained in:
Jan
2026-06-15 19:58:40 +02:00
committed by GitHub
parent 19cb9db3d7
commit b2aa4749c1
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/XModel/CollisionTreeCreator.cpp
+3 -3
View File
@@ -304,9 +304,9 @@ namespace
} }
} }
std::sort(&m_sorted_mins[0], &m_sorted_mins[minMaxCount], std::greater()); std::sort(m_sorted_mins.data(), m_sorted_mins.data() + minMaxCount, std::greater());
std::sort(&m_sorted_maxs[0], &m_sorted_maxs[minMaxCount], std::greater()); std::sort(m_sorted_maxs.data(), m_sorted_maxs.data() + minMaxCount, std::greater());
std::sort(&m_sorted_coplanar[0], &m_sorted_coplanar[coplanarCount], std::greater()); std::sort(m_sorted_coplanar.data(), m_sorted_coplanar.data() + coplanarCount, std::greater());
int sideFrontCount = 0; int sideFrontCount = 0;
int sideBackCount = static_cast<int>(count); int sideBackCount = static_cast<int>(count);
src/ObjLoading/XModel/Gltf/GltfLoader.cpp
+26 -4
View File
@@ -302,6 +302,8 @@ namespace
VerifyAccessorVertexCount("WEIGHTS_0", weightsAccessor, vertexCount); VerifyAccessorVertexCount("WEIGHTS_0", weightsAccessor, vertexCount);
// clang-format on // clang-format on
const auto colorUsesVec3 = colorAccessor->GetType().has_value() && colorAccessor->GetType().value() == JsonAccessorType::VEC3;
const auto vertexOffset = static_cast<unsigned>(common.m_vertices.size()); const auto vertexOffset = static_cast<unsigned>(common.m_vertices.size());
common.m_vertices.reserve(vertexOffset + vertexCount); common.m_vertices.reserve(vertexOffset + vertexCount);
common.m_vertex_bone_weights.reserve(vertexOffset + vertexCount); common.m_vertex_bone_weights.reserve(vertexOffset + vertexCount);
@@ -312,11 +314,31 @@ namespace
unsigned joints[4]; unsigned joints[4];
float weights[4]; float weights[4];
if (!positionAccessor->GetFloatVec3(vertexIndex, vertex.coordinates) || !normalAccessor->GetFloatVec3(vertexIndex, vertex.normal) if (!positionAccessor->GetFloatVec3(vertexIndex, vertex.coordinates))
|| !colorAccessor->GetFloatVec4(vertexIndex, vertex.color) || !uvAccessor->GetFloatVec2(vertexIndex, vertex.uv) throw GltfLoadException("Failed to load vertex position data from accessors");
|| !jointsAccessor->GetUnsignedVec4(vertexIndex, joints) || !weightsAccessor->GetFloatVec4(vertexIndex, weights)) if (!normalAccessor->GetFloatVec3(vertexIndex, vertex.normal))
throw GltfLoadException("Failed to load vertex normal data from accessors");
if (!uvAccessor->GetFloatVec2(vertexIndex, vertex.uv))
throw GltfLoadException("Failed to load vertex uv data from accessors");
if (!jointsAccessor->GetUnsignedVec4(vertexIndex, joints))
throw GltfLoadException("Failed to load vertex joints data from accessors");
if (!weightsAccessor->GetFloatVec4(vertexIndex, weights))
throw GltfLoadException("Failed to load vertex weights data from accessors");
if (colorUsesVec3)
{ {
throw GltfLoadException("Failed to load vertex data from accessors"); float colorVec3[3];
if (!colorAccessor->GetFloatVec3(vertexIndex, colorVec3))
throw GltfLoadException("Failed to load vertex color data from accessors");
vertex.color[0] = colorVec3[0];
vertex.color[1] = colorVec3[1];
vertex.color[2] = colorVec3[2];
vertex.color[3] = 1.0;
}
else
{
if (!colorAccessor->GetFloatVec4(vertexIndex, vertex.color))
throw GltfLoadException("Failed to load vertex color data from accessors");
} }
RhcToLhcCoordinates(vertex.coordinates); RhcToLhcCoordinates(vertex.coordinates);