Refactor editor includes and update source files for improved organization

src/app/editor/graphics/gfx_group_editor.cc

@@ -1,7 +1,6 @@
 #include "gfx_group_editor.h"
 
 #include "absl/status/status.h"
-#include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"

src/app/editor/graphics/gfx_group_editor.h

@@ -1,20 +1,10 @@
 #ifndef YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
 #define YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
 
-#include <cmath>
-
 #include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "app/editor/utils/editor.h"
-#include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
-#include "app/gfx/snes_tile.h"
 #include "app/gui/canvas.h"
-#include "app/gui/icons.h"
-#include "app/gui/style.h"
 #include "app/rom.h"
-#include "app/zelda3/overworld/overworld.h"
-#include "imgui/imgui.h"
 
 namespace yaze {
 namespace app {
@@ -55,4 +45,4 @@ class GfxGroupEditor : public SharedRom {
 }  // namespace editor
 }  // namespace app
 }  // namespace yaze
-#endif  // YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
+#endif  // YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H

src/app/editor/graphics/graphics_editor.h

@@ -3,7 +3,7 @@
 
 #include "absl/status/status.h"
 #include "app/editor/graphics/palette_editor.h"
-#include "app/editor/utils/editor.h"
+#include "app/editor/editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_tile.h"
 #include "app/gui/modules/asset_browser.h"

src/app/editor/graphics/palette_editor.h

@@ -1,12 +1,15 @@
 #ifndef YAZE_APP_EDITOR_PALETTE_EDITOR_H
 #define YAZE_APP_EDITOR_PALETTE_EDITOR_H
 
+#include <deque>
+#include <string>
+#include <vector>
+
 #include "absl/status/status.h"
 #include "app/editor/graphics/gfx_group_editor.h"
-#include "app/editor/utils/editor.h"
+#include "app/editor/editor.h"
 #include "app/gfx/snes_palette.h"
-#include "app/gui/canvas.h"
-#include "app/gui/icons.h"
+#include "app/gfx/snes_color.h"
 #include "app/rom.h"
 #include "imgui/imgui.h"
 
@@ -120,4 +123,4 @@ class PaletteEditor : public SharedRom, public Editor {
 }  // namespace app
 }  // namespace yaze
 
-#endif
+#endif

src/app/editor/graphics/screen_editor.h

@@ -4,7 +4,7 @@
 #include <array>
 
 #include "absl/status/status.h"
-#include "app/editor/utils/editor.h"
+#include "app/editor/editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/tilesheet.h"
@@ -33,7 +33,7 @@ namespace editor {
  * The class inherits from the SharedRom class.
  */
 class ScreenEditor : public SharedRom, public Editor {
- public:
+public:
   ScreenEditor() {
     screen_canvas_.SetCanvasSize(ImVec2(512, 512));
     type_ = EditorType::kScreen;
@@ -50,7 +50,7 @@ class ScreenEditor : public SharedRom, public Editor {
 
   absl::Status SaveDungeonMaps();
 
- private:
+private:
   void DrawTitleScreenEditor();
   void DrawNamingScreenEditor();
   void DrawOverworldMapEditor();
@@ -60,7 +60,7 @@ class ScreenEditor : public SharedRom, public Editor {
   void DrawInventoryToolset();
 
   absl::Status LoadDungeonMaps();
-  absl::Status LoadDungeonMapTile16(const std::vector<uint8_t>& gfx_data,
+  absl::Status LoadDungeonMapTile16(const std::vector<uint8_t> &gfx_data,
                                     bool bin_mode = false);
   absl::Status SaveDungeonMapTile16();
   void DrawDungeonMapsTabs();
@@ -68,6 +68,10 @@ class ScreenEditor : public SharedRom, public Editor {
 
   void LoadBinaryGfx();
 
+  enum class EditingMode { DRAW, EDIT };
+
+  EditingMode current_mode_ = EditingMode::DRAW;
+
   bool dungeon_maps_loaded_ = false;
   bool binary_gfx_loaded_ = false;
 
@@ -75,6 +79,7 @@ class ScreenEditor : public SharedRom, public Editor {
   uint8_t boss_room = 0;
 
   int selected_tile16_ = 0;
+  int selected_tile8_ = 0;
   int selected_dungeon = 0;
   int floor_number = 1;
 
@@ -98,13 +103,15 @@ class ScreenEditor : public SharedRom, public Editor {
   gui::Canvas current_tile_canvas_{"##CurrentTileCanvas"};
   gui::Canvas screen_canvas_;
   gui::Canvas tilesheet_canvas_;
-  gui::Canvas tilemap_canvas_;
+  gui::Canvas tilemap_canvas_{"##TilemapCanvas",
+                              ImVec2(128 + 2, (192) + 4),
+                              gui::CanvasGridSize::k8x8, 2.f};
 
   zelda3::screen::Inventory inventory_;
 };
 
-}  // namespace editor
-}  // namespace app
-}  // namespace yaze
+} // namespace editor
+} // namespace app
+} // namespace yaze
 
 #endif

src/app/editor/graphics/tile16_editor.cc

@@ -7,7 +7,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/platform/renderer.h"
 #include "app/editor/graphics/palette_editor.h"
-#include "app/editor/utils/editor.h"
+#include "app/editor/editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"