Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VOXELFORMAT: moved the primitive check

master
Martin Gerhardy 2022-04-23 22:41:28 +02:00
parent 5c1d96e985
commit 9f0419c3e4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/voxelformat/GLTFFormat.cpp
View File

@ -453,6 +453,10 @@ voxelformat::SceneGraphTransform GLTFFormat::loadGltfTransform(const tinygltf::N
}
bool GLTFFormat::loadGltfIndices(const tinygltf::Model &model, const tinygltf::Primitive &primitive, core::DynamicArray<uint32_t> &indices) const {
if (primitive.mode != TINYGLTF_MODE_TRIANGLES) {
Log::warn("Unexpected primitive mode: %i", primitive.mode);
return false;
}
const tinygltf::Accessor *accessor = getGltfAccessor(model, primitive.indices);
if (accessor == nullptr) {
Log::warn("Could not get accessor for indices");
@ -712,10 +716,6 @@ bool GLTFFormat::loadGltfNode_r(const core::String &filename, SceneGraph &sceneG
core::DynamicArray<GltfVertex> vertices;
Log::debug("Primitives: %i in mesh %i", (int)mesh.primitives.size(), gltfNode.mesh);
for (tinygltf::Primitive &primitive : mesh.primitives) {
if (primitive.mode != TINYGLTF_MODE_TRIANGLES) {
Log::warn("Unexpected primitive mode: %i", primitive.mode);
continue;
}
if (!loadGltfIndices(model, primitive, indices)) {
Log::warn("Failed to load indices");
continue;