Menu screen prototype, refactor

src/frontend/gui/GUI.cpp

@@ -3,33 +3,35 @@
 #include "panels.h"
 
 #include <iostream>
+#include <algorithm>
 
 #include "../../assets/Assets.h"
 #include "../../graphics/Batch2D.h"
+#include "../../graphics/Shader.h"
 #include "../../window/Events.h"
 #include "../../window/input.h"
+#include "../../window/Camera.h"
 
 using std::shared_ptr;
 using namespace gui;
 
 GUI::GUI() {
     container = new Container(vec2(0, 0), vec2(Window::width, Window::height));
+
+    uicamera = new Camera(vec3(), Window::height);
+	uicamera->perspective = false;
+	uicamera->flipped = true;
 }
 
 GUI::~GUI() {
+    delete uicamera;
     delete container;
 }
 
 void GUI::act(float delta) {
-    for (IntervalEvent& event : intervalEvents) {
-        event.timer += delta;
-        if (event.timer > event.interval) {
-            event.callback();
-            event.timer = fmod(event.timer, event.interval);
-        }
-    }
-
     container->size(vec2(Window::width, Window::height));
+    container->act(delta);
+
     int mx = Events::x;
     int my = Events::y;
 
@@ -77,6 +79,12 @@ void GUI::act(float delta) {
 }
 
 void GUI::draw(Batch2D* batch, Assets* assets) {
+    uicamera->fov = Window::height;
+
+	Shader* uishader = assets->getShader("ui");
+	uishader->use();
+	uishader->uniformMatrix("u_projview", uicamera->getProjection()*uicamera->getView());
+
     batch->begin();
     container->draw(batch, assets);
 }
@@ -93,6 +101,6 @@ void GUI::add(shared_ptr<UINode> panel) {
     container->add(panel);
 }
 
-void GUI::interval(float interval, ontimeout callback) {
-    intervalEvents.push_back({callback, interval, 0.0f});
-}
+void GUI::remove(std::shared_ptr<UINode> panel) {
+    container->remove(panel);
+}

src/frontend/gui/GUI.h

@@ -8,6 +8,7 @@
 
 class Batch2D;
 class Assets;
+class Camera;
 
 /*
  Some info about padding and margin.
@@ -44,19 +45,12 @@ namespace gui {
     class UINode;
     class Container;
 
-    typedef std::function<void()> ontimeout;
-    struct IntervalEvent {
-        ontimeout callback;
-        float interval;
-        float timer;
-    };
-
     class GUI {
         Container* container;
         std::shared_ptr<UINode> hover = nullptr;
         std::shared_ptr<UINode> pressed = nullptr;
         std::shared_ptr<UINode> focus = nullptr;
-        std::vector<IntervalEvent> intervalEvents;
+        Camera* uicamera;
     public:
         GUI();
         ~GUI();
@@ -67,8 +61,7 @@ namespace gui {
         void act(float delta);
         void draw(Batch2D* batch, Assets* assets);
         void add(std::shared_ptr<UINode> panel);
-
-        void interval(float interval, ontimeout callback);
+        void remove(std::shared_ptr<UINode> panel);
     };
 }
 

src/frontend/gui/UINode.h

@@ -35,6 +35,7 @@ namespace gui {
         UINode(glm::vec2 coord, glm::vec2 size);
     public:
         virtual ~UINode();
+        virtual void act(float delta) {};
         virtual void draw(Batch2D* batch, Assets* assets) = 0;
 
         virtual void visible(bool flag);

src/frontend/gui/panels.cpp

@@ -29,6 +29,20 @@ shared_ptr<UINode> Container::getAt(vec2 pos, shared_ptr<UINode> self) {
     return UINode::getAt(pos, self);
 }
 
+void Container::act(float delta) {
+    for (IntervalEvent& event : intervalEvents) {
+        event.timer += delta;
+        if (event.timer > event.interval) {
+            event.callback();
+            event.timer = fmod(event.timer, event.interval);
+        }
+    }
+    for (auto node : nodes) {
+        if (node->visible())
+            node->act(delta);
+    }
+}
+
 void Container::draw(Batch2D* batch, Assets* assets) {
     vec2 coord = calcCoord();
     vec2 size = this->size();
@@ -50,6 +64,18 @@ void Container::add(shared_ptr<UINode> node) {
     refresh();
 }
 
+void Container::remove(shared_ptr<UINode> selected) {
+    selected->setParent(nullptr);
+    nodes.erase(std::remove_if(nodes.begin(), nodes.end(), [selected](const shared_ptr<UINode> node) {
+        return node == selected;
+    }), nodes.end());
+    refresh();
+}
+
+void Container::listenInterval(float interval, ontimeout callback) {
+    intervalEvents.push_back({callback, interval, 0.0f});
+}
+
 Panel::Panel(vec2 size, glm::vec4 padding, float interval, bool resizing)
     : Container(vec2(), size), padding(padding), interval(interval), resizing_(resizing) {
     color_ = vec4(0.0f, 0.0f, 0.0f, 0.75f);

src/frontend/gui/panels.h

@@ -10,18 +10,29 @@ class Batch2D;
 class Assets;
 
 namespace gui {
+    typedef std::function<void()> ontimeout;
+    struct IntervalEvent {
+        ontimeout callback;
+        float interval;
+        float timer;
+    };
+
     enum class Orientation { vertical, horizontal };
 
     class Container : public UINode {
     protected:
         std::vector<std::shared_ptr<UINode>> nodes;
+        std::vector<IntervalEvent> intervalEvents;
     public:
         Container(glm::vec2 coord, glm::vec2 size);
 
+        virtual void act(float delta) override;
         virtual void drawBackground(Batch2D* batch, Assets* assets) {};
-        virtual void draw(Batch2D* batch, Assets* assets);
+        virtual void draw(Batch2D* batch, 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 remove(std::shared_ptr<UINode> node);
+        void listenInterval(float interval, ontimeout callback);
     };
 
     class Panel : public Container {