Dungeon object updates

src/app/editor/dungeon_editor.cc

@@ -58,92 +58,8 @@ absl::Status DungeonEditor::Update() {
   return absl::OkStatus();
 }
 
-void DungeonEditor::DrawRoomSelector() {
-  if (rom()->isLoaded()) {
-    gui::InputHexWord("Room ID", &current_room_id_);
-    // gui::InputHexByte("Palette ID", &rooms_[current_room_id_].palette);
-
-    if (ImGuiID child_id = ImGui::GetID((void*)(intptr_t)9);
-        ImGui::BeginChild(child_id, ImGui::GetContentRegionAvail(), true,
-                          ImGuiWindowFlags_AlwaysVerticalScrollbar)) {
-      int i = 0;
-      for (const auto each_room_name : zelda3::dungeon::kRoomNames) {
-        ImGui::Selectable(each_room_name.data(), current_room_id_ == i,
-                          ImGuiSelectableFlags_AllowDoubleClick);
-        if (ImGui::IsItemClicked()) {
-          active_rooms_.push_back(i);
-        }
-        i += 1;
-      }
-    }
-    ImGui::EndChild();
-  }
-}
-
-void DungeonEditor::DrawDungeonTabView() {
-  static int next_tab_id = 0;
-
-  if (ImGui::BeginTabBar("MyTabBar", kDungeonTabBarFlags)) {
-    // TODO: Manage the room that is being added to the tab bar.
-    if (ImGui::TabItemButton("##tabitem", kDungeonTabFlags)) {
-      active_rooms_.push_back(next_tab_id++);  // Add new tab
-    }
-
-    // Submit our regular tabs
-    for (int n = 0; n < active_rooms_.Size;) {
-      bool open = true;
-
-      if (ImGui::BeginTabItem(
-              zelda3::dungeon::kRoomNames[active_rooms_[n]].data(), &open,
-              ImGuiTabItemFlags_None)) {
-        DrawDungeonCanvas(active_rooms_[n]);
-        ImGui::EndTabItem();
-      }
-
-      if (!open)
-        active_rooms_.erase(active_rooms_.Data + n);
-      else
-        n++;
-    }
-
-    ImGui::EndTabBar();
-  }
-  ImGui::Separator();
-}
-
-void DungeonEditor::DrawDungeonCanvas(int room_id) {
-  ImGui::BeginGroup();
-
-  gui::InputHexByte("Layout", &rooms_[room_id].layout);
-  ImGui::SameLine();
-
-  gui::InputHexByte("Blockset", &rooms_[room_id].blockset);
-  ImGui::SameLine();
-
-  gui::InputHexByte("Spriteset", &rooms_[room_id].spriteset);
-  ImGui::SameLine();
-
-  gui::InputHexByte("Palette", &rooms_[room_id].palette);
-
-  gui::InputHexByte("Floor1", &rooms_[room_id].floor1);
-  ImGui::SameLine();
-
-  gui::InputHexByte("Floor2", &rooms_[room_id].floor2);
-  ImGui::SameLine();
-
-  gui::InputHexWord("Message ID", &rooms_[room_id].message_id_);
-  ImGui::SameLine();
-
-  ImGui::EndGroup();
-
-  canvas_.DrawBackground();
-  canvas_.DrawContextMenu();
-  canvas_.DrawGrid();
-  canvas_.DrawOverlay();
-}
-
 void DungeonEditor::DrawToolset() {
-  if (ImGui::BeginTable("DWToolset", 12, ImGuiTableFlags_SizingFixedFit,
+  if (ImGui::BeginTable("DWToolset", 13, ImGuiTableFlags_SizingFixedFit,
                         ImVec2(0, 0))) {
     TableSetupColumn("#undoTool");
     TableSetupColumn("#redoTool");
@@ -231,10 +147,99 @@ void DungeonEditor::DrawToolset() {
       ImGui::SetTooltip("Blocks");
     }
 
+    ImGui::TableNextColumn();
+    if (ImGui::Button(ICON_MD_PALETTE)) {
+      // Open the palette module
+    }
+
     ImGui::EndTable();
   }
 }
 
+void DungeonEditor::DrawRoomSelector() {
+  if (rom()->isLoaded()) {
+    gui::InputHexWord("Room ID", &current_room_id_);
+    // gui::InputHexByte("Palette ID", &rooms_[current_room_id_].palette);
+
+    if (ImGuiID child_id = ImGui::GetID((void*)(intptr_t)9);
+        ImGui::BeginChild(child_id, ImGui::GetContentRegionAvail(), true,
+                          ImGuiWindowFlags_AlwaysVerticalScrollbar)) {
+      int i = 0;
+      for (const auto each_room_name : zelda3::dungeon::kRoomNames) {
+        ImGui::Selectable(each_room_name.data(), current_room_id_ == i,
+                          ImGuiSelectableFlags_AllowDoubleClick);
+        if (ImGui::IsItemClicked()) {
+          active_rooms_.push_back(i);
+        }
+        i += 1;
+      }
+    }
+    ImGui::EndChild();
+  }
+}
+
+void DungeonEditor::DrawDungeonTabView() {
+  static int next_tab_id = 0;
+
+  if (ImGui::BeginTabBar("MyTabBar", kDungeonTabBarFlags)) {
+    // TODO: Manage the room that is being added to the tab bar.
+    if (ImGui::TabItemButton("##tabitem", kDungeonTabFlags)) {
+      active_rooms_.push_back(next_tab_id++);  // Add new tab
+    }
+
+    // Submit our regular tabs
+    for (int n = 0; n < active_rooms_.Size;) {
+      bool open = true;
+
+      if (ImGui::BeginTabItem(
+              zelda3::dungeon::kRoomNames[active_rooms_[n]].data(), &open,
+              ImGuiTabItemFlags_None)) {
+        DrawDungeonCanvas(active_rooms_[n]);
+        ImGui::EndTabItem();
+      }
+
+      if (!open)
+        active_rooms_.erase(active_rooms_.Data + n);
+      else
+        n++;
+    }
+
+    ImGui::EndTabBar();
+  }
+  ImGui::Separator();
+}
+
+void DungeonEditor::DrawDungeonCanvas(int room_id) {
+  ImGui::BeginGroup();
+
+  gui::InputHexByte("Layout", &rooms_[room_id].layout);
+  ImGui::SameLine();
+
+  gui::InputHexByte("Blockset", &rooms_[room_id].blockset);
+  ImGui::SameLine();
+
+  gui::InputHexByte("Spriteset", &rooms_[room_id].spriteset);
+  ImGui::SameLine();
+
+  gui::InputHexByte("Palette", &rooms_[room_id].palette);
+
+  gui::InputHexByte("Floor1", &rooms_[room_id].floor1);
+  ImGui::SameLine();
+
+  gui::InputHexByte("Floor2", &rooms_[room_id].floor2);
+  ImGui::SameLine();
+
+  gui::InputHexWord("Message ID", &rooms_[room_id].message_id_);
+  ImGui::SameLine();
+
+  ImGui::EndGroup();
+
+  canvas_.DrawBackground();
+  canvas_.DrawContextMenu();
+  canvas_.DrawGrid();
+  canvas_.DrawOverlay();
+}
+
 void DungeonEditor::DrawRoomGraphics() {
   const auto height = 0x40;
   room_gfx_canvas_.DrawBackground(ImVec2(256 + 1, 0x10 * 0x40 + 1));
@@ -301,6 +306,9 @@ void DungeonEditor::DrawObjectRenderer() {
     for (const auto object_name : zelda3::dungeon::Type1RoomObjectNames) {
       if (ImGui::Selectable(object_name.data(), selected_object == i)) {
         selected_object = i;
+        object_renderer_.LoadObject(i);
+        rom()->RenderBitmap(object_renderer_.bitmap());
+        object_loaded_ = true;
       }
       i += 1;
     }
@@ -312,11 +320,14 @@ void DungeonEditor::DrawObjectRenderer() {
     ImGui::BeginChild("DungeonObjectCanvas", ImVec2(276, 0x10 * 0x40 + 1),
                       true);
 
-    dungeon_object_canvas_.DrawBackground(ImVec2(256 + 1, 0x10 * 0x40 + 1));
-    dungeon_object_canvas_.DrawContextMenu();
-    dungeon_object_canvas_.DrawTileSelector(32);
-    dungeon_object_canvas_.DrawGrid(32.0f);
-    dungeon_object_canvas_.DrawOverlay();
+    object_canvas_.DrawBackground(ImVec2(256 + 1, 0x10 * 0x40 + 1));
+    object_canvas_.DrawContextMenu();
+    object_canvas_.DrawTileSelector(32);
+    // if (object_loaded_) {
+    //   object_canvas_.DrawBitmap(*object_renderer_.bitmap(), 0, 0);
+    // }
+    object_canvas_.DrawGrid(32.0f);
+    object_canvas_.DrawOverlay();
 
     ImGui::EndChild();
 

src/app/editor/dungeon_editor.h

@@ -53,6 +53,7 @@ class DungeonEditor : public Editor,
   uint16_t current_room_id_ = 0;
   bool is_loaded_ = false;
   bool show_object_render_ = false;
+  bool object_loaded_ = false;
 
   gfx::Bitmap room_gfx_bmp_;
 
@@ -60,6 +61,11 @@ class DungeonEditor : public Editor,
 
   std::vector<zelda3::dungeon::Room> rooms_;
   zelda3::dungeon::DungeonObjectRenderer object_renderer_;
+  gui::Canvas canvas_;
+  gui::Canvas room_gfx_canvas_;
+  gui::Canvas object_canvas_;
+
+  std::vector<gfx::BitmapManager> room_graphics_;
 
   enum BackgroundType {
     kNoBackground,
@@ -73,13 +79,6 @@ class DungeonEditor : public Editor,
   int background_type_ = kNoBackground;
   int placement_type_ = kNoType;
 
-  gui::Canvas canvas_;
-  gui::Canvas room_gfx_canvas_;
-
-  gui::Canvas dungeon_object_canvas_;
-
-  std::vector<gfx::BitmapManager> room_graphics_;
-
   ImGuiTableFlags toolset_table_flags_ =
       ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Reorderable |
       ImGuiTableFlags_Hideable | ImGuiTableFlags_Resizable;

src/app/editor/graphics_editor.cc

@@ -8,7 +8,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/compression.h"
 #include "app/gfx/scad_format.h"

src/app/editor/graphics_editor.h

@@ -9,7 +9,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_tile.h"
 #include "app/gui/canvas.h"

src/app/editor/master_editor.cc

@@ -14,8 +14,8 @@
 #include "app/editor/graphics_editor.h"
 #include "app/editor/modules/assembly_editor.h"
 #include "app/editor/overworld_editor.h"
-#include "app/editor/resources/music_editor.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/music_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/editor/screen_editor.h"
 #include "app/editor/sprite_editor.h"
 #include "app/emu/emulator.h"

src/app/editor/master_editor.h

@@ -14,9 +14,9 @@
 #include "app/editor/dungeon_editor.h"
 #include "app/editor/graphics_editor.h"
 #include "app/editor/modules/assembly_editor.h"
-#include "app/editor/resources/music_editor.h"
+#include "app/editor/modules/music_editor.h"
 #include "app/editor/overworld_editor.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/editor/screen_editor.h"
 #include "app/editor/sprite_editor.h"
 #include "app/emu/emulator.h"

src/app/editor/modules/gfx_group_editor.cc

@@ -8,7 +8,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/editor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/modules/gfx_group_editor.h

@@ -9,7 +9,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/editor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/modules/tile16_editor.cc

@@ -8,7 +8,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/editor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/modules/tile16_editor.h

@@ -9,7 +9,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/editor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/overworld_editor.cc

@@ -10,7 +10,7 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "app/core/pipeline.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/overworld_editor.h

@@ -15,7 +15,7 @@
 #include "app/core/pipeline.h"
 #include "app/editor/modules/gfx_group_editor.h"
 #include "app/editor/modules/tile16_editor.h"
-#include "app/editor/resources/palette_editor.h"
+#include "app/editor/modules/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"