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

NFF: Use C++11 range-based for loop

pull/898/head
Turo Lamminen 2016-05-22 00:37:10 +03:00
parent ac676d4d3c
commit 3eb9b8e91b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/NFFLoader.cpp
View File

@ -673,12 +673,11 @@ void NFFImporter::InternReadFile( const std::string& pFile,
if ('t' == line[0]) if ('t' == line[0])
{ {
currentMeshWithUVCoords = NULL; currentMeshWithUVCoords = NULL;
for (std::vector<MeshInfo>::iterator it = meshesWithUVCoords.begin(), end = meshesWithUVCoords.end(); for (auto &mesh : meshesWithUVCoords)
it != end;++it)
{ {
if ((*it).shader == s) if (mesh.shader == s)
{ {
currentMeshWithUVCoords = &(*it); currentMeshWithUVCoords = &mesh;
break; break;
} }
} }
@ -695,12 +694,11 @@ void NFFImporter::InternReadFile( const std::string& pFile,
else if ('p' == line[1]) else if ('p' == line[1])
{ {
currentMeshWithNormals = NULL; currentMeshWithNormals = NULL;
for (std::vector<MeshInfo>::iterator it = meshesWithNormals.begin(), end = meshesWithNormals.end(); for (auto &mesh : meshesWithNormals)
it != end;++it)
{ {
if ((*it).shader == s) if (mesh.shader == s)
{ {
currentMeshWithNormals = &(*it); currentMeshWithNormals = &mesh;
break; break;
} }
} }
@ -717,12 +715,11 @@ void NFFImporter::InternReadFile( const std::string& pFile,
else else
{ {
currentMesh = NULL; currentMesh = NULL;
for (std::vector<MeshInfo>::iterator it = meshes.begin(), end = meshes.end(); for (auto &mesh : meshes)
it != end;++it)
{ {
if ((*it).shader == s) if (mesh.shader == s)
{ {
currentMesh = &(*it); currentMesh = &mesh;
break; break;
} }
} }