diff --git a/ewol/compositing/Image.cpp b/ewol/compositing/Image.cpp index b9e6bc05..88ca73cf 100644 --- a/ewol/compositing/Image.cpp +++ b/ewol/compositing/Image.cpp @@ -12,7 +12,9 @@ #undef __class__ #define __class__ "ewol::compositing::Image" -ewol::compositing::Image::Image(const std::string& _imageName, bool _df) : +ewol::compositing::Image::Image(const std::string& _imageName, + bool _df, + int32_t _size) : m_filename(_imageName), m_requestSize(2,2), m_position(0.0, 0.0, 0.0), @@ -30,7 +32,7 @@ ewol::compositing::Image::Image(const std::string& _imageName, bool _df) : m_distanceFieldMode(_df), m_resource(nullptr), m_resourceDF(nullptr) { - setSource(_imageName); + setSource(_imageName, _size); loadProgram(); } diff --git a/ewol/compositing/Image.h b/ewol/compositing/Image.h index af844d5e..908ab5c5 100644 --- a/ewol/compositing/Image.h +++ b/ewol/compositing/Image.h @@ -52,8 +52,11 @@ namespace ewol { * @brief generic constructor * @param[in] _imageName Name of the file that might be loaded * @param[in] _df enable distance field mode + * @param[in] _size for the image when Verctorial image loading is requested */ - Image(const std::string& _imageName="", bool _df = false); + Image(const std::string& _imageName="", + bool _df=false, + int32_t _size=32); /** * @brief generic destructor */ diff --git a/ewol/compositing/Sprite.cpp b/ewol/compositing/Sprite.cpp index 0b95e834..eeab9fe5 100644 --- a/ewol/compositing/Sprite.cpp +++ b/ewol/compositing/Sprite.cpp @@ -12,8 +12,8 @@ #undef __class__ #define __class__ "ewol::compositing::Sprite" -ewol::compositing::Sprite::Sprite(const std::string& _imageName, const ivec2& _nbSprite) : - ewol::compositing::Image(_imageName), +ewol::compositing::Sprite::Sprite(const std::string& _imageName, const ivec2& _nbSprite, int32_t _size) : + ewol::compositing::Image(_imageName, false, _size), m_nbSprite(_nbSprite), m_unitarySpriteSize(0,0) { /* diff --git a/ewol/compositing/Sprite.h b/ewol/compositing/Sprite.h index 363b56cb..44da17d2 100644 --- a/ewol/compositing/Sprite.h +++ b/ewol/compositing/Sprite.h @@ -19,7 +19,9 @@ namespace ewol { ivec2 m_nbSprite; //!< number of sprite in vertical and horizontal vec2 m_unitarySpriteSize; //!< size of a unique sprite public: - Sprite(const std::string& _imageName, const ivec2& _nbSprite); + Sprite(const std::string& _imageName, + const ivec2& _nbSprite, + int32_t _size=32); virtual ~Sprite() {}; void printSprite(const ivec2& _spriteID, const vec2& _size) { printSprite(_spriteID, vec3(_size.x(), _size.y(),0)); }; void printSprite(const ivec2& _spriteID, const vec3& _size);