Added calculateFitTextureSize; refactoring

game/source/VaKon2D.cpp

@@ -40,6 +40,7 @@
 #include "ShaderPack.h"
 #include "TextBox.h"
 #include "UtilsFunctions.h"
+#include "Rect.h"
 
 #include <iostream>
 
@@ -53,13 +54,16 @@ void VaKon2D::start() {
     shaderPack.loadShaders("widget", "assets/shaders/widget.vert", "assets/shaders/widget.frag");
 
     Texture texture(Gl::Texture::Target::Texture2D, true, true);
-    Image image("assets/textures/apple.png");
+    Image image("assets/textures/clock.png");
     image.setInternalChannel(Gl::Texture::Channel::SRGBA);
     texture.setImage(image);
     texture.setMagAndMinFilter(Gl::Texture::MagFilter::Linear, Gl::Texture::MinFilter::LinearMipmapLinear);
+
     Widget widget;
     widget.setTexture(texture);
-    widget.prepare(shaderPack);
+    widget.calculateFitTextureSize();
+    widget.setTextureRect(Utils::IRect{{320, 0},
+                                       {32,  32}});
 
     while (!GetWindow().shouldClose()) {
         GetWindow().clearColor({0.2f, 0.3f, 0.3f});

lib/core/shapes/include/Widget.h

@@ -89,6 +89,10 @@ class Widget : public DrawAble, public JsonPrintable, public Updateable, public
 
     _NODISCARD boost::property_tree::ptree toJson() const override;
 
+    void setTextureRect(const Utils::Rect<int> &rect);
+
+    void calculateFitTextureSize();
+
 private:
     // clang-format off
     inline static const std::vector<float> templateVertices_ = {
@@ -98,6 +102,7 @@ class Widget : public DrawAble, public JsonPrintable, public Updateable, public
             1.f, -1.f, 1.f, 0.f,
     };
     // clang-format on
+    Utils::IRect textureRect_;
     Texture *texture_{};
     Vbo vbo_;
     Vao vao_;

lib/core/shapes/source/Widget.cpp

@@ -43,7 +43,11 @@ Widget::~Widget() {
 
 void Widget::draw(ShaderPack &shaderPack) {
     if (!isPrepared) {
-        throw std::runtime_error("The widget is not prepared. Use Widget::prepare before Widget::draw to resolve it.");
+        prepare(shaderPack);
+        if (!isPrepared) {
+            throw std::runtime_error(
+                    "The widget is not prepared. Use Widget::prepare before Widget::draw to resolve it.");
+        }
     }
 
     auto &shaderProgram = shaderPack["widget"];
@@ -233,6 +237,7 @@ Widget::Widget(Widget &&other) noexcept {
 Widget &Widget::operator=(Widget &&other) noexcept {
     isPrepared = false;
 
+    textureRect_ = other.textureRect_;
     texture_ = other.texture_;
     vbo_ = other.vbo_;
     vao_ = other.vao_;
@@ -242,6 +247,7 @@ Widget &Widget::operator=(Widget &&other) noexcept {
     wasHover_ = other.wasHover_;
     isPrepared = other.isPrepared;
 
+    other.textureRect_ = {};
     other.isPrepared = false;
     other.texture_ = {};
     other.vbo_ = {};
@@ -254,3 +260,15 @@ Widget &Widget::operator=(Widget &&other) noexcept {
 
     return *this;
 }
+
+void Widget::setTextureRect(const Utils::Rect<int> &rect) {
+    textureRect_ = rect;
+}
+
+void Widget::calculateFitTextureSize() {
+    if (texture_ && texture_->getImage()) {
+        auto size = texture_->getImage()->getSize();
+        size_.width = size.x;
+        size_.height = size.y;
+    }
+}