namespace housekeeping

src/CMakeLists.txt

@@ -34,6 +34,8 @@ add_executable(
     yaze.cc
     gui/input.cc
     gui/style.cc
+    gui/editor/editor.cc
+    gui/editor/overworld_editor.cc
     application/rom.cc
     application/core/controller.cc
     application/zelda3/overworld.cc
@@ -41,8 +43,6 @@ add_executable(
     application/gfx/bitmap.cc
     application/gfx/tile.cc
     application/gfx/palette.cc
-    application/Editor/editor.cc
-    application/Editor/overworld_editor.cc
     # GUI libraries 
     ${IMGUI_PATH}/imgui.cpp 
     ${IMGUI_PATH}/imgui_demo.cpp

src/application/core/controller.cc

@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "Editor/editor.h"
+#include "gui/editor/editor.h"
 
 namespace yaze {
 namespace application {
@@ -157,7 +157,7 @@ void Controller::CreateGuiContext() {
 
   // Load available fonts
   const ImGuiIO &io = ImGui::GetIO();
-  io.Fonts->AddFontFromFileTTF("assets/Fonts/Karla-Regular.ttf", 14.0f);
+  io.Fonts->AddFontFromFileTTF("assets/font/Karla-Regular.ttf", 14.0f);
 
   // merge in icons from Google Material Design
   static const ImWchar icons_ranges[] = {ICON_MIN_MD, 0xf900, 0};
@@ -168,9 +168,9 @@ void Controller::CreateGuiContext() {
   icons_config.PixelSnapH = true;
   io.Fonts->AddFontFromFileTTF(FONT_ICON_FILE_NAME_MD, 18.0f, &icons_config,
                                icons_ranges);
-  io.Fonts->AddFontFromFileTTF("assets/Fonts/Roboto-Medium.ttf", 14.0f);
-  io.Fonts->AddFontFromFileTTF("assets/Fonts/Cousine-Regular.ttf", 14.0f);
-  io.Fonts->AddFontFromFileTTF("assets/Fonts/DroidSans.ttf", 16.0f);
+  io.Fonts->AddFontFromFileTTF("assets/font/Roboto-Medium.ttf", 14.0f);
+  io.Fonts->AddFontFromFileTTF("assets/font/Cousine-Regular.ttf", 14.0f);
+  io.Fonts->AddFontFromFileTTF("assets/font/DroidSans.ttf", 16.0f);
 
   // Set the default style
   gui::ColorsYaze();

src/application/core/controller.h

@@ -8,7 +8,7 @@
 #include <imgui/imgui.h>
 #include <imgui/imgui_internal.h>
 
-#include "Editor/editor.h"
+#include "gui/editor/editor.h"
 #include "gui/icons.h"
 #include "gui/style.h"
 
@@ -48,7 +48,7 @@ class Controller {
   std::shared_ptr<SDL_Renderer> sdl_renderer_;
 };
 
-}  // namespace Core
+}  // namespace core
 }  // namespace application
 }  // namespace yaze
 

src/gui/editor/editor.cc

@@ -6,10 +6,10 @@
 #include <imgui/imgui_memory_editor.h>
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
-#include "Core/constants.h"
-#include "Editor/overworld_editor.h"
+#include "core/constants.h"
 #include "gfx/palette.h"
 #include "gfx/tile.h"
+#include "gui/editor/overworld_editor.h"
 #include "gui/icons.h"
 #include "gui/input.h"
 #include "rom.h"

src/gui/editor/editor.h

@@ -7,9 +7,9 @@
 #include <imgui/imgui_memory_editor.h>
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
-#include "Core/constants.h"
-#include "Editor/overworld_editor.h"
+#include "core/constants.h"
 #include "gfx/tile.h"
+#include "gui/editor/overworld_editor.h"
 #include "gui/icons.h"
 #include "gui/input.h"
 #include "rom.h"

src/gui/icons.h

@@ -3,7 +3,7 @@
 // for use with https://github.com/google/material-design-icons/blob/master/font/MaterialIcons-Regular.ttf
 #pragma once
 
-#define FONT_ICON_FILE_NAME_MD "assets/Fonts/MaterialIcons-Regular.ttf"
+#define FONT_ICON_FILE_NAME_MD "assets/font/MaterialIcons-Regular.ttf"
 
 #define ICON_MIN_MD 0xe000
 #define ICON_MAX_MD 0x10fffd