From 8dacdd18b86716aa340426c8f8064fe3dcdcebb3 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 27 Aug 2016 11:19:55 -1000 Subject: [PATCH] Remove redundant _getPOIList methods --- Runtime/Character/CAnimSourceReader.cpp | 16 ++++++------- Runtime/Character/CBoolPOINode.cpp | 32 ------------------------- Runtime/Character/CBoolPOINode.hpp | 6 ----- Runtime/Character/CInt32POINode.cpp | 32 ------------------------- Runtime/Character/CInt32POINode.hpp | 6 ----- Runtime/Character/CParticlePOINode.cpp | 32 ------------------------- Runtime/Character/CParticlePOINode.hpp | 6 ----- Runtime/Character/CSoundPOINode.cpp | 32 ------------------------- Runtime/Character/CSoundPOINode.hpp | 6 ----- 9 files changed, 8 insertions(+), 160 deletions(-) diff --git a/Runtime/Character/CAnimSourceReader.cpp b/Runtime/Character/CAnimSourceReader.cpp index 23ad691cc..c050a2937 100644 --- a/Runtime/Character/CAnimSourceReader.cpp +++ b/Runtime/Character/CAnimSourceReader.cpp @@ -167,8 +167,8 @@ u32 CAnimSourceReaderBase::VGetBoolPOIList(const CCharAnimTime& time, if (x4_sourceInfo->HasPOIData()) { const std::vector& boolNodes = x4_sourceInfo->GetBoolPOIStream(); - return CBoolPOINode::_getPOIList(time, listOut, capacity, iterator, unk, boolNodes, - xc_curTime, *x4_sourceInfo, x14_passedBoolCount); + return _getPOIList(time, listOut, capacity, iterator, unk, boolNodes, + xc_curTime, *x4_sourceInfo, x14_passedBoolCount); } return 0; } @@ -180,8 +180,8 @@ u32 CAnimSourceReaderBase::VGetInt32POIList(const CCharAnimTime& time, if (x4_sourceInfo->HasPOIData()) { const std::vector& int32Nodes = x4_sourceInfo->GetInt32POIStream(); - return CInt32POINode::_getPOIList(time, listOut, capacity, iterator, unk, int32Nodes, - xc_curTime, *x4_sourceInfo, x18_passedIntCount); + return _getPOIList(time, listOut, capacity, iterator, unk, int32Nodes, + xc_curTime, *x4_sourceInfo, x18_passedIntCount); } return 0; } @@ -193,8 +193,8 @@ u32 CAnimSourceReaderBase::VGetParticlePOIList(const CCharAnimTime& time, if (x4_sourceInfo->HasPOIData()) { const std::vector& particleNodes = x4_sourceInfo->GetParticlePOIStream(); - return CParticlePOINode::_getPOIList(time, listOut, capacity, iterator, unk, particleNodes, - xc_curTime, *x4_sourceInfo, x1c_passedParticleCount); + return _getPOIList(time, listOut, capacity, iterator, unk, particleNodes, + xc_curTime, *x4_sourceInfo, x1c_passedParticleCount); } return 0; } @@ -206,8 +206,8 @@ u32 CAnimSourceReaderBase::VGetSoundPOIList(const CCharAnimTime& time, if (x4_sourceInfo->HasPOIData()) { const std::vector& soundNodes = x4_sourceInfo->GetSoundPOIStream(); - return CSoundPOINode::_getPOIList(time, listOut, capacity, iterator, unk, soundNodes, - xc_curTime, *x4_sourceInfo, x20_passedSoundCount); + return _getPOIList(time, listOut, capacity, iterator, unk, soundNodes, + xc_curTime, *x4_sourceInfo, x20_passedSoundCount); } return 0; } diff --git a/Runtime/Character/CBoolPOINode.cpp b/Runtime/Character/CBoolPOINode.cpp index 385e3bbce..ea6b716db 100644 --- a/Runtime/Character/CBoolPOINode.cpp +++ b/Runtime/Character/CBoolPOINode.cpp @@ -18,36 +18,4 @@ CBoolPOINode CBoolPOINode::CopyNodeMinusStartTime(const CBoolPOINode& node, return ret; } -u32 CBoolPOINode::_getPOIList(const CCharAnimTime& time, - CBoolPOINode* listOut, - u32 capacity, u32 iterator, u32 unk1, - const std::vector& stream, - const CCharAnimTime& curTime, - const IAnimSourceInfo& animInfo, u32 passedCount) -{ - u32 ret = 0; - if (animInfo.HasPOIData() && stream.size()) - { - CCharAnimTime dur = animInfo.GetAnimationDuration(); - CCharAnimTime targetTime = curTime + time; - if (targetTime >= dur) - targetTime = dur; - - if (passedCount >= stream.size()) - return ret; - - CCharAnimTime nodeTime = stream[passedCount].GetTime(); - while (nodeTime <= targetTime) - { - u32 idx = iterator + ret; - if (idx < capacity) - listOut[idx] = CopyNodeMinusStartTime(stream[passedCount], curTime); - ++passedCount; - ++ret; - nodeTime = stream[passedCount].GetTime(); - } - } - return ret; -} - } diff --git a/Runtime/Character/CBoolPOINode.hpp b/Runtime/Character/CBoolPOINode.hpp index 218b2f008..19c68f5c6 100644 --- a/Runtime/Character/CBoolPOINode.hpp +++ b/Runtime/Character/CBoolPOINode.hpp @@ -14,12 +14,6 @@ public: CBoolPOINode(); CBoolPOINode(CInputStream& in); bool GetValue() const {return x38_val;} - static u32 _getPOIList(const CCharAnimTime& time, - CBoolPOINode* listOut, - u32 capacity, u32 iterator, u32 unk1, - const std::vector& stream, - const CCharAnimTime& curTime, - const IAnimSourceInfo& animInfo, u32 passedCount); static CBoolPOINode CopyNodeMinusStartTime(const CBoolPOINode& node, const CCharAnimTime& startTime); }; diff --git a/Runtime/Character/CInt32POINode.cpp b/Runtime/Character/CInt32POINode.cpp index eed32b368..c4cf52fb9 100644 --- a/Runtime/Character/CInt32POINode.cpp +++ b/Runtime/Character/CInt32POINode.cpp @@ -18,36 +18,4 @@ CInt32POINode CInt32POINode::CopyNodeMinusStartTime(const CInt32POINode& node, return ret; } -u32 CInt32POINode::_getPOIList(const CCharAnimTime& time, - CInt32POINode* listOut, - u32 capacity, u32 iterator, u32 unk1, - const std::vector& stream, - const CCharAnimTime& curTime, - const IAnimSourceInfo& animInfo, u32 passedCount) -{ - u32 ret = 0; - if (animInfo.HasPOIData() && stream.size()) - { - CCharAnimTime dur = animInfo.GetAnimationDuration(); - CCharAnimTime targetTime = curTime + time; - if (targetTime >= dur) - targetTime = dur; - - if (passedCount >= stream.size()) - return ret; - - CCharAnimTime nodeTime = stream[passedCount].GetTime(); - while (nodeTime <= targetTime) - { - u32 idx = iterator + ret; - if (idx < capacity) - listOut[idx] = CopyNodeMinusStartTime(stream[passedCount], curTime); - ++passedCount; - ++ret; - nodeTime = stream[passedCount].GetTime(); - } - } - return ret; -} - } diff --git a/Runtime/Character/CInt32POINode.hpp b/Runtime/Character/CInt32POINode.hpp index b6c04a3a3..38d81d6bf 100644 --- a/Runtime/Character/CInt32POINode.hpp +++ b/Runtime/Character/CInt32POINode.hpp @@ -17,12 +17,6 @@ public: s32 GetValue() const {return x38_val;} const std::string& GetLocatorName() const {return x3c_locatorName;} - static u32 _getPOIList(const CCharAnimTime& time, - CInt32POINode* listOut, - u32 capacity, u32 iterator, u32 unk1, - const std::vector& stream, - const CCharAnimTime& curTime, - const IAnimSourceInfo& animInfo, u32 passedCount); static CInt32POINode CopyNodeMinusStartTime(const CInt32POINode& node, const CCharAnimTime& startTime); }; diff --git a/Runtime/Character/CParticlePOINode.cpp b/Runtime/Character/CParticlePOINode.cpp index b34a53542..ed6f4bb2c 100644 --- a/Runtime/Character/CParticlePOINode.cpp +++ b/Runtime/Character/CParticlePOINode.cpp @@ -18,36 +18,4 @@ CParticlePOINode CParticlePOINode::CopyNodeMinusStartTime(const CParticlePOINode return ret; } -u32 CParticlePOINode::_getPOIList(const CCharAnimTime& time, - CParticlePOINode* listOut, - u32 capacity, u32 iterator, u32 unk1, - const std::vector& stream, - const CCharAnimTime& curTime, - const IAnimSourceInfo& animInfo, u32 passedCount) -{ - u32 ret = 0; - if (animInfo.HasPOIData() && stream.size()) - { - CCharAnimTime dur = animInfo.GetAnimationDuration(); - CCharAnimTime targetTime = curTime + time; - if (targetTime >= dur) - targetTime = dur; - - if (passedCount >= stream.size()) - return ret; - - CCharAnimTime nodeTime = stream[passedCount].GetTime(); - while (nodeTime <= targetTime) - { - u32 idx = iterator + ret; - if (idx < capacity) - listOut[idx] = CopyNodeMinusStartTime(stream[passedCount], curTime); - ++passedCount; - ++ret; - nodeTime = stream[passedCount].GetTime(); - } - } - return ret; -} - } diff --git a/Runtime/Character/CParticlePOINode.hpp b/Runtime/Character/CParticlePOINode.hpp index b79f22a5f..77a212ee1 100644 --- a/Runtime/Character/CParticlePOINode.hpp +++ b/Runtime/Character/CParticlePOINode.hpp @@ -16,12 +16,6 @@ public: CParticlePOINode(CInputStream& in); const CParticleData& GetParticleData() const {return x38_data;} - static u32 _getPOIList(const CCharAnimTime& time, - CParticlePOINode* listOut, - u32 capacity, u32 iterator, u32 unk1, - const std::vector& stream, - const CCharAnimTime& curTime, - const IAnimSourceInfo& animInfo, u32 passedCount); static CParticlePOINode CopyNodeMinusStartTime(const CParticlePOINode& node, const CCharAnimTime& startTime); }; diff --git a/Runtime/Character/CSoundPOINode.cpp b/Runtime/Character/CSoundPOINode.cpp index 11d9ac4c0..a2ccf3d3c 100644 --- a/Runtime/Character/CSoundPOINode.cpp +++ b/Runtime/Character/CSoundPOINode.cpp @@ -32,36 +32,4 @@ CSoundPOINode CSoundPOINode::CopyNodeMinusStartTime(const CSoundPOINode& node, return ret; } -u32 CSoundPOINode::_getPOIList(const CCharAnimTime& time, - CSoundPOINode* listOut, - u32 capacity, u32 iterator, u32 unk1, - const std::vector& stream, - const CCharAnimTime& curTime, - const IAnimSourceInfo& animInfo, u32 passedCount) -{ - u32 ret = 0; - if (animInfo.HasPOIData() && stream.size()) - { - CCharAnimTime dur = animInfo.GetAnimationDuration(); - CCharAnimTime targetTime = curTime + time; - if (targetTime >= dur) - targetTime = dur; - - if (passedCount >= stream.size()) - return ret; - - CCharAnimTime nodeTime = stream[passedCount].GetTime(); - while (nodeTime <= targetTime) - { - u32 idx = iterator + ret; - if (idx < capacity) - listOut[idx] = CopyNodeMinusStartTime(stream[passedCount], curTime); - ++passedCount; - ++ret; - nodeTime = stream[passedCount].GetTime(); - } - } - return ret; -} - } diff --git a/Runtime/Character/CSoundPOINode.hpp b/Runtime/Character/CSoundPOINode.hpp index 55197c2b1..d4ca274d7 100644 --- a/Runtime/Character/CSoundPOINode.hpp +++ b/Runtime/Character/CSoundPOINode.hpp @@ -20,12 +20,6 @@ public: const CCharAnimTime& time, u32 b, bool c, float d, u32 e, u32 f, u32 sfxId, float falloff, float maxDist); - static u32 _getPOIList(const CCharAnimTime& time, - CSoundPOINode* listOut, - u32 capacity, u32 iterator, u32 unk1, - const std::vector& stream, - const CCharAnimTime& curTime, - const IAnimSourceInfo& animInfo, u32 passedCount); static CSoundPOINode CopyNodeMinusStartTime(const CSoundPOINode& node, const CCharAnimTime& startTime); };