AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-13 20:31:21 +00:00
Code Issues Projects Releases Wiki Activity

CStaticInterference: Shorten some find_if calls

Browse Source 
While we're at it, we can also const qualify a reference
This commit is contained in:
Lioncash 2020-05-19 22:17:20 -04:00
parent 463e9e9f60
commit 9ce7c72a1c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Runtime/CStaticInterference.cpp
View File

@ -7,10 +7,13 @@ namespace urde {
CStaticInterference::CStaticInterference(size_t sourceCount) { m_sources.reserve(sourceCount); } CStaticInterference::CStaticInterference(size_t sourceCount) { m_sources.reserve(sourceCount); }
void CStaticInterference::RemoveSource(TUniqueId id) { void CStaticInterference::RemoveSource(TUniqueId id) {
auto iter = std::find_if(m_sources.begin(), m_sources.end(), const auto iter = std::find_if(m_sources.cbegin(), m_sources.cend(), [id](const auto& src) { return src.id == id; });
[id](const CStaticInterferenceSource& src) -> bool { return src.id == id; });
if (iter != m_sources.end()) if (iter == m_sources.cend()) {
m_sources.erase(iter); return;
}
m_sources.erase(iter);
} }
void CStaticInterference::Update(CStateManager&, float dt) { void CStaticInterference::Update(CStateManager&, float dt) {
@ -44,15 +47,17 @@ float CStaticInterference::GetTotalInterference() const {
void CStaticInterference::AddSource(TUniqueId id, float magnitude, float duration) { void CStaticInterference::AddSource(TUniqueId id, float magnitude, float duration) {
magnitude = zeus::clamp(0.f, magnitude, 1.f); magnitude = zeus::clamp(0.f, magnitude, 1.f);
auto search = std::find_if(m_sources.begin(), m_sources.end(), const auto search = std::find_if(m_sources.begin(), m_sources.end(),
[id](CStaticInterferenceSource& source) { return source.id == id; }); [id](const CStaticInterferenceSource& source) { return source.id == id; });
if (search != m_sources.end()) { if (search != m_sources.cend()) {
search->magnitude = magnitude; search->magnitude = magnitude;
search->timeLeft = duration; search->timeLeft = duration;
return; return;
} }
if (m_sources.size() < m_sources.capacity())
if (m_sources.size() < m_sources.capacity()) {
m_sources.push_back({id, magnitude, duration}); m_sources.push_back({id, magnitude, duration});
}
} }
} // namespace urde } // namespace urde