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

Slight rework for fix to issue #2046 to remove some duplicated code.

pull/2049/head
Paul Arden 2018-07-05 09:49:08 +10:00
parent e7699ca585
commit e43e30b726
2 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
code/glTF2Importer.cpp 100644 → 100755
View File

@ -446,10 +446,10 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
}
if (prim.indices) {
aiFace* faces = 0;
unsigned int nFaces = 0;
aiFace* faces = 0;
unsigned int nFaces = 0;
if (prim.indices) {
unsigned int count = prim.indices->count;
Accessor::Indexer data = prim.indices->GetIndexer();
@ -514,16 +514,8 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
}
break;
}
if (faces) {
aim->mFaces = faces;
aim->mNumFaces = nFaces;
ai_assert(CheckValidFacesIndices(faces, nFaces, aim->mNumVertices));
}
}
else { // no indices provided so directly generate from counts
aiFace* faces = 0;
unsigned int nFaces = 0;
// use the already determined count as it includes checks
unsigned int count = aim->mNumVertices;
@ -587,14 +579,13 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
}
break;
}
if (faces) {
aim->mFaces = faces;
aim->mNumFaces = nFaces;
ai_assert(CheckValidFacesIndices(faces, nFaces, aim->mNumVertices));
}
}
if (faces) {
aim->mFaces = faces;
aim->mNumFaces = nFaces;
ai_assert(CheckValidFacesIndices(faces, nFaces, aim->mNumVertices));
}
if (prim.material) {
aim->mMaterialIndex = prim.material.GetIndex();

25
code/glTFImporter.cpp 100644 → 100755
View File

@ -351,10 +351,10 @@ void glTFImporter::ImportMeshes(glTF::Asset& r)
}
if (prim.indices) {
aiFace* faces = 0;
unsigned int nFaces = 0;
aiFace* faces = 0;
unsigned int nFaces = 0;
if (prim.indices) {
unsigned int count = prim.indices->count;
Accessor::Indexer data = prim.indices->GetIndexer();
@ -419,16 +419,8 @@ void glTFImporter::ImportMeshes(glTF::Asset& r)
}
break;
}
if (faces) {
aim->mFaces = faces;
aim->mNumFaces = nFaces;
ai_assert(CheckValidFacesIndices(faces, nFaces, aim->mNumVertices));
}
}
else { // no indices provided so directly generate from counts
aiFace* faces = 0;
unsigned int nFaces = 0;
// use the already determined count as it includes checks
unsigned int count = aim->mNumVertices;
@ -492,14 +484,13 @@ void glTFImporter::ImportMeshes(glTF::Asset& r)
}
break;
}
if (faces) {
aim->mFaces = faces;
aim->mNumFaces = nFaces;
ai_assert(CheckValidFacesIndices(faces, nFaces, aim->mNumVertices));
}
}
if (faces) {
aim->mFaces = faces;
aim->mNumFaces = nFaces;
ai_assert(CheckValidFacesIndices(faces, nFaces, aim->mNumVertices));
}
if (prim.material) {
aim->mMaterialIndex = prim.material.GetIndex();