From 9fe671af99cdf368963cebf5a8cfd19a7350ed2a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 9 Mar 2020 11:33:22 -0400 Subject: [PATCH] CAnimTreeSequence: std::move constructor parameters where applicable Allows the constructor arguments to be moved into the constructor. --- Runtime/Character/CAnimTreeSequence.cpp | 20 ++++++++++---------- Runtime/Character/CAnimTreeSequence.hpp | 9 ++++----- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Runtime/Character/CAnimTreeSequence.cpp b/Runtime/Character/CAnimTreeSequence.cpp index 628840687..0308eae34 100644 --- a/Runtime/Character/CAnimTreeSequence.cpp +++ b/Runtime/Character/CAnimTreeSequence.cpp @@ -6,22 +6,22 @@ namespace urde { -CAnimTreeSequence::CAnimTreeSequence(const std::vector>& seq, const CAnimSysContext& animSys, +CAnimTreeSequence::CAnimTreeSequence(std::vector> seq, CAnimSysContext animSys, std::string_view name) : CAnimTreeSingleChild(seq[0]->GetAnimationTree(animSys, CMetaAnimTreeBuildOrders::NoSpecialOrders()), name) -, x18_animCtx(animSys) -, x28_sequence(seq) -, x3c_fundamentals(CSequenceHelper(seq, animSys).ComputeSequenceFundamentals()) +, x18_animCtx(std::move(animSys)) +, x28_sequence(std::move(seq)) +, x3c_fundamentals(CSequenceHelper(x28_sequence, x18_animCtx).ComputeSequenceFundamentals()) , x94_curTime(0.f) {} CAnimTreeSequence::CAnimTreeSequence(const std::shared_ptr& curNode, - const std::vector>& metaAnims, - const CAnimSysContext& animSys, std::string_view name, - const CSequenceFundamentals& fundamentals, const CCharAnimTime& time) + std::vector> metaAnims, + CAnimSysContext animSys, std::string_view name, + CSequenceFundamentals fundamentals, const CCharAnimTime& time) : CAnimTreeSingleChild(curNode, name) -, x18_animCtx(animSys) -, x28_sequence(metaAnims) -, x3c_fundamentals(fundamentals) +, x18_animCtx(std::move(animSys)) +, x28_sequence(std::move(metaAnims)) +, x3c_fundamentals(std::move(fundamentals)) , x94_curTime(time) {} CAnimTreeEffectiveContribution CAnimTreeSequence::VGetContributionOfHighestInfluence() const { diff --git a/Runtime/Character/CAnimTreeSequence.hpp b/Runtime/Character/CAnimTreeSequence.hpp index b82d12470..82e796982 100644 --- a/Runtime/Character/CAnimTreeSequence.hpp +++ b/Runtime/Character/CAnimTreeSequence.hpp @@ -20,11 +20,10 @@ class CAnimTreeSequence : public CAnimTreeSingleChild { CCharAnimTime x94_curTime; public: - CAnimTreeSequence(const std::vector>& seq, const CAnimSysContext& animSys, - std::string_view name); - CAnimTreeSequence(const std::shared_ptr& curNode, - const std::vector>& metaAnims, const CAnimSysContext& animSys, - std::string_view name, const CSequenceFundamentals& fundamentals, const CCharAnimTime& time); + CAnimTreeSequence(std::vector> seq, CAnimSysContext animSys, std::string_view name); + CAnimTreeSequence(const std::shared_ptr& curNode, std::vector> metaAnims, + CAnimSysContext animSys, std::string_view name, CSequenceFundamentals fundamentals, + const CCharAnimTime& time); CAnimTreeEffectiveContribution VGetContributionOfHighestInfluence() const override; std::shared_ptr VGetBestUnblendedChild() const override;