Refactor include paths and remove redundant headers in core and editor modules

src/app/app.cmake

@@ -41,6 +41,7 @@ target_include_directories(
   lib/
   app/
   ${ASAR_INCLUDE_DIR}
+  ${CMAKE_SOURCE_DIR}/incl/
   ${CMAKE_SOURCE_DIR}/src/
   ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine
   ${PNG_INCLUDE_DIRS}

src/app/core/controller.cc

@@ -7,10 +7,8 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-#include "app/core/platform/file_path.h"
 #include "app/core/platform/font_loader.h"
 #include "app/editor/editor_manager.h"
-#include "app/gui/icons.h"
 #include "app/gui/style.h"
 #include "core/utils/file_util.h"
 #include "imgui/backends/imgui_impl_sdl2.h"
@@ -314,15 +312,7 @@ absl::Status Controller::CreateGuiContext() {
                                     Renderer::GetInstance().renderer());
   ImGui_ImplSDLRenderer2_Init(Renderer::GetInstance().renderer());
 
-  // const auto assets_path = std::filesystem::path("assets");
   RETURN_IF_ERROR(LoadFontFamilies());
-  // #ifdef __APPLE__
-  // LoadSystemFonts();
-  // #else
-  // return absl::InternalError(
-  //    "Could not find assets/fonts directory in the current working "
-  //    "directory");
-  // #endif
 
   // Set the default style
   gui::ColorsYaze();

src/app/editor/system/extension_manager.cc

@@ -5,11 +5,11 @@
 #include <dlfcn.h>
 #endif
 
+#include <system/extension.h>
+
 #include <iostream>
 #include <vector>
 
-#include "incl/system/extension.h"
-
 namespace yaze {
 namespace app {
 namespace editor {

src/app/editor/system/extension_manager.h

@@ -1,11 +1,11 @@
 #ifndef YAZE_APP_EDITOR_SYSTEM_EXTENSION_MANAGER_H
 #define YAZE_APP_EDITOR_SYSTEM_EXTENSION_MANAGER_H
 
+#include <system/extension.h>
+
 #include <string>
 #include <vector>
 
-#include "incl/system/extension.h"
-
 namespace yaze {
 namespace app {
 namespace editor {

src/app/gfx/snes_color.h

@@ -1,11 +1,12 @@
 #ifndef YAZE_APP_GFX_SNES_COLOR_H_
 #define YAZE_APP_GFX_SNES_COLOR_H_
 
+#include <snes_color.h>
+
 #include <cstdint>
 #include <vector>
 
 #include "imgui/imgui.h"
-#include "incl/snes_color.h"
 
 namespace yaze {
 namespace app {

src/app/gfx/snes_palette.h

@@ -12,7 +12,7 @@
 #include "app/core/constants.h"
 #include "app/gfx/snes_color.h"
 #include "imgui/imgui.h"
-#include "incl/snes_color.h"
+#include "snes_color.h"
 
 namespace yaze {
 namespace app {

src/app/gfx/snes_tile.h

@@ -1,12 +1,12 @@
 #ifndef YAZE_APP_GFX_SNES_TILE_H
 #define YAZE_APP_GFX_SNES_TILE_H
 
+#include <snes_tile.h>
+
 #include <cstdint>
 #include <cstring>
 #include <vector>
 
-#include "incl/snes_tile.h"
-
 namespace yaze {
 namespace app {
 namespace gfx {

src/app/zelda3/dungeon/room.cc

@@ -1,5 +1,7 @@
 #include "room.h"
 
+#include <dungeon.h>
+
 #include <cstdint>
 #include <vector>
 
@@ -12,7 +14,6 @@
 #include "app/rom.h"
 #include "app/zelda3/dungeon/room_object.h"
 #include "app/zelda3/sprite/sprite.h"
-#include "incl/dungeon.h"
 
 namespace yaze {
 namespace app {

src/app/zelda3/dungeon/room.h

@@ -1,6 +1,8 @@
 #ifndef YAZE_APP_ZELDA3_DUNGEON_ROOM_H
 #define YAZE_APP_ZELDA3_DUNGEON_ROOM_H
 
+#include <dungeon.h>
+
 #include <cstdint>
 #include <fstream>
 #include <string>
@@ -15,7 +17,6 @@
 #include "app/rom.h"
 #include "app/zelda3/dungeon/room_object.h"
 #include "app/zelda3/sprite/sprite.h"
-#include "incl/dungeon.h"
 
 namespace yaze {
 namespace app {