Refactor PaletteGroupMap

src/app/editor/dungeon_editor.cc

@@ -59,8 +59,7 @@ absl::Status DungeonEditor::Update() {
 }
 
 absl::Status DungeonEditor::Initialize() {
-  ASSIGN_OR_RETURN(auto dungeon_man_pal_group,
-                   rom()->palette_group("dungeon_main"));
+  auto dungeon_man_pal_group = rom()->palette_group().dungeon_main;
   for (int i = 0; i < 0x100 + 40; i++) {
     rooms_.emplace_back(zelda3::dungeon::Room(i));
     rooms_[i].LoadHeader();
@@ -101,12 +100,11 @@ absl::Status DungeonEditor::Initialize() {
 absl::Status DungeonEditor::RefreshGraphics() {
   for (int i = 0; i < 8; i++) {
     int block = rooms_[current_room_id_].blocks()[i];
-    graphics_bin_[block].get()->ApplyPaletteWithTransparent(
-        current_palette_group_[current_palette_id_], 0);
+    RETURN_IF_ERROR(graphics_bin_[block].get()->ApplyPaletteWithTransparent(
+        current_palette_group_[current_palette_id_], 0));
     rom()->UpdateBitmap(graphics_bin_[block].get(), true);
   }
-  ASSIGN_OR_RETURN(auto sprites_aux1_pal_group,
-                   rom()->palette_group("sprites_aux1"));
+  auto sprites_aux1_pal_group = rom()->palette_group().sprites_aux1;
   for (int i = 9; i < 16; i++) {
     int block = rooms_[current_room_id_].blocks()[i];
     graphics_bin_[block].get()->ApplyPaletteWithTransparent(
@@ -163,8 +161,7 @@ absl::Status DungeonEditor::UpdateDungeonRoomView() {
 
   if (palette_showing_) {
     ImGui::Begin("Palette Editor", &palette_showing_, 0);
-    ASSIGN_OR_RETURN(auto dungeon_main_pal_group,
-                     rom()->palette_group("dungeon_main"));
+    auto dungeon_main_pal_group = rom()->palette_group().dungeon_main;
     current_palette_ = dungeon_main_pal_group[current_palette_group_id_];
     gui::SelectablePalettePipeline(current_palette_id_, refresh_graphics_,
                                    current_palette_);

src/app/editor/graphics_editor.cc

@@ -322,12 +322,10 @@ absl::Status GraphicsEditor::UpdateGfxTabView() {
 }
 
 absl::Status GraphicsEditor::UpdatePaletteColumn() {
-  ASSIGN_OR_RETURN(
-      auto palette_group,
-      rom()->palette_group(
-          kPaletteGroupAddressesKeys[edit_palette_group_name_index_]));
+  auto palette_group = *rom()->palette_group().get_group(
+      kPaletteGroupAddressesKeys[edit_palette_group_name_index_]);
 
-  auto palette = palette_group[edit_palette_index_];
+  auto palette = palette_group.palette(edit_palette_index_);
 
   if (rom()->is_loaded()) {
     gui::TextWithSeparators("ROM Palette");
@@ -342,11 +340,13 @@ absl::Status GraphicsEditor::UpdatePaletteColumn() {
   gui::SelectablePalettePipeline(edit_palette_sub_index_, refresh_graphics_,
                                  palette);
 
-  if (refresh_graphics_) {
-    rom()->bitmap_manager()[current_sheet_]->ApplyPaletteWithTransparent(
-        palette, edit_palette_sub_index_);
+  if (refresh_graphics_ && !open_sheets_.empty()) {
+    RETURN_IF_ERROR(
+        rom()->bitmap_manager()[current_sheet_]->ApplyPaletteWithTransparent(
+            palette, edit_palette_sub_index_));
     rom()->UpdateBitmap(
-        rom()->mutable_bitmap_manager()->mutable_bitmap(current_sheet_).get());
+        rom()->mutable_bitmap_manager()->mutable_bitmap(current_sheet_).get(),
+        true);
     refresh_graphics_ = false;
   }
 
@@ -377,9 +377,9 @@ absl::Status GraphicsEditor::UpdateLinkGfxView() {
     link_canvas_.DrawGrid();
 
     NEXT_COLUMN();
+    ImGui::Text("Placeholder");
 
     NEXT_COLUMN();
-
     if (ImGui::Button("Load Link Graphics (Experimental)")) {
       if (rom()->is_loaded()) {
         // Load Links graphics from the ROM
@@ -736,7 +736,7 @@ absl::Status GraphicsEditor::DecompressImportData(int size) {
                      converted_sheet);
 
   if (rom()->is_loaded()) {
-    ASSIGN_OR_RETURN(auto palette_group, rom()->palette_group("ow_main"));
+    auto palette_group = rom()->palette_group().overworld_animated;
     z3_rom_palette_ = palette_group[current_palette_];
     if (col_file_) {
       bin_bitmap_.ApplyPalette(col_file_palette_);
@@ -768,10 +768,10 @@ absl::Status GraphicsEditor::DecompressSuperDonkey() {
           col_file_palette_group_[current_palette_index_]);
     } else {
       // ROM palette
-      ASSIGN_OR_RETURN(
-          auto palette_group,
-          rom()->palette_group(kPaletteGroupAddressesKeys[current_palette_]));
-      z3_rom_palette_ = palette_group[current_palette_index_];
+
+      auto palette_group = rom()->palette_group().get_group(
+          kPaletteGroupAddressesKeys[current_palette_]);
+      z3_rom_palette_ = *palette_group->mutable_palette(current_palette_index_);
       graphics_bin_[i].ApplyPalette(z3_rom_palette_);
     }
 
@@ -794,10 +794,9 @@ absl::Status GraphicsEditor::DecompressSuperDonkey() {
           col_file_palette_group_[current_palette_index_]);
     } else {
       // ROM palette
-      ASSIGN_OR_RETURN(
-          auto palette_group,
-          rom()->palette_group(kPaletteGroupAddressesKeys[current_palette_]));
-      z3_rom_palette_ = palette_group[current_palette_index_];
+      auto palette_group = rom()->palette_group().get_group(
+          kPaletteGroupAddressesKeys[current_palette_]);
+      z3_rom_palette_ = *palette_group->mutable_palette(current_palette_index_);
       graphics_bin_[i].ApplyPalette(z3_rom_palette_);
     }
 

src/app/editor/modules/gfx_group_editor.cc

@@ -6,8 +6,8 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "app/editor/utils/editor.h"
 #include "app/editor/modules/palette_editor.h"
+#include "app/editor/utils/editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"
@@ -220,29 +220,20 @@ void GfxGroupEditor::DrawPaletteViewer() {
   gui::InputHexByte("Dungeon Spr Pal 2", &dungeon_spr_pal_2_val);
   gui::InputHexByte("Dungeon Spr Pal 3", &dungeon_spr_pal_3_val);
 
-  auto &palette =
-      *rom()
-           ->mutable_palette_group(
-               "dungeon_main")[rom()->paletteset_ids[selected_paletteset][0]]
-           .mutable_palette(0);
+  auto &palette = *rom()->mutable_palette_group()->dungeon_main.mutable_palette(
+      rom()->paletteset_ids[selected_paletteset][0]);
   DrawPaletteFromPaletteGroup(palette);
   auto &spr_aux_pal1 =
-      *rom()
-           ->mutable_palette_group(
-               "sprites_aux1")[rom()->paletteset_ids[selected_paletteset][1]]
-           .mutable_palette(0);
+      *rom()->mutable_palette_group()->sprites_aux1.mutable_palette(
+          rom()->paletteset_ids[selected_paletteset][1]);
   DrawPaletteFromPaletteGroup(spr_aux_pal1);
   auto &spr_aux_pal2 =
-      *rom()
-           ->mutable_palette_group(
-               "sprites_aux2")[rom()->paletteset_ids[selected_paletteset][2]]
-           .mutable_palette(0);
+      *rom()->mutable_palette_group()->sprites_aux2.mutable_palette(
+          rom()->paletteset_ids[selected_paletteset][2]);
   DrawPaletteFromPaletteGroup(spr_aux_pal2);
   auto &spr_aux_pal3 =
-      *rom()
-           ->mutable_palette_group(
-               "sprites_aux3")[rom()->paletteset_ids[selected_paletteset][3]]
-           .mutable_palette(0);
+      *rom()->mutable_palette_group()->sprites_aux3.mutable_palette(
+          rom()->paletteset_ids[selected_paletteset][3]);
   DrawPaletteFromPaletteGroup(spr_aux_pal3);
 }
 

src/app/editor/modules/palette_editor.cc

@@ -78,7 +78,6 @@ absl::Status PaletteEditor::Update() {
 absl::Status PaletteEditor::EditColorInPalette(gfx::SnesPalette& palette,
                                                int index) {
   if (index >= palette.size()) {
-    // Handle error: the index is out of bounds
     return absl::InvalidArgumentError("Index out of bounds");
   }
 
@@ -108,18 +107,18 @@ absl::Status PaletteEditor::DrawPaletteGroup(int category) {
   if (!rom()->is_loaded()) {
     return absl::NotFoundError("ROM not open, no palettes to display");
   }
-  ASSIGN_OR_RETURN(auto palette_group,
-                   rom()->palette_group(kPaletteGroupNames[category].data()));
+
+  std::string group_name = kPaletteGroupNames[category].data();
+  auto palette_group = *rom()->palette_group().get_group(group_name);
   const auto size = palette_group.size();
-  auto palettes =
-      rom()->mutable_palette_group(kPaletteGroupNames[category].data());
+
   static bool edit_color = false;
   for (int j = 0; j < size; j++) {
     // ImGui::Text("%d", j);
     rom()->resource_label()->SelectableLabelWithNameEdit(
         false, "Palette Group Name", std::to_string(j),
         std::string(kPaletteGroupNames[category]));
-    auto palette = palettes->mutable_palette(j);
+    auto palette = palette_group.mutable_palette(j);
     auto pal_size = palette->size();
 
     for (int n = 0; n < pal_size; n++) {
@@ -155,8 +154,7 @@ absl::Status PaletteEditor::HandleColorPopup(gfx::SnesPalette& palette, int i,
                                              int j, int n) {
   auto col = gfx::ToFloatArray(palette[n]);
   if (gui::SnesColorEdit4("Edit Color", palette[n], color_popup_flags)) {
-    RETURN_IF_ERROR(rom()->UpdatePaletteColor(kPaletteGroupNames[i].data(), j,
-                                              n, palette[n]))
+    // TODO: Implement new update color function
   }
 
   if (ImGui::Button("Copy as..", ImVec2(-1, 0))) ImGui::OpenPopup("Copy");

src/app/editor/modules/tile16_editor.cc

@@ -6,8 +6,8 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "app/editor/utils/editor.h"
 #include "app/editor/modules/palette_editor.h"
+#include "app/editor/utils/editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"
@@ -124,7 +124,7 @@ absl::Status Tile16Editor::UpdateBlockset() {
     if (notify_tile16.modified()) {
       current_tile16_ = notify_tile16.get();
       current_tile16_bmp_ = tile16_individual_[notify_tile16];
-      ASSIGN_OR_RETURN(auto ow_main_pal_group, rom()->palette_group("ow_main"));
+      auto ow_main_pal_group = rom()->palette_group().overworld_main;
       RETURN_IF_ERROR(current_tile16_bmp_.ApplyPalette(
           ow_main_pal_group[current_palette_]));
       rom()->RenderBitmap(&current_tile16_bmp_);
@@ -168,7 +168,7 @@ absl::Status Tile16Editor::DrawToCurrentTile16(ImVec2 click_position) {
 }
 
 absl::Status Tile16Editor::UpdateTile16Edit() {
-  ASSIGN_OR_RETURN(auto ow_main_pal_group, rom()->palette_group("ow_main"));
+  auto ow_main_pal_group = rom()->palette_group().overworld_main;
 
   if (ImGui::BeginChild("Tile8 Selector",
                         ImVec2(ImGui::GetContentRegionAvail().x, 0x175),
@@ -255,7 +255,7 @@ absl::Status Tile16Editor::DrawTileEditControls() {
 }
 
 absl::Status Tile16Editor::LoadTile8() {
-  ASSIGN_OR_RETURN(auto ow_main_pal_group, rom()->palette_group("ow_main"));
+  auto ow_main_pal_group = rom()->palette_group().overworld_main;
 
   current_gfx_individual_.reserve(1024);
 

src/app/editor/modules/tile16_editor.h

@@ -7,9 +7,9 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "app/editor/utils/editor.h"
 #include "app/editor/context/gfx_context.h"
 #include "app/editor/modules/palette_editor.h"
+#include "app/editor/utils/editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"
@@ -60,7 +60,7 @@ class Tile16Editor : public context::GfxContext, public SharedROM {
   absl::Status set_tile16(int id) {
     current_tile16_ = id;
     current_tile16_bmp_ = tile16_individual_[id];
-    ASSIGN_OR_RETURN(auto ow_main_pal_group, rom()->palette_group("ow_main"));
+    auto ow_main_pal_group = rom()->palette_group().overworld_main;
     RETURN_IF_ERROR(
         current_tile16_bmp_.ApplyPalette(ow_main_pal_group[current_palette_]));
     rom()->RenderBitmap(&current_tile16_bmp_);