From 823b381a0b3089e218365c915daeea74a239d78b Mon Sep 17 00:00:00 2001 From: "GuillaumeG." Date: Thu, 28 Dec 2023 22:13:40 +0100 Subject: [PATCH] Animation: pass std::string by copy and move, pass fge::anim::AnimationDataPtr by copy and move --- includes/FastEngine/C_animation.hpp | 14 ++++++------ sources/C_animation.cpp | 34 ++++++++++++++--------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/includes/FastEngine/C_animation.hpp b/includes/FastEngine/C_animation.hpp index 47c0e4ff..d02f3062 100644 --- a/includes/FastEngine/C_animation.hpp +++ b/includes/FastEngine/C_animation.hpp @@ -50,7 +50,7 @@ class FGE_API Animation * \param name The name of the animation * \param frame The beginning frame of the animation */ - Animation(std::string const& name, std::size_t frame = 0); ///TODO: use string_view ? + Animation(std::string name, std::size_t frame = 0); ///TODO: use string_view ? /** * \brief Constructor that takes the name of the animation and the group name * @@ -61,12 +61,12 @@ class FGE_API Animation * \param group The name of the group * \param frame The beginning frame of the animation */ - Animation(std::string const& name, std::string const& group, std::size_t frame = 0); + Animation(std::string name, std::string const& group, std::size_t frame = 0); Animation(char const* name, std::size_t frame = 0); Animation(char const* name, char const* group, std::size_t frame = 0); - Animation(fge::anim::AnimationDataPtr const& data, std::size_t frame = 0); - Animation(fge::anim::AnimationDataPtr const& data, std::string const& group, std::size_t frame = 0); - Animation(fge::anim::AnimationDataPtr const& data, char const* group, std::size_t frame = 0); + Animation(fge::anim::AnimationDataPtr data, std::size_t frame = 0); + Animation(fge::anim::AnimationDataPtr data, std::string const& group, std::size_t frame = 0); + Animation(fge::anim::AnimationDataPtr data, char const* group, std::size_t frame = 0); /** * \brief Clear the animation @@ -221,9 +221,9 @@ class FGE_API Animation */ [[nodiscard]] fge::anim::AnimationDataPtr const& getData() const; - fge::Animation& operator=(std::string const& name); + fge::Animation& operator=(std::string name); fge::Animation& operator=(char const* name); - fge::Animation& operator=(fge::anim::AnimationDataPtr const& data); + fge::Animation& operator=(fge::anim::AnimationDataPtr data); /** * \brief Retrieve the texture of the actual frame diff --git a/sources/C_animation.cpp b/sources/C_animation.cpp index 25645028..04c6780a 100644 --- a/sources/C_animation.cpp +++ b/sources/C_animation.cpp @@ -31,9 +31,9 @@ Animation::Animation() : g_loop(false), g_reverse(false) {} -Animation::Animation(std::string const& name, std::size_t frame) : +Animation::Animation(std::string name, std::size_t frame) : g_data(fge::anim::GetAnimation(name)), - g_name(name), + g_name(std::move(name)), g_groupIndex(0), g_frameIndex(frame), @@ -41,9 +41,9 @@ Animation::Animation(std::string const& name, std::size_t frame) : g_loop(false), g_reverse(false) {} -Animation::Animation(std::string const& name, std::string const& group, std::size_t frame) : +Animation::Animation(std::string name, std::string const& group, std::size_t frame) : g_data(fge::anim::GetAnimation(name)), - g_name(name), + g_name(std::move(name)), g_groupIndex(0), g_frameIndex(frame), @@ -73,10 +73,10 @@ Animation::Animation(char const* name, char const* group, std::size_t frame) : g_loop(false), g_reverse(false) { - this->setGroup(std::string(group)); + this->setGroup(std::string{group}); } -Animation::Animation(fge::anim::AnimationDataPtr const& data, std::size_t frame) : - g_data(data), +Animation::Animation(fge::anim::AnimationDataPtr data, std::size_t frame) : + g_data(std::move(data)), g_name(FGE_ANIM_BAD), g_groupIndex(0), @@ -85,8 +85,8 @@ Animation::Animation(fge::anim::AnimationDataPtr const& data, std::size_t frame) g_loop(false), g_reverse(false) {} -Animation::Animation(fge::anim::AnimationDataPtr const& data, std::string const& group, std::size_t frame) : - g_data(data), +Animation::Animation(fge::anim::AnimationDataPtr data, std::string const& group, std::size_t frame) : + g_data(std::move(data)), g_name(FGE_ANIM_BAD), g_groupIndex(0), @@ -97,8 +97,8 @@ Animation::Animation(fge::anim::AnimationDataPtr const& data, std::string const& { this->setGroup(group); } -Animation::Animation(fge::anim::AnimationDataPtr const& data, char const* group, std::size_t frame) : - g_data(data), +Animation::Animation(fge::anim::AnimationDataPtr data, char const* group, std::size_t frame) : + g_data(std::move(data)), g_name(FGE_ANIM_BAD), g_groupIndex(0), @@ -107,7 +107,7 @@ Animation::Animation(fge::anim::AnimationDataPtr const& data, char const* group, g_loop(false), g_reverse(false) { - this->setGroup(std::string(group)); + this->setGroup(std::string{group}); } void Animation::clear() @@ -357,22 +357,22 @@ fge::anim::AnimationDataPtr const& Animation::getData() const return this->g_data; } -fge::Animation& Animation::operator=(std::string const& name) +fge::Animation& Animation::operator=(std::string name) { - this->g_name = name; + this->g_name = std::move(name); this->g_data = fge::anim::GetAnimation(name); return *this; } fge::Animation& Animation::operator=(char const* name) { - this->g_name = std::string(name); + this->g_name = std::string{name}; this->g_data = fge::anim::GetAnimation(this->g_name); return *this; } -fge::Animation& Animation::operator=(fge::anim::AnimationDataPtr const& data) +fge::Animation& Animation::operator=(fge::anim::AnimationDataPtr data) { this->g_name = FGE_ANIM_BAD; - this->g_data = data; + this->g_data = std::move(data); return *this; }