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

Merge branch 'master' into slow_xml_load

pull/2473/head
Kim Kulling 2019-06-04 12:50:43 +02:00 committed by GitHub
parent fe4fd00a82 4de162fa79
commit cead840a75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/FindInstancesProcess.cpp
View File

@ -137,6 +137,11 @@ void FindInstancesProcess::Execute( aiScene* pScene)
aiMesh* inst = pScene->mMeshes[i]; aiMesh* inst = pScene->mMeshes[i];
hashes[i] = GetMeshHash(inst); hashes[i] = GetMeshHash(inst);
// Find an appropriate epsilon
// to compare position differences against
float epsilon = ComputePositionEpsilon(inst);
epsilon *= epsilon;
for (int a = i-1; a >= 0; --a) { for (int a = i-1; a >= 0; --a) {
if (hashes[i] == hashes[a]) if (hashes[i] == hashes[a])
{ {
@ -154,12 +159,7 @@ void FindInstancesProcess::Execute( aiScene* pScene)
orig->mPrimitiveTypes != inst->mPrimitiveTypes) orig->mPrimitiveTypes != inst->mPrimitiveTypes)
continue; continue;
// up to now the meshes are equal. find an appropriate // up to now the meshes are equal. Now compare vertex positions, normals,
// epsilon to compare position differences against
float epsilon = ComputePositionEpsilon(inst);
epsilon *= epsilon;
// now compare vertex positions, normals,
// tangents and bitangents using this epsilon. // tangents and bitangents using this epsilon.
if (orig->HasPositions()) { if (orig->HasPositions()) {
if(!CompareArrays(orig->mVertices,inst->mVertices,orig->mNumVertices,epsilon)) if(!CompareArrays(orig->mVertices,inst->mVertices,orig->mNumVertices,epsilon))