v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix message

pull/3329/head
Malcolm Tyrrell 2020-07-15 14:19:13 +01:00
parent f3170a96ba
commit 37e1fb9cd7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/AssetLib/glTF2/glTF2Importer.cpp
View File

@ -299,9 +299,9 @@ void glTF2Importer::ImportMaterials(glTF2::Asset &r) {
} }
static inline void SetFaceAndAdvance1(aiFace*& face, unsigned int numVertices, unsigned int a) { static inline void SetFaceAndAdvance1(aiFace*& face, unsigned int numVertices, unsigned int a) {
if (a >= numVertices) { if (a >= numVertices) {
return; return;
} }
face->mNumIndices = 1; face->mNumIndices = 1;
face->mIndices = new unsigned int[1]; face->mIndices = new unsigned int[1];
face->mIndices[0] = a; face->mIndices[0] = a;
@ -309,14 +309,14 @@ static inline void SetFaceAndAdvance1(aiFace*& face, unsigned int numVertices, u
} }
static inline void SetFaceAndAdvance2(aiFace*& face, unsigned int numVertices, unsigned int a, unsigned int b) { static inline void SetFaceAndAdvance2(aiFace*& face, unsigned int numVertices, unsigned int a, unsigned int b) {
if ((a >= numVertices) || (b >= numVertices)) { if ((a >= numVertices) || (b >= numVertices)) {
return; return;
} }
face->mNumIndices = 2; face->mNumIndices = 2;
face->mIndices = new unsigned int[2]; face->mIndices = new unsigned int[2];
face->mIndices[0] = a; face->mIndices[0] = a;
face->mIndices[1] = b; face->mIndices[1] = b;
++face; ++face;
} }
static inline void SetFaceAndAdvance3(aiFace*& face, unsigned int numVertices, unsigned int a, unsigned int b, unsigned int c) { static inline void SetFaceAndAdvance3(aiFace*& face, unsigned int numVertices, unsigned int a, unsigned int b, unsigned int c) {
@ -328,7 +328,7 @@ static inline void SetFaceAndAdvance3(aiFace*& face, unsigned int numVertices, u
face->mIndices[0] = a; face->mIndices[0] = a;
face->mIndices[1] = b; face->mIndices[1] = b;
face->mIndices[2] = c; face->mIndices[2] = c;
++face; ++face;
} }
#ifdef ASSIMP_BUILD_DEBUG #ifdef ASSIMP_BUILD_DEBUG
@ -498,7 +498,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset &r) {
} }
aiFace *faces = nullptr; aiFace *faces = nullptr;
aiFace *facePtr = nullptr; aiFace *facePtr = nullptr;
size_t nFaces = 0; size_t nFaces = 0;
if (prim.indices) { if (prim.indices) {
@ -664,7 +664,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset &r) {
aim->mFaces = faces; aim->mFaces = faces;
const unsigned int actualNumFaces = static_cast<unsigned int>(facePtr - faces); const unsigned int actualNumFaces = static_cast<unsigned int>(facePtr - faces);
if (actualNumFaces < nFaces) { if (actualNumFaces < nFaces) {
ASSIMP_LOG_WARN("Some faces in mesh had out-of-range indices. Those faces were dropped."); ASSIMP_LOG_WARN("Some faces had out-of-range indices. Those faces were dropped.");
} }
if (actualNumFaces == 0) if (actualNumFaces == 0)
{ {