diff options
Diffstat (limited to 'src/crepe/api')
| -rw-r--r-- | src/crepe/api/Animator.cpp | 3 | ||||
| -rw-r--r-- | src/crepe/api/Texture.cpp | 16 | ||||
| -rw-r--r-- | src/crepe/api/Texture.h | 10 | 
3 files changed, 14 insertions, 15 deletions
| diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp index 31b9632..2b21c6c 100644 --- a/src/crepe/api/Animator.cpp +++ b/src/crepe/api/Animator.cpp @@ -21,6 +21,7 @@ Animator::Animator(game_object_id_t id, Sprite & ss, int row, int col, int col_a  	this->active = false;  	// need to do this for to get the aspect ratio for a single clipping in the spritesheet -	this->spritesheet.aspect_ratio = static_cast<double>(this->spritesheet.sprite_rect.w) / this->spritesheet.sprite_rect.h; +	this->spritesheet.aspect_ratio = static_cast<double>(this->spritesheet.sprite_rect.w) +									 / this->spritesheet.sprite_rect.h;  }  Animator::~Animator() { dbg_trace(); } diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp index 576bdc3..e43bdaa 100644 --- a/src/crepe/api/Texture.cpp +++ b/src/crepe/api/Texture.cpp @@ -17,15 +17,13 @@ Texture::~Texture() {  	this->texture.reset();  } -Texture::Texture(Texture&& other) noexcept -    : texture(std::move(other.texture)){ -} -                                                -Texture& Texture::operator=(Texture&& other) noexcept { -    if (this != &other) { -        texture = std::move(other.texture); -    } -    return *this; +Texture::Texture(Texture && other) noexcept : texture(std::move(other.texture)) {} + +Texture & Texture::operator=(Texture && other) noexcept { +	if (this != &other) { +		texture = std::move(other.texture); +	} +	return *this;  }  void Texture::load(const Asset & res) { diff --git a/src/crepe/api/Texture.h b/src/crepe/api/Texture.h index dc4a6d7..7206a66 100644 --- a/src/crepe/api/Texture.h +++ b/src/crepe/api/Texture.h @@ -35,11 +35,11 @@ public:  	 */  	~Texture();  	// FIXME: this constructor shouldn't be necessary because this class doesn't manage memory -	 -    Texture(Texture&& other) noexcept; -    Texture& operator=(Texture&& other) noexcept; -	Texture(const Texture&) = delete; -    Texture& operator=(const Texture&) = delete; + +	Texture(Texture && other) noexcept; +	Texture & operator=(Texture && other) noexcept; +	Texture(const Texture &) = delete; +	Texture & operator=(const Texture &) = delete;  	/**  	 * \brief Gets the width of the texture. |