GfxContext renamed to DrawContext

src/graphics/ui/GUI.cpp

@@ -9,7 +9,7 @@
 #include "../../frontend/UiDocument.h"
 #include "../../graphics/core/Batch2D.hpp"
 #include "../../graphics/core/Shader.hpp"
-#include "../../graphics/core/GfxContext.hpp"
+#include "../../graphics/core/DrawContext.hpp"
 #include "../../window/Events.h"
 #include "../../window/input.h"
 #include "../../window/Camera.h"
@@ -136,7 +136,7 @@ void GUI::act(float delta, const Viewport& vp) {
     }
 }
 
-void GUI::draw(const GfxContext* pctx, Assets* assets) {
+void GUI::draw(const DrawContext* pctx, Assets* assets) {
     auto& viewport = pctx->getViewport();
     glm::vec2 wsize = viewport.size();
 

src/graphics/ui/GUI.hpp

@@ -11,7 +11,7 @@
 #include <unordered_map>
 
 class Viewport;
-class GfxContext;
+class DrawContext;
 class Assets;
 class Camera;
 
@@ -86,7 +86,7 @@ namespace gui {
         /// @brief Draw all visible elements on main container 
         /// @param pctx parent graphics context
         /// @param assets active assets storage
-        void draw(const GfxContext* pctx, Assets* assets);
+        void draw(const DrawContext* pctx, Assets* assets);
 
         /// @brief Add element to the main container
         /// @param node UI element

src/graphics/ui/elements/Button.cpp

@@ -1,7 +1,7 @@
 #include "Button.hpp"
 
 #include "Label.hpp"
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../core/Batch2D.hpp"
 
 using namespace gui;
@@ -75,7 +75,7 @@ void Button::refresh() {
     }
 }
 
-void Button::drawBackground(const GfxContext* pctx, Assets* assets) {
+void Button::drawBackground(const DrawContext* pctx, Assets* assets) {
     glm::vec2 pos = calcPos();
     auto batch = pctx->getBatch2D();
     batch->texture(nullptr);

src/graphics/ui/elements/Button.hpp

@@ -18,7 +18,7 @@ namespace gui {
                onaction action,
                glm::vec2 size=glm::vec2(-1));
 
-        virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
+        virtual void drawBackground(const DrawContext* pctx, Assets* assets) override;
 
         virtual Align getTextAlign() const;
         virtual void setTextAlign(Align align);

src/graphics/ui/elements/CheckBox.cpp

@@ -1,6 +1,6 @@
 #include "CheckBox.hpp"
 
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../core/Batch2D.hpp"
 #include "Label.hpp"
 
@@ -10,7 +10,7 @@ CheckBox::CheckBox(bool checked) : UINode(glm::vec2(32.0f)), checked(checked) {
     setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.5f));
 }
 
-void CheckBox::draw(const GfxContext* pctx, Assets* assets) {
+void CheckBox::draw(const DrawContext* pctx, Assets* assets) {
     if (supplier) {
         checked = supplier();
     }

src/graphics/ui/elements/CheckBox.hpp

@@ -14,7 +14,7 @@ namespace gui {
     public:
         CheckBox(bool checked=false);
 
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+        virtual void draw(const DrawContext* pctx, Assets* assets) override;
 
         virtual void mouseRelease(GUI*, int x, int y) override;
 

src/graphics/ui/elements/Container.cpp

@@ -1,6 +1,6 @@
 #include "Container.hpp"
 
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../core/Batch2D.hpp"
 
 using namespace gui;
@@ -73,7 +73,7 @@ void Container::setScrollable(bool flag) {
     scrollable = flag;
 }
 
-void Container::draw(const GfxContext* pctx, Assets* assets) {
+void Container::draw(const DrawContext* pctx, Assets* assets) {
     glm::vec2 pos = calcPos();
     glm::vec2 size = getSize();
     drawBackground(pctx, assets);
@@ -82,7 +82,7 @@ void Container::draw(const GfxContext* pctx, Assets* assets) {
     batch->texture(nullptr);
     batch->flush();
     {
-        GfxContext ctx = pctx->sub();
+        DrawContext ctx = pctx->sub();
         ctx.setScissors(glm::vec4(pos.x, pos.y, size.x, size.y));
         for (auto node : nodes) {
             if (node->isVisible())
@@ -91,7 +91,7 @@ void Container::draw(const GfxContext* pctx, Assets* assets) {
     }
 }
 
-void Container::drawBackground(const GfxContext* pctx, Assets* assets) {
+void Container::drawBackground(const DrawContext* pctx, Assets* assets) {
     glm::vec4 color = isPressed() ? pressedColor : (hover ? hoverColor : this->color);
     if (color.a <= 0.001f)
         return;

src/graphics/ui/elements/Container.hpp

@@ -19,8 +19,8 @@ namespace gui {
         Container(glm::vec2 size);
 
         virtual void act(float delta) override;
-        virtual void drawBackground(const GfxContext* pctx, Assets* assets);
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+        virtual void drawBackground(const DrawContext* pctx, Assets* assets);
+        virtual void draw(const DrawContext* pctx, Assets* assets) override;
         virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override;
         virtual void add(std::shared_ptr<UINode> node);
         virtual void add(std::shared_ptr<UINode> node, glm::vec2 pos);

src/graphics/ui/elements/Image.cpp

@@ -1,6 +1,6 @@
 #include "Image.hpp"
 
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../core/Batch2D.hpp"
 #include "../../core/Texture.hpp"
 #include "../../../assets/Assets.h"
@@ -12,7 +12,7 @@ Image::Image(std::string texture, glm::vec2 size) : UINode(size), texture(textur
     setInteractive(false);
 }
 
-void Image::draw(const GfxContext* pctx, Assets* assets) {
+void Image::draw(const DrawContext* pctx, Assets* assets) {
     glm::vec2 pos = calcPos();
     glm::vec4 color = getColor();
     auto batch = pctx->getBatch2D();

src/graphics/ui/elements/Image.hpp

@@ -11,7 +11,7 @@ namespace gui {
     public:
         Image(std::string texture, glm::vec2 size=glm::vec2(32,32));
 
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+        virtual void draw(const DrawContext* pctx, Assets* assets) override;
 
         virtual void setAutoResize(bool flag);
         virtual bool isAutoResize() const;

src/graphics/ui/elements/InputBindBox.cpp

@@ -1,7 +1,7 @@
 #include "InputBindBox.hpp"
 
 #include "Label.hpp"
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../core/Batch2D.hpp"
 #include "../../../util/stringutil.h"
 
@@ -15,7 +15,7 @@ InputBindBox::InputBindBox(Binding& binding, glm::vec4 padding)
     setScrollable(false);
 }
 
-void InputBindBox::drawBackground(const GfxContext* pctx, Assets* assets) {
+void InputBindBox::drawBackground(const DrawContext* pctx, Assets* assets) {
     glm::vec2 pos = calcPos();
     auto batch = pctx->getBatch2D();
     batch->texture(nullptr);

src/graphics/ui/elements/InputBindBox.hpp

@@ -14,7 +14,7 @@ namespace gui {
         Binding& binding;
     public:
         InputBindBox(Binding& binding, glm::vec4 padding=glm::vec4(6.0f));
-        virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
+        virtual void drawBackground(const DrawContext* pctx, Assets* assets) override;
 
         virtual void clicked(GUI*, mousecode button) override;
         virtual void keyPressed(keycode key) override;

src/graphics/ui/elements/InventoryView.cpp

@@ -17,7 +17,7 @@
 #include "../../core/Atlas.hpp"
 #include "../../core/Batch2D.hpp"
 #include "../../core/Font.hpp"
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../core/Shader.hpp"
 #include "../../render/BlocksPreview.hpp"
 #include "../GUI.hpp"
@@ -110,7 +110,7 @@ SlotView::SlotView(
     setColor(glm::vec4(0, 0, 0, 0.2f));
 }
 
-void SlotView::draw(const GfxContext* pctx, Assets* assets) {
+void SlotView::draw(const DrawContext* pctx, Assets* assets) {
     if (bound == nullptr)
         return;
 

src/graphics/ui/elements/InventoryView.hpp

@@ -11,7 +11,7 @@
 #include <glm/glm.hpp>
 
 class Assets;
-class GfxContext;
+class DrawContext;
 class Content;
 class ItemStack;
 class ContentIndices;
@@ -56,7 +56,7 @@ namespace gui {
     public:
         SlotView(SlotLayout layout);
 
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+        virtual void draw(const DrawContext* pctx, Assets* assets) override;
 
         void setHighlighted(bool flag);
         bool isHighlighted() const;

src/graphics/ui/elements/Label.cpp

@@ -1,5 +1,5 @@
 #include "Label.hpp"
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../core/Batch2D.hpp"
 #include "../../core/Font.hpp"
 #include "../../../assets/Assets.h"
@@ -137,7 +137,7 @@ uint Label::getLinesNumber() const {
     return cache.lines.size();
 }
 
-void Label::draw(const GfxContext* pctx, Assets* assets) {
+void Label::draw(const DrawContext* pctx, Assets* assets) {
     auto batch = pctx->getBatch2D();
     auto font = assets->getFont(fontName);
     cache.prepare(font, static_cast<size_t>(glm::abs(getSize().x)));

src/graphics/ui/elements/Label.hpp

@@ -91,7 +91,7 @@ namespace gui {
         virtual uint getLinesNumber() const;
         virtual bool isFakeLine(size_t line) const;
 
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+        virtual void draw(const DrawContext* pctx, Assets* assets) override;
 
         virtual void textSupplier(wstringsupplier supplier);
 

src/graphics/ui/elements/Plotter.cpp

@@ -2,7 +2,7 @@
 
 #include "../../core/Batch2D.hpp"
 #include "../../core/Font.hpp"
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../../assets/Assets.h"
 #include "../../../util/stringutil.h"
 
@@ -14,7 +14,7 @@ void Plotter::act(float delta) {
     points[index % dmwidth] = std::min(value, dmheight);
 }
 
-void Plotter::draw(const GfxContext* pctx, Assets* assets) {
+void Plotter::draw(const DrawContext* pctx, Assets* assets) {
     glm::vec2 pos = calcPos();
     auto batch = pctx->getBatch2D();
     batch->texture(nullptr);

src/graphics/ui/elements/Plotter.hpp

@@ -8,7 +8,7 @@
 #include <glm/glm.hpp>
 
 class Assets;
-class GfxContext;
+class DrawContext;
 
 namespace gui {
     class Plotter : public gui::UINode {
@@ -30,7 +30,7 @@ namespace gui {
         }
 
         void act(float delta) override;
-        void draw(const GfxContext* pctx, Assets* assets) override;
+        void draw(const DrawContext* pctx, Assets* assets) override;
     };
 }
 

src/graphics/ui/elements/TextBox.cpp

@@ -1,7 +1,7 @@
 #include "TextBox.hpp"
 
 #include "Label.hpp"
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../core/Batch2D.hpp"
 #include "../../core/Font.hpp"
 #include "../../../assets/Assets.h"
@@ -22,7 +22,7 @@ TextBox::TextBox(std::wstring placeholder, glm::vec4 padding)
     textInitX = label->getPos().x;
 }
 
-void TextBox::draw(const GfxContext* pctx, Assets* assets) {
+void TextBox::draw(const DrawContext* pctx, Assets* assets) {
     Panel::draw(pctx, assets);
 
     font = assets->getFont(label->getFontName());
@@ -71,7 +71,7 @@ void TextBox::draw(const GfxContext* pctx, Assets* assets) {
     }
 }
 
-void TextBox::drawBackground(const GfxContext* pctx, Assets* assets) {
+void TextBox::drawBackground(const DrawContext* pctx, Assets* assets) {
     glm::vec2 pos = calcPos();
 
     auto batch = pctx->getBatch2D();

src/graphics/ui/elements/TextBox.hpp

@@ -144,8 +144,8 @@ namespace gui {
         virtual void click(GUI*, int, int) override;
         virtual void mouseMove(GUI*, int x, int y) override;
         virtual bool isFocuskeeper() const override {return true;}
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
-        virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
+        virtual void draw(const DrawContext* pctx, Assets* assets) override;
+        virtual void drawBackground(const DrawContext* pctx, Assets* assets) override;
         virtual void typed(unsigned int codepoint) override; 
         virtual void keyPressed(keycode key) override;
         virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override;

src/graphics/ui/elements/TrackBar.cpp

@@ -1,6 +1,6 @@
 #include "TrackBar.hpp"
 
-#include "../../core/GfxContext.hpp"
+#include "../../core/DrawContext.hpp"
 #include "../../core/Batch2D.hpp"
 #include "../../../assets/Assets.h"
 
@@ -23,7 +23,7 @@ TrackBar::TrackBar(
     setHoverColor(glm::vec4(0.01f, 0.02f, 0.03f, 0.5f));
 }
 
-void TrackBar::draw(const GfxContext* pctx, Assets* assets) {
+void TrackBar::draw(const DrawContext* pctx, Assets* assets) {
     if (supplier) {
         value = supplier();
     }

src/graphics/ui/elements/TrackBar.hpp

@@ -20,7 +20,7 @@ namespace gui {
                  double value, 
                  double step=1.0, 
                  int trackWidth=12);
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+        virtual void draw(const DrawContext* pctx, Assets* assets) override;
 
         virtual void setSupplier(doublesupplier supplier);
         virtual void setConsumer(doubleconsumer consumer);

src/graphics/ui/elements/UINode.hpp

@@ -10,7 +10,7 @@
 #include "../../../delegates.h"
 #include "../../../window/input.h"
 
-class GfxContext;
+class DrawContext;
 class Assets;
 
 namespace gui {
@@ -90,7 +90,7 @@ namespace gui {
         /// @brief Called every frame for all visible elements 
         /// @param delta delta timУ
         virtual void act(float delta) {};
-        virtual void draw(const GfxContext* pctx, Assets* assets) = 0;
+        virtual void draw(const DrawContext* pctx, Assets* assets) = 0;
 
         virtual void setVisible(bool flag);
         bool isVisible() const;