AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMaterialSet: Collapse loop into find_if 

Same behavior, explicit intent.
This commit is contained in:
Lioncash 2020-06-16 18:45:47 -04:00
parent 2d2210cd9e
commit c8ebbc860b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Core/Resource/CMaterialSet.h
View File

@ -5,6 +5,7 @@
#include "CTexture.h" #include "CTexture.h"
#include <Common/EGame.h> #include <Common/EGame.h>
#include <Common/FileIO/IInputStream.h> #include <Common/FileIO/IInputStream.h>
#include <algorithm>
class CMaterialSet class CMaterialSet
{ {
@ -47,13 +48,13 @@ public:
CMaterial* MaterialByName(const TString& rkName) CMaterial* MaterialByName(const TString& rkName)
{ {
for (auto it = mMaterials.begin(); it != mMaterials.end(); it++) const auto iter = std::find_if(mMaterials.begin(), mMaterials.end(),
{ [&rkName](const auto& entry) { return entry->Name() == rkName; });
if ((*it)->Name() == rkName)
return it->get();
}
if (iter == mMaterials.cend())
return nullptr; return nullptr;
return iter->get();
} }
uint32 MaterialIndexByName(const TString& rkName) uint32 MaterialIndexByName(const TString& rkName)