Rearranging structure

src/Application/Editor/Editor.cc

@@ -20,10 +20,14 @@ void Editor::UpdateScreen() {
     return;
   }
   DrawYazeMenu();
+
   if (ImGui::BeginTabBar("##TabBar")) {
     DrawOverworldEditor();
     ImGui::EndTabBar();
   }
+
+  ImGui::ShowDemoWindow();
+
   ImGui::End();
 }
 

src/Application/Editor/Editor.h

@@ -3,6 +3,7 @@
 
 #include <memory>
 
+#include "Data/Overworld.h"
 #include "ImGuiFileDialog/ImGuiFileDialog.h"
 #include "Utils/ROM.h"
 #include "imgui/backends/imgui_impl_sdl.h"
@@ -26,6 +27,7 @@ class Editor {
 
   void DrawOverworldEditor();
 
+  Data::Overworld overworld;
   Utils::ROM rom;
 };
 

src/Application/Graphics/Bitmap.h

@@ -1,9 +1,6 @@
 #ifndef YAZE_APPLICATION_UTILS_BITMAP_H
 #define YAZE_APPLICATION_UTILS_BITMAP_H
 
-#include <GL/gl.h>
-#include <GL/glu.h>
-
 namespace yaze {
 namespace Application {
 namespace Utils {
@@ -11,7 +8,6 @@ class Bitmap {
 
   
 };
-
 }  // namespace Utils
 }  // namespace Application
 }  // namespace yaze

src/Application/View/Debug.cc

@@ -1,29 +0,0 @@
-#include "Debug.h"
-
-namespace yaze {
-namespace Application {
-namespace View {
-
-void Debug::UpdateScreen() const
-{
-  const ImGuiIO& io = ImGui::GetIO();
-  ImGui::NewFrame();
-  ImGui::SetNextWindowPos(ImVec2(0, 0));
-  ImVec2 dimensions(io.DisplaySize.x, io.DisplaySize.y);
-  ImGui::SetNextWindowSize(dimensions, ImGuiCond_Always);
-
-
-  if (!ImGui::Begin("Main", nullptr, flags)) {
-    ImGui::End();
-    return;
-  }
-
-  ImGui::ShowDemoWindow();
-
-
-  ImGui::End();
-}
-
-}
-}
-}

src/Application/View/Debug.h

@@ -1,28 +0,0 @@
-#ifndef YAZE_APPLICATION_DEBUG_DEBUG_H
-#define YAZE_APPLICATION_DEBUG_DEBUG_H
-
-#include "imgui/backends/imgui_impl_sdl.h"
-#include "imgui/backends/imgui_impl_sdlrenderer.h"
-#include "imgui/imgui.h"
-#include "imgui/imgui_internal.h"
-#include "imgui/misc/cpp/imgui_stdlib.h"
-
-namespace yaze {
-namespace Application {
-namespace View {
-
-class Debug {
-  public:
-    Debug()=default;
-    void UpdateScreen() const;
-  private:
-    ImGuiWindowFlags flags =
-      ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse |
-      ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoScrollbar;
-};
-
-}
-}
-}
-
-#endif