remove app namespace

src/app/editor/graphics/gfx_group_editor.cc

@@ -11,7 +11,6 @@
 #include "imgui/imgui.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 using ImGui::BeginChild;
@@ -297,5 +296,4 @@ void GfxGroupEditor::DrawPaletteViewer() {
 }
 
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

src/app/editor/graphics/gfx_group_editor.h

@@ -7,7 +7,6 @@
 #include "app/rom.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 /**
@@ -43,6 +42,5 @@ class GfxGroupEditor : public SharedRom {
 };
 
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
 #endif  // YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H

src/app/editor/graphics/graphics_editor.cc

@@ -23,7 +23,6 @@
 #include "imgui_memory_editor.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 using core::Renderer;
@@ -844,5 +843,4 @@ absl::Status GraphicsEditor::DecompressSuperDonkey() {
 }
 
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

src/app/editor/graphics/graphics_editor.h

@@ -16,7 +16,6 @@
 #include "imgui_memory_editor.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 // "99973","A3D80",
@@ -196,7 +195,6 @@ class GraphicsEditor : public SharedRom, public Editor {
 };
 
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
 
 #endif  // YAZE_APP_EDITOR_GRAPHICS_EDITOR_H

src/app/editor/graphics/palette_editor.cc

@@ -8,7 +8,6 @@
 #include "imgui/imgui.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 using ImGui::AcceptDragDropPayload;
@@ -472,5 +471,4 @@ absl::Status PaletteEditor::ResetColorToOriginal(
 }
 
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

src/app/editor/graphics/palette_editor.h

@@ -14,7 +14,6 @@
 #include "imgui/imgui.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 namespace palette_internal {
@@ -120,7 +119,6 @@ class PaletteEditor : public SharedRom, public Editor {
 };
 
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
 
 #endif

src/app/editor/graphics/screen_editor.cc

@@ -18,7 +18,6 @@
 #include "imgui/imgui.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 using core::Renderer;
@@ -392,6 +391,22 @@ void ScreenEditor::DrawDungeonMapsEditor() {
       sheets_.emplace(1, rom()->gfx_sheets()[213]);
       sheets_.emplace(2, rom()->gfx_sheets()[214]);
       sheets_.emplace(3, rom()->gfx_sheets()[215]);
+      int current_tile8 = 0;
+      int tile_data_offset = 0;
+      for (int i = 0; i < 4; ++i) {
+        for (int j = 0; j < 32; j++) {
+          std::vector<uint8_t> tile_data(64, 0);  // 8x8 tile (64 bytes
+          int tile_index = current_tile8 + j;
+          int x = (j % 8) * 8;
+          int y = (j / 8) * 8;
+          sheets_[i].Get8x8Tile(tile_index, 0, 0, tile_data, tile_data_offset);
+          tile8_individual_.emplace_back(gfx::Bitmap(8, 8, 4, tile_data));
+          RETURN_VOID_IF_ERROR(tile8_individual_.back().ApplyPalette(
+              *rom()->mutable_dungeon_palette(3)));
+          Renderer::GetInstance().RenderBitmap(&tile8_individual_.back());
+        }
+        tile_data_offset = 0;
+      }
       dungeon_maps_loaded_ = true;
     } else {
       ImGui::Text("Failed to load dungeon map tile16");
@@ -470,8 +485,12 @@ void ScreenEditor::DrawDungeonMapsEditor() {
       }
 
       ImGui::Separator();
-      current_tile_canvas_.DrawBackground(ImVec2(64 * 2 + 2, 64 * 2 + 4));
+      current_tile_canvas_.DrawBackground(); // ImVec2(64 * 2 + 2, 64 * 2 + 4));
       current_tile_canvas_.DrawContextMenu();
+      if (current_tile_canvas_.DrawTilePainter(
+              tile8_individual_[selected_tile8_], 16)) {
+        // Modify the tile16 based on the selected tile and current_tile16_info
+      }
       current_tile_canvas_.DrawBitmap(tile16_individual_[selected_tile16_], 2,
                                       4.0f);
       current_tile_canvas_.DrawGrid(16.f);
@@ -589,5 +608,4 @@ void ScreenEditor::DrawToolset() {
 }
 
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

src/app/editor/graphics/screen_editor.h

@@ -15,7 +15,6 @@
 #include "imgui/imgui.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 /**
@@ -86,12 +85,13 @@ private:
   bool copy_button_pressed = false;
   bool paste_button_pressed = false;
 
-  std::vector<uint8_t> all_gfx_;
+  std::array<uint16_t, 4> current_tile16_data_;
   std::unordered_map<int, gfx::Bitmap> tile16_individual_;
+  std::vector<gfx::Bitmap> tile8_individual_;
+  std::vector<uint8_t> all_gfx_;
+  std::vector<uint8_t> gfx_bin_data_;
   std::vector<zelda3::screen::DungeonMap> dungeon_maps_;
   std::vector<std::vector<std::array<std::string, 25>>> dungeon_map_labels_;
-  std::array<uint16_t, 4> current_tile16_data_;
-  std::vector<uint8_t> gfx_bin_data_;
 
   absl::Status status_;
 
@@ -100,18 +100,18 @@ private:
   gfx::Tilesheet tile16_sheet_;
   gfx::InternalTile16 current_tile16_info;
 
-  gui::Canvas current_tile_canvas_{"##CurrentTileCanvas"};
+  gui::Canvas current_tile_canvas_{"##CurrentTileCanvas", ImVec2(32, 32),
+                                   gui::CanvasGridSize::k16x16, 2.0f};
   gui::Canvas screen_canvas_;
   gui::Canvas tilesheet_canvas_;
-  gui::Canvas tilemap_canvas_{"##TilemapCanvas",
-                              ImVec2(128 + 2, (192) + 4),
+  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
 
 #endif

src/app/editor/graphics/tile16_editor.cc

@@ -21,7 +21,6 @@
 #include "imgui/imgui.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 using core::Renderer;
@@ -251,7 +250,7 @@ absl::Status Tile16Editor::DrawTileEditControls() {
   gui::InputHexByte("Palette", &notify_palette.mutable_get());
   notify_palette.apply_changes();
   if (notify_palette.modified()) {
-    auto palette = palettesets_[current_palette_].main;
+    auto palette = palettesets_[current_palette_].main_;
     auto value = notify_palette.get();
     if (notify_palette.get() > 0x04 && notify_palette.get() < 0x06) {
       palette = palettesets_[current_palette_].aux1;
@@ -400,5 +399,4 @@ absl::Status Tile16Editor::UpdateTransferTileCanvas() {
 }
 
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze

src/app/editor/graphics/tile16_editor.h

@@ -13,7 +13,6 @@
 #include "imgui/imgui.h"
 
 namespace yaze {
-namespace app {
 namespace editor {
 
 /**
@@ -100,6 +99,5 @@ class Tile16Editor : public GfxContext, public SharedRom {
 };
 
 }  // namespace editor
-}  // namespace app
 }  // namespace yaze
 #endif  // YAZE_APP_EDITOR_TILE16EDITOR_H