AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Implement additive body states, rstl::binary_find

Browse Source
This commit is contained in:
Jack Andersen
2017-07-10 21:17:03 -10:00
parent 7e85ab932b
commit daef773f39
17 changed files with 371 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/Character/CPASDatabase.cpp
View File

@@ -37,11 +37,10 @@ std::pair<float, s32> CPASDatabase::FindBestAnimation(const CPASAnimParmData& da
std::pair<float, s32> CPASDatabase::FindBestAnimation(const CPASAnimParmData& data, CRandom16& rand, s32 ignoreAnim) const
{
CPASAnimState key(data.GetStateId());
auto it = std::lower_bound(x0_states.cbegin(), x0_states.cend(), key,
[](const CPASAnimState& item, const CPASAnimState& test) -> bool {return item.GetStateId() < test.GetStateId();});
auto it = rstl::binary_find(x0_states.cbegin(), x0_states.cend(), data.GetStateId(),
[](const CPASAnimState& item) {return item.GetStateId();});
if (it == x0_states.cend() || it->GetStateId() > key.GetStateId())
if (it == x0_states.cend())
return {0.f, -1};
return (*it).FindBestAnimation(data.GetAnimParmData(), rand, ignoreAnim);