Editor housekeeping

src/app/core/pipeline.cc

@@ -159,7 +159,7 @@ void BitmapCanvasPipeline(gui::Canvas& canvas, const gfx::Bitmap& bitmap,
 void BuildAndRenderBitmapPipeline(int width, int height, int depth, Bytes data,
                                   ROM& z3_rom, gfx::Bitmap& bitmap,
                                   gfx::SNESPalette& palette) {
-  PRINT_IF_ERROR(bitmap.InitializeFromData(width, height, depth, data));
+  bitmap.Create(width, height, depth, data);
   bitmap.ApplyPalette(palette);
   z3_rom.RenderBitmap(&bitmap);
 }

src/app/editor/graphics_editor.cc

@@ -164,8 +164,8 @@ absl::Status GraphicsEditor::DrawCgxImport() {
   core::ButtonPipe("Load CGX Data", [this]() {
     status_ = gfx::LoadCgx(current_bpp_, cgx_file_path_, cgx_data_,
                            decoded_cgx_, extra_cgx_data_);
-    PRINT_IF_ERROR(
+
-        cgx_bitmap_.InitializeFromData(0x80, 0x200, 8, decoded_cgx_));
+    cgx_bitmap_.InitializeFromData(0x80, 0x200, 8, decoded_cgx_);
     if (col_file_) {
       cgx_bitmap_.ApplyPalette(decoded_col_);
       rom()->RenderBitmap(&cgx_bitmap_);
@@ -198,8 +198,8 @@ absl::Status GraphicsEditor::DrawScrImport() {
     decoded_scr_data_.resize(0x100 * 0x100);
     status_ = gfx::DrawScrWithCgx(current_bpp_, scr_data_, decoded_scr_data_,
                                   decoded_cgx_);
-    PRINT_IF_ERROR(
+
-        scr_bitmap_.InitializeFromData(0x100, 0x100, 8, decoded_scr_data_));
+    scr_bitmap_.InitializeFromData(0x100, 0x100, 8, decoded_scr_data_);
     if (scr_loaded_) {
       scr_bitmap_.ApplyPalette(decoded_col_);
       rom()->RenderBitmap(&scr_bitmap_);
@@ -389,7 +389,7 @@ absl::Status GraphicsEditor::DecompressImportData(int size) {
 
   auto converted_sheet = gfx::SnesTo8bppSheet(import_data_, 3);
   bin_bitmap_.Create(core::kTilesheetWidth, 0x2000, core::kTilesheetDepth,
-                     converted_sheet.data(), size);
+                     converted_sheet);
 
   if (rom()->isLoaded()) {
     auto palette_group = rom()->GetPaletteGroup("ow_main");

src/app/editor/master_editor.cc

@@ -112,12 +112,14 @@ class RecentFilesManager {
 
 }  // namespace
 
+using ImGui::Text;
+
 void MasterEditor::SetupScreen(std::shared_ptr<SDL_Renderer> renderer) {
   sdl_renderer_ = renderer;
   rom()->SetupRenderer(renderer);
 }
 
-void MasterEditor::UpdateScreen() {
+absl::Status MasterEditor::Update() {
   NewMasterFrame();
 
   DrawYazeMenu();
@@ -128,39 +130,27 @@ void MasterEditor::UpdateScreen() {
 
   TAB_BAR("##TabBar")
 
-  TAB_ITEM("Overworld")
+  gui::RenderTabItem("Overworld", [&]() {
     current_editor_ = &overworld_editor_;
     status_ = overworld_editor_.Update();
-  END_TAB_ITEM()
+  });
 
-  TAB_ITEM("Dungeon")
+  gui::RenderTabItem("Dungeon", [&]() {
     current_editor_ = &dungeon_editor_;
     status_ = dungeon_editor_.Update();
-  END_TAB_ITEM()
+  });
-
-  TAB_ITEM("Graphics")
-  status_ = graphics_editor_.Update();
-  END_TAB_ITEM()
-
-  TAB_ITEM("Sprites")
-  status_ = sprite_editor_.Update();
-  END_TAB_ITEM()
-
-  TAB_ITEM("Palettes")
-  status_ = palette_editor_.Update();
-  END_TAB_ITEM()
-
-  TAB_ITEM("Screens")
-  screen_editor_.Update();
-  END_TAB_ITEM()
-
-  TAB_ITEM("Music")
-  music_editor_.Update();
-  END_TAB_ITEM()
 
+  gui::RenderTabItem("Graphics",
+                     [&]() { status_ = graphics_editor_.Update(); });
+  gui::RenderTabItem("Sprites", [&]() { status_ = sprite_editor_.Update(); });
+  gui::RenderTabItem("Palettes", [&]() { status_ = palette_editor_.Update(); });
+  gui::RenderTabItem("Screens", [&]() { screen_editor_.Update(); });
+  gui::RenderTabItem("Music", [&]() { music_editor_.Update(); });
   END_TAB_BAR()
 
   ImGui::End();
+
+  return absl::OkStatus();
 }
 
 void MasterEditor::DrawFileDialog() {
@@ -189,7 +179,7 @@ void MasterEditor::DrawStatusPopup() {
   }
 
   if (show_status_ && (BeginCentered("StatusWindow"))) {
-    ImGui::Text("%s", prev_status_.ToString().c_str());
+    Text("%s", prev_status_.ToString().c_str());
     ImGui::Spacing();
     ImGui::NextColumn();
     ImGui::Columns(1);
@@ -207,10 +197,10 @@ void MasterEditor::DrawAboutPopup() {
   if (about_) ImGui::OpenPopup("About");
   if (ImGui::BeginPopupModal("About", nullptr,
                              ImGuiWindowFlags_AlwaysAutoResize)) {
-    ImGui::Text("Yet Another Zelda3 Editor - v0.05");
+    Text("Yet Another Zelda3 Editor - v0.05");
-    ImGui::Text("Written by: scawful");
+    Text("Written by: scawful");
     ImGui::Spacing();
-    ImGui::Text("Special Thanks: Zarby89, JaredBrian");
+    Text("Special Thanks: Zarby89, JaredBrian");
     ImGui::Separator();
 
     if (ImGui::Button("Close", gui::kDefaultModalSize)) {
@@ -225,8 +215,8 @@ void MasterEditor::DrawInfoPopup() {
   if (rom_info_) ImGui::OpenPopup("ROM Information");
   if (ImGui::BeginPopupModal("ROM Information", nullptr,
                              ImGuiWindowFlags_AlwaysAutoResize)) {
-    ImGui::Text("Title: %s", rom()->title());
+    Text("Title: %s", rom()->title());
-    ImGui::Text("ROM Size: %ld", rom()->size());
+    Text("ROM Size: %ld", rom()->size());
 
     if (ImGui::Button("Close", gui::kDefaultModalSize)) {
       rom_info_ = false;
@@ -259,7 +249,7 @@ void MasterEditor::DrawYazeMenu() {
   }
   ImGui::PopStyleColor();
 
-  ImGui::Text(absl::StrCat("yaze v", core::kYazeVersion).c_str());
+  Text(absl::StrCat("yaze v", core::kYazeVersion).c_str());
 
   END_MENU_BAR()
 
@@ -273,7 +263,7 @@ void MasterEditor::DrawYazeMenu() {
   if (show_command_line_interface) {
     ImGui::Begin("Command Line Interface", &show_command_line_interface,
                  ImGuiWindowFlags_None);
-    ImGui::Text("Enter a command:");
+    Text("Enter a command:");
     ImGui::End();
   }
 }
@@ -331,7 +321,7 @@ void MasterEditor::DrawFileMenu() {
     if (ImGui::BeginMenu("Options")) {
       ImGui::MenuItem("Backup ROM", "", &backup_rom_);
       ImGui::Separator();
-      ImGui::Text("Experiment Flags");
+      Text("Experiment Flags");
       ImGui::Checkbox("Enable Overworld Sprites",
                       &mutable_flags()->kDrawOverworldSprites);
       ImGui::Checkbox("Use Bitmap Manager",
@@ -441,7 +431,7 @@ void MasterEditor::DrawViewMenu() {
         ImGui::TableNextRow();
         for (int column = 0; column < 3; column++) {
           ImGui::TableNextColumn();
-          ImGui::Text("Cell %d,%d", column, row);
+          Text("Cell %d,%d", column, row);
         }
       }
       ImGui::EndTable();
@@ -473,12 +463,12 @@ void MasterEditor::DrawHelpMenu() {
   if (open_rom_help) ImGui::OpenPopup("Open a ROM");
   if (ImGui::BeginPopupModal("Open a ROM", nullptr,
                              ImGuiWindowFlags_AlwaysAutoResize)) {
-    ImGui::Text("File -> Open");
+    Text("File -> Open");
-    ImGui::Text("Select a ROM file to open");
+    Text("Select a ROM file to open");
-    ImGui::Text("Supported ROMs (headered or unheadered):");
+    Text("Supported ROMs (headered or unheadered):");
-    ImGui::Text("The Legend of Zelda: A Link to the Past");
+    Text("The Legend of Zelda: A Link to the Past");
-    ImGui::Text("US Version 1.0");
+    Text("US Version 1.0");
-    ImGui::Text("JP Version 1.0");
+    Text("JP Version 1.0");
 
     if (ImGui::Button("Close", gui::kDefaultModalSize)) {
       open_rom_help = false;

src/app/editor/master_editor.h

@@ -33,8 +33,11 @@ namespace editor {
 
 class MasterEditor : public SharedROM, public core::ExperimentFlags {
  public:
+  MasterEditor() { current_editor_ = &overworld_editor_; }
+
   void SetupScreen(std::shared_ptr<SDL_Renderer> renderer);
-  void UpdateScreen();
+  absl::Status Update();
+
   void Shutdown() { overworld_editor_.Shutdown(); }
 
  private:
@@ -60,7 +63,6 @@ class MasterEditor : public SharedROM, public core::ExperimentFlags {
   std::shared_ptr<SDL_Renderer> sdl_renderer_;
 
   emu::Emulator emulator_;
-  Editor *current_editor_ = nullptr;
 
   AssemblyEditor assembly_editor_;
   DungeonEditor dungeon_editor_;
@@ -70,6 +72,8 @@ class MasterEditor : public SharedROM, public core::ExperimentFlags {
   PaletteEditor palette_editor_;
   ScreenEditor screen_editor_;
   SpriteEditor sprite_editor_;
+
+  Editor *current_editor_ = nullptr;
 };
 
 }  // namespace editor

src/app/editor/overworld_editor.cc

@@ -39,7 +39,7 @@ absl::Status OverworldEditor::Update() {
     // Initialize overworld graphics, maps, and palettes
     RETURN_IF_ERROR(LoadGraphics())
     RETURN_IF_ERROR(tile16_editor_.InitBlockset(
-        tile16_blockset_bmp_, tile16_individual_, tile8_individual_));
+        tile16_blockset_bmp_, current_gfx_bmp_, tile16_individual_));
     gfx_group_editor_.InitBlockset(tile16_blockset_bmp_);
     all_gfx_loaded_ = true;
   } else if (!rom()->isLoaded() && all_gfx_loaded_) {