Updating window structure

Reworking global objects in project
Clearing unused

Author: kolyaka32

img/GUI/type_box.png

@@ -18,39 +18,50 @@ namespace GUI {
     };
 
 
-    // Graphic user interface template for other objects
+    // Object, that will be drawn at screen
     class Template {
+     protected:
+        const Window& window;
+
+     public:
+        Template(const Window& window);
+        virtual void blit() const;
+    };
+
+
+    // Object with texture, that will be drawn
+    class TextureTemplate : public Template {
      protected:
         SDL_Texture* texture;
         SDL_FRect rect;
 
      public:
-        Template();
-        virtual void blit() const;
+        TextureTemplate(const Window& window);
+        void blit() const override;
         bool in(const Mouse mouse) const;
     };
 
 
     // Static text on screen
-    class StaticText : public Template {
+    class StaticText : public TextureTemplate {
      public:
-        StaticText(float X, float Y, const LanguagedText texts,
+        StaticText(const Window& window, float X, float Y, const LanguagedText texts,
             float size, Color color = WHITE, Aligment aligment = Aligment::Midle);
         ~StaticText();
     };
 
 
     // Static text on screen
-    class HighlightedStaticText : public Template {
+    class HighlightedStaticText : public TextureTemplate {
      public:
-        HighlightedStaticText(float X, float Y, const LanguagedText texts,
+        HighlightedStaticText(const Window& window, float X, float Y, const LanguagedText texts,
             int frameThickness, float size, Color color = WHITE, Aligment aligment = Aligment::Midle);
         ~HighlightedStaticText();
     };
 
 
     // Dynamicly updated text on screen
-    class DynamicText : public Template {
+    class DynamicText : public TextureTemplate {
      private:
         const LanguagedText texts;  // Text to create from
         const float posX;           // Relative positions on screen
@@ -59,7 +70,7 @@ namespace GUI {
         const float height;         // Height of text to draw
 
      public:
-        DynamicText(float X, float Y, const LanguagedText texts,
+        DynamicText(const Window& window, float X, float Y, const LanguagedText texts,
             float size = 20, Color color = WHITE, Aligment aligment = Aligment::Midle);
         ~DynamicText();
         template <typename ...Args>
@@ -80,39 +91,50 @@ namespace GUI {
 
 
     // Class of slider bar with point on it to control need parameter
-    class Slider : public Template {
+    class Slider : public TextureTemplate {
      private:
         SDL_Texture *textureButton;  // Texture of line (upper part of slider)
         SDL_FRect buttonRect;        // Place for rendering upper part
         const unsigned maxValue;     // Maximal value of state
 
      public:
         // Create slide with need line and button images
-        Slider(float X, float Y, float width, unsigned startValue, Textures lineImage = Textures::SliderLine,
-            Textures buttonImage = Textures::SliderButton, unsigned max = 255);
+        Slider(const Window& window, float X, float Y, float width, unsigned startValue,
+            Textures lineImage = Textures::SliderLine, Textures buttonImage = Textures::SliderButton, unsigned max = 255);
         unsigned setValue(float mouseX);  // Setting new state from mouse position
         unsigned scroll(float wheelY);    // Checking mouse wheel action
         void blit() const override;       // Drawing slider with need button position
     };
 
 
     // Class of buttons with image on it
-    class ImageButton : public Template {
+    class ImageButton : public TextureTemplate {
      public:
-        ImageButton(float X, float Y, float width, Textures name);
+        ImageButton(const Window& window, float X, float Y, float width, Textures name);
+    };
+
+
+    // Class of backplate for better understability
+    class Backplate : public TextureTemplate {
+     public:
+        Backplate(const Window& window, float centerX, float centerY, float width, float height,
+            float radius, float border, Color frontColor = GREY, Color backColor = BLACK);
+        Backplate(const Window& window, const SDL_FRect& rect, float radius, float border,
+            Color frontColor = GREY, Color backColor = BLACK);
+        ~Backplate();
     };
 
 
     // GIF-animations
     #if ANI_count
-    class GIFAnimation : public Template {
+    class GIFAnimation : public TextureTemplate {
      private:
         const Uint8 type;
         Uint64 prevTick;
         const SDL_FRect dest;
 
      public:
-        GIFAnimation(SDL_Rect destination, ANI_names type);
+        GIFAnimation(const Window& window, SDL_Rect destination, ANI_names type);
         ~GIFAnimation();
         void blit() const;
     };
@@ -121,14 +143,12 @@ namespace GUI {
 
     // Class of field, where user can type text
     template <unsigned bufferSize = 16>
-    class TypeField {
+    class TypeField : public TextureTemplate {
      protected:
         // Class constants
         const int posX;                    // Relevant x position on screen
         const Aligment aligment;           // Aligment type for correct placed position
         const Color textColor;             // Color of typing text
-        SDL_Texture* backTexture;          // Texture of backplate
-        const SDL_FRect backRect;          // Rect of backplate
         TTF_Font* font;                    // Font for type text
 
         // Variables
@@ -142,8 +162,6 @@ namespace GUI {
         char clipboardText[bufferSize+1];  // Copying string for clipboard use
         bool pressed = false;              //
         bool selected = false;             //
-        SDL_Texture* textTexture;          // Texture of text
-        SDL_FRect textRect;                // Rect of text
 
         void select(float _mouseX);        // Select last letter to create writing symbol
         void updateTexture();              // Creat new texture and update it position
@@ -152,8 +170,8 @@ namespace GUI {
         void copyToClipboard();            // Writing selected text to clipboard
 
      public:
-        TypeField(float posX, float posY, float height, const char *startText = "",
-            Aligment aligment = Aligment::Midle, Color textColor = BLACK);
+        TypeField(const Window& window, float posX, float posY, float height,
+            const char *startText = "", Aligment aligment = Aligment::Midle, Color textColor = BLACK);
         ~TypeField();                        // Clearing font and texture
         void writeString(const char* str);   // Function of writing any string to buffer at caret position
         void type(SDL_Keycode code);         // Function of processing special keycodes
@@ -162,18 +180,24 @@ namespace GUI {
         void unclick();                      // Function of resetting pressing
         const char* getString();             // Function of getting typed string
         void setString(const char* string);  // Function for replace text with new string
-        void blit() const;                   // Function for draw at screen
+        void blit() const override;          // Function for draw at screen
         bool in(const Mouse mouse) const;    // Function of checking pressing
     };
 
-    // Class of backplate for
-    class Backplate : public Template {
+
+    // Object for typying in text with backplate for visability
+    template <unsigned bufferSize = 16>
+    class TypeBox : public TypeField<bufferSize> {
+     private:
+        // Backplate part
+        SDL_Texture* backTexture;  // Texture of backplate
+        const SDL_FRect backRect;  // Rect of backplate
+
      public:
-        Backplate(float centerX, float centerY, float width, float height, float radius, float border,
-            Color frontColor = GREY, Color backColor = BLACK);
-        Backplate(const SDL_FRect& rect, float radius, float border, Color frontColor = GREY,
-            Color backColor = BLACK);
-        ~Backplate();
+        TypeBox(const Window& window, float posX, float posY, float height, const char *startText = "",
+            Aligment aligment = Aligment::Midle, unsigned frameWidth = 2, Color textColor = BLACK);
+        ~TypeBox();
+        void blit() const override;  // Function for draw inputting text with backplate
     };
 
 
@@ -183,7 +207,7 @@ namespace GUI {
         const Backplate backplate;
 
      public:
-        TextButton(float X, float Y, const LanguagedText texts, float size,
+        TextButton(const Window& window, float X, float Y, const LanguagedText texts, float size,
             Color color = WHITE, Aligment aligment = Aligment::Midle);
         void blit() const override;
     };
@@ -196,7 +220,7 @@ namespace GUI {
         static const unsigned maxCounter = 100;
 
      public:
-        InfoBox(float X, float Y, const LanguagedText texts,
+        InfoBox(const Window& window, float X, float Y, const LanguagedText texts,
             float size, Color color = WHITE, Aligment aligment = Aligment::Midle);
         void update();
         void reset();

src/GUI/baseGUI.hpp

@@ -7,9 +7,10 @@
 #include "baseGUI.hpp"
 
 
-GUI::DynamicText::DynamicText(float _X, float _Y,
+GUI::DynamicText::DynamicText(const Window& _window, float _X, float _Y,
     const LanguagedText _texts, float _height, Color _color, Aligment _aligment)
-: posX(_X),
+: TextureTemplate(_window),
+posX(_X),
 aligment(_aligment),
 color(_color),
 texts(_texts),

src/GUI/dynamicText.cpp

@@ -6,8 +6,9 @@
 #include "baseGUI.hpp"
 
 
-GUI::HighlightedStaticText::HighlightedStaticText(float _X, float _Y,
-    const LanguagedText _texts, int frame, float _height, Color _color, Aligment _aligment) {
+GUI::HighlightedStaticText::HighlightedStaticText(const Window& _window, float _X, float _Y,
+    const LanguagedText _texts, int frame, float _height, Color _color, Aligment _aligment)
+: TextureTemplate(_window) {
     // Creating texture of text
     TTF_Font* font = window.getFont(Fonts::Main);
     TTF_SetFontSize(font, _height);

src/GUI/highlightedStaticText.cpp

@@ -6,7 +6,8 @@
 #include "baseGUI.hpp"
 
 
-GUI::ImageButton::ImageButton(float _X, float _Y, float _width, Textures _index) {
+GUI::ImageButton::ImageButton(const Window& _window, float _X, float _Y, float _width, Textures _index)
+: TextureTemplate(_window) {
     // Setting base texture
     texture = window.getTexture(_index);
 

src/GUI/imageButton.cpp

@@ -6,9 +6,9 @@
 #include "baseGUI.hpp"
 
 
-GUI::InfoBox::InfoBox(float _X, float _Y, const LanguagedText texts,
+GUI::InfoBox::InfoBox(const Window& _window, float _X, float _Y, const LanguagedText texts,
     float _size, Color _color, Aligment _aligment)
-: HighlightedStaticText(_X, _Y, texts, 2, _size, _color, _aligment) {
+: HighlightedStaticText(_window, _X, _Y, texts, 2, _size, _color, _aligment) {
     // Resetting transperance
     SDL_SetTextureAlphaMod(texture, 0);
 }

src/GUI/infoBox.cpp

@@ -9,8 +9,4 @@
 #include <string>
 #include "baseGUI.hpp"
 #include "typeField.cpp"
-
-// Making sure, that important files included
-#include "../define.hpp"
-#include "../testing.hpp"
-#include "../data/macroses.hpp"
+#include "typeBox.cpp"

src/GUI/interface.hpp

@@ -7,13 +7,14 @@
 
 
 // Class of backplates (smoothed rects)
-GUI::Backplate::Backplate(float _centerX, float _centerY, float _width, float _height,
+GUI::Backplate::Backplate(const Window& _window, float _centerX, float _centerY, float _width, float _height,
     float _rad, float _bor, Color _frontColor, Color _backColor)
-: Backplate({window.getWidth() * (_centerX - _width/2), window.getHeight() * (_centerY - _height/2),
-    window.getWidth() * _width, window.getHeight() * _height}, _rad, _bor, _frontColor, _backColor) {}
+: Backplate(_window, {_window.getWidth() * (_centerX - _width/2), _window.getHeight() * (_centerY - _height/2),
+    _window.getWidth() * _width, _window.getHeight() * _height}, _rad, _bor, _frontColor, _backColor) {}
 
 
-GUI::Backplate::Backplate(const SDL_FRect& _rect, float _rad, float _bor, Color _frontColor, Color _backColor) {
+GUI::Backplate::Backplate(const Window& _window, const SDL_FRect& _rect, float _rad, float _bor, Color _frontColor, Color _backColor)
+: TextureTemplate(_window) {
     // Creating new texture for drawing
     texture = window.createTexture(_rect.w, _rect.h);
     rect = _rect;

src/GUI/roundedBackplate.cpp

@@ -6,10 +6,10 @@
 #include "baseGUI.hpp"
 
 
-// Slider class
-GUI::Slider::Slider(float _X, float _Y, float _width, unsigned _startValue,
+GUI::Slider::Slider(const Window& _window, float _X, float _Y, float _width, unsigned _startValue,
     Textures _lineImage, Textures _buttonImage, unsigned _max)
-: maxValue(_max) {
+: TextureTemplate(_window),
+maxValue(_max) {
     // Getting need texture
     texture = window.getTexture(_lineImage);
     textureButton = window.getTexture(_buttonImage);

src/GUI/slider.cpp

@@ -7,8 +7,9 @@
 
 
 // Class of static text
-GUI::StaticText::StaticText(float _X, float _Y, const LanguagedText _texts,
-    float _height, Color _color, Aligment _aligment) {
+GUI::StaticText::StaticText(const Window& _window, float _X, float _Y,
+const LanguagedText _texts, float _height, Color _color, Aligment _aligment)
+: TextureTemplate(_window) {
     // Creating texture of text
     texture = window.createTexture(Fonts::Main, _height, _texts.getString().c_str(), 0, _color);