created gui directory and namespace

src/CMakeLists.txt

@@ -32,16 +32,15 @@ add_library("NintendoCompression" STATIC ${SNESHACKING_SOURCES})
 add_executable(
     yaze
     yaze.cc
+    gui/input.cc
+    gui/style.cc
     application/Core/controller.cc
-    application/Core/input.cc
     application/Data/rom.cc
     application/Data/OW/overworld.cc
     application/Data/OW/overworld_map.cc
     application/Graphics/bitmap.cc
     application/Graphics/tile.cc
     application/Graphics/palette.cc
-    application/Graphics/style.cc
-    application/Graphics/scene.cc
     application/Editor/editor.cc
     application/Editor/overworld_editor.cc
     # GUI libraries 
@@ -65,6 +64,7 @@ add_executable(
 
 target_include_directories(
   yaze PUBLIC
+  /
   Library/
   application/
   "C:/msys64/mingw64/include/libpng16"

src/application/Core/controller.h

@@ -9,8 +9,8 @@
 #include <imgui/imgui_internal.h>
 
 #include "Editor/editor.h"
-#include "Graphics/icons.h"
-#include "Graphics/style.h"
+#include "gui/icons.h"
+#include "gui/style.h"
 
 int main(int argc, char **argv);
 

src/application/Editor/editor.cc

@@ -7,7 +7,7 @@
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
 #include "Core/constants.h"
-#include "Core/input.h"
+#include "gui/input.h"
 #include "Data/rom.h"
 #include "Editor/overworld_editor.h"
 #include "Graphics/icons.h"

src/application/Editor/editor.h

@@ -8,11 +8,11 @@
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
 #include "Core/constants.h"
-#include "Core/input.h"
 #include "Data/rom.h"
 #include "Editor/overworld_editor.h"
-#include "Graphics/icons.h"
 #include "Graphics/tile.h"
+#include "gui/icons.h"
+#include "gui/input.h"
 
 namespace yaze {
 namespace application {

src/application/Editor/overworld_editor.h

@@ -4,9 +4,10 @@
 #include <imgui/imgui.h>
 
 #include "Data/OW/overworld.h"
-#include "Graphics/icons.h"
 #include "Graphics/palette.h"
 #include "Graphics/tile.h"
+#include "gui/icons.h"
+
 
 namespace yaze {
 namespace application {
@@ -16,7 +17,7 @@ static constexpr unsigned int k4BPP = 4;
 
 class OverworldEditor {
  public:
-  void SetupROM(Data::ROM & rom);
+  void SetupROM(Data::ROM &rom);
   void Update();
 
  private:

src/gui/input.cc

@@ -4,7 +4,7 @@
 #include <imgui/imgui_internal.h>
 
 namespace yaze {
-namespace Gui {
+namespace gui {
 
 const int kStepOneHex = 0x01;
 const int kStepFastHex = 0x0F;

src/gui/input.h

@@ -8,7 +8,7 @@
 #include <cstdint>
 
 namespace yaze {
-namespace Gui {
+namespace gui {
 
 IMGUI_API bool InputHex(const char* label, int* data);
 IMGUI_API bool InputHexShort(const char* label, int* data);

src/gui/style.cc

@@ -4,9 +4,7 @@
 #include "imgui/imgui_internal.h"
 
 namespace yaze {
-namespace application {
-namespace Core {
-namespace Style {
+namespace gui {
 
 void ColorsYaze() {
   ImGuiStyle *style = &ImGui::GetStyle();
@@ -107,7 +105,5 @@ void ColorsYaze() {
   colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f);
   colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.35f);
 }
-}  // namespace Style
-}  // namespace Core
-}  // namespace application
+}  // namespace gui
 }  // namespace yaze

src/gui/style.h

@@ -5,15 +5,11 @@
 #include <imgui/imgui_internal.h>
 
 namespace yaze {
-namespace application {
-namespace Core {
-namespace Style {
+namespace gui {
 
 void ColorsYaze();
 
-}  // namespace Style
-}  // namespace Core
-}  // namespace application
+}  // namespace gui
 }  // namespace yaze
 
 #endif