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

CPASAnimState fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-07-06 11:06:56 -10:00
parent bfb16a3a0d
commit 778b37e0f8
9 changed files with 166 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Runtime/Character/CPASDatabase.cpp
View File

@@ -29,21 +29,22 @@ CPASDatabase::CPASDatabase(CInputStream& in)
SetDefaultState(defaultState);
}
std::pair<float, s32> CPASDatabase::FindBestAnimation(const CPASAnimParmData& data, s32 id) const
std::pair<float, s32> CPASDatabase::FindBestAnimation(const CPASAnimParmData& data, s32 ignoreAnim) const
{
CRandom16 rnd(4660);
return FindBestAnimation(data, rnd, id);
return FindBestAnimation(data, rnd, ignoreAnim);
}
std::pair<float, s32> CPASDatabase::FindBestAnimation(const CPASAnimParmData& data, CRandom16& rand, s32 id) const
std::pair<float, s32> CPASDatabase::FindBestAnimation(const CPASAnimParmData& data, CRandom16& rand, s32 ignoreAnim) const
{
auto it = std::lower_bound(x0_states.cbegin(), x0_states.cend(), id,
[](const CPASAnimState& item, const int& test) -> bool {return item.GetStateId() < test;});
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();});
if (it == x0_states.cend())
if (it->GetStateId() < key.GetStateId() || it == x0_states.cend())
return {0.f, -1};
return (*it).FindBestAnimation(data.GetAnimParmData(), rand, id);
return (*it).FindBestAnimation(data.GetAnimParmData(), rand, ignoreAnim);
}
}