diff options
Diffstat (limited to 'src/crepe/api')
| -rw-r--r-- | src/crepe/api/Sprite.cpp | 4 | ||||
| -rw-r--r-- | src/crepe/api/Texture.cpp | 11 | ||||
| -rw-r--r-- | src/crepe/api/Texture.h | 13 | 
3 files changed, 10 insertions, 18 deletions
| diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp index 8647794..0a2ad4c 100644 --- a/src/crepe/api/Sprite.cpp +++ b/src/crepe/api/Sprite.cpp @@ -22,8 +22,8 @@ Sprite::Sprite(game_object_id_t id, Texture & image, const Color & color,  	dbg_trace(); -	this->mask.w = sprite_image.get_width(); -	this->mask.h = sprite_image.get_height(); +	this->mask.w = sprite_image.get_size().x; +	this->mask.h = sprite_image.get_size().y;  	this->aspect_ratio = static_cast<double>(this->mask.w) / this->mask.h;  } diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp index e43bdaa..2b56271 100644 --- a/src/crepe/api/Texture.cpp +++ b/src/crepe/api/Texture.cpp @@ -3,6 +3,7 @@  #include "Asset.h"  #include "Texture.h" +#include "types.h"  using namespace crepe;  using namespace std; @@ -31,11 +32,7 @@ void Texture::load(const Asset & res) {  	this->texture = ctx.texture_from_path(res.get_path());  } -int Texture::get_width() const { -	if (this->texture == nullptr) return 0; -	return SDLContext::get_instance().get_width(*this); -} -int Texture::get_height() const { -	if (this->texture == nullptr) return 0; -	return SDLContext::get_instance().get_height(*this); +ivec2 Texture::get_size() const { +	if (this->texture == nullptr) return {}; +	return SDLContext::get_instance().get_size(*this);  } diff --git a/src/crepe/api/Texture.h b/src/crepe/api/Texture.h index 7206a66..1817910 100644 --- a/src/crepe/api/Texture.h +++ b/src/crepe/api/Texture.h @@ -8,6 +8,7 @@  #include <memory>  #include "Asset.h" +#include "types.h"  namespace crepe { @@ -42,16 +43,10 @@ public:  	Texture & operator=(const Texture &) = delete;  	/** -	 * \brief Gets the width of the texture. -	 * \return Width of the texture in pixels. +	 * \brief Gets the width and height of the texture. +	 * \return Width and height of the texture in pixels.  	 */ -	int get_width() const; - -	/** -	 * \brief Gets the height of the texture. -	 * \return Height of the texture in pixels. -	 */ -	int get_height() const; +	ivec2 get_size() const;  private:  	/** |