Refactor Widget loading.

2021-07-08 21:34:18 +02:00
parent be4e63046a
commit 5385b7ede7
15 changed files with 176 additions and 131 deletions
--- a/src/Menu.cpp
+++ b/src/Menu.cpp
@@ -14,7 +14,12 @@ Menu::Menu(FrameBuffer *p_framebuffer, ShaderProgram *p_shaderProgram)
    : m_frameBuffer(p_framebuffer), m_shaderProgram(p_shaderProgram)
 {
    JsonParser screenParser("data/screens.json");
-    m_screens = screenParser.getScreens(m_shaderProgram, m_frameBuffer);
+    std::vector<Screen::Prototype> screenPrototypes = screenParser.getScreenPrototypes();
+
+    for (auto &prototype : screenPrototypes) {
+        auto currentScreen = new Screen(prototype, p_framebuffer, p_shaderProgram);
+        m_screens.push_back(currentScreen);
+    }
 }

 Menu::~Menu()