From 4043b6372102079d5e30b9941feb85347380fea1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 6 Apr 2020 12:56:26 -0400 Subject: [PATCH] CPASAnimState: Make computation functions private These are currently only used internally. --- Runtime/Character/CPASAnimState.hpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Runtime/Character/CPASAnimState.hpp b/Runtime/Character/CPASAnimState.hpp index 59701ba76..e3cb7be84 100644 --- a/Runtime/Character/CPASAnimState.hpp +++ b/Runtime/Character/CPASAnimState.hpp @@ -16,17 +16,19 @@ class CPASAnimState { std::vector x14_anims; mutable std::vector x24_selectionCache; + float ComputeExactMatchWeight(u32 idx, const CPASAnimParm& parm, CPASAnimParm::UParmValue parmVal) const; + float ComputePercentErrorWeight(u32 idx, const CPASAnimParm& parm, CPASAnimParm::UParmValue parmVal) const; + float ComputeAngularPercentErrorWeight(u32 idx, const CPASAnimParm& parm, CPASAnimParm::UParmValue parmVal) const; + public: explicit CPASAnimState(CInputStream& in); explicit CPASAnimState(int stateId); s32 GetStateId() const { return x0_id; } s32 GetNumAnims() const { return x14_anims.size(); } - CPASAnimParm GetAnimParmData(s32, u32) const; + CPASAnimParm GetAnimParmData(s32 animId, u32 parmIdx) const; s32 PickRandomAnimation(CRandom16& rand) const; - std::pair FindBestAnimation(const rstl::reserved_vector&, CRandom16&, s32) const; - float ComputeExactMatchWeight(u32, const CPASAnimParm&, CPASAnimParm::UParmValue) const; - float ComputePercentErrorWeight(u32, const CPASAnimParm&, CPASAnimParm::UParmValue) const; - float ComputeAngularPercentErrorWeight(u32, const CPASAnimParm&, CPASAnimParm::UParmValue) const; + std::pair FindBestAnimation(const rstl::reserved_vector& parms, CRandom16& rand, + s32 ignoreAnim) const; }; } // namespace urde