remove shared_ptr semantics from BitmapManager as underlying texture/surface are already smart ptrs

src/app/editor/dungeon_editor.cc

@@ -92,7 +92,7 @@ absl::Status DungeonEditor::Initialize() {
   graphics_bin_ = *rom()->mutable_bitmap_manager();
   // Create a vector of pointers to the current block bitmaps
   for (int block : rooms_[current_room_id_].blocks()) {
-    room_gfx_sheets_.emplace_back(graphics_bin_[block].get());
+    room_gfx_sheets_.emplace_back(&graphics_bin_[block]);
   }
   return absl::OkStatus();
 }
@@ -100,16 +100,16 @@ absl::Status DungeonEditor::Initialize() {
 absl::Status DungeonEditor::RefreshGraphics() {
   for (int i = 0; i < 8; i++) {
     int block = rooms_[current_room_id_].blocks()[i];
-    RETURN_IF_ERROR(graphics_bin_[block].get()->ApplyPaletteWithTransparent(
+    RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
         current_palette_group_[current_palette_id_], 0));
-    rom()->UpdateBitmap(graphics_bin_[block].get(), true);
+    rom()->UpdateBitmap(&graphics_bin_[block], true);
   }
   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];
-    RETURN_IF_ERROR(graphics_bin_[block].get()->ApplyPaletteWithTransparent(
+    RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
         sprites_aux1_pal_group[current_palette_id_], 0));
-    rom()->UpdateBitmap(graphics_bin_[block].get(), true);
+    rom()->UpdateBitmap(&graphics_bin_[block], true);
   }
   return absl::OkStatus();
 }
@@ -505,7 +505,7 @@ void DungeonEditor::DrawRoomGraphics() {
         top_left_y = room_gfx_canvas_.zero_point().y + height * current_block;
       }
       room_gfx_canvas_.draw_list()->AddImage(
-          (void*)graphics_bin_[block].get()->texture(),
+          (void*)graphics_bin_[block].texture(),
           ImVec2(room_gfx_canvas_.zero_point().x + 2, top_left_y),
           ImVec2(room_gfx_canvas_.zero_point().x + 0x100,
                  room_gfx_canvas_.zero_point().y + offset));

src/app/editor/graphics_editor.cc

@@ -109,7 +109,7 @@ void GraphicsEditor::DrawGfxEditToolset() {
     TableNextColumn();
     if (Button(ICON_MD_CONTENT_COPY)) {
       std::vector<uint8_t> png_data =
-          rom()->bitmap_manager().shared_bitmap(current_sheet_)->GetPngData();
+          rom()->bitmap_manager().shared_bitmap(current_sheet_).GetPngData();
       CopyImageToClipboard(png_data);
     }
     HOVER_HINT("Copy to Clipboard");
@@ -124,10 +124,8 @@ void GraphicsEditor::DrawGfxEditToolset() {
             ->mutable_bitmap_manager()
             ->mutable_bitmap(current_sheet_)
             ->Create(width, height, 8, png_data);
-        rom()->UpdateBitmap(rom()
-                                ->mutable_bitmap_manager()
-                                ->mutable_bitmap(current_sheet_)
-                                .get());
+        rom()->UpdateBitmap(
+            rom()->mutable_bitmap_manager()->mutable_bitmap(current_sheet_));
       }
     }
     HOVER_HINT("Paste from Clipboard");
@@ -148,7 +146,7 @@ void GraphicsEditor::DrawGfxEditToolset() {
 
     TableNextColumn();
     auto bitmap = rom()->bitmap_manager()[current_sheet_];
-    auto palette = bitmap->palette();
+    auto palette = bitmap.palette();
     for (int i = 0; i < 8; i++) {
       ImGui::SameLine();
       auto color =
@@ -186,16 +184,16 @@ absl::Status GraphicsEditor::UpdateGfxSheetList() {
 
     graphics_bin_canvas_.DrawBackground(ImVec2(0x100 + 1, 0x40 + 1));
     graphics_bin_canvas_.DrawContextMenu();
-    if (value.get()->is_active()) {
-      auto texture = value.get()->texture();
+    if (value.is_active()) {
+      auto texture = value.texture();
       graphics_bin_canvas_.draw_list()->AddImage(
           (void*)texture,
           ImVec2(graphics_bin_canvas_.zero_point().x + 2,
                  graphics_bin_canvas_.zero_point().y + 2),
           ImVec2(graphics_bin_canvas_.zero_point().x +
-                     value.get()->width() * sheet_scale_,
+                     value.width() * sheet_scale_,
                  graphics_bin_canvas_.zero_point().y +
-                     value.get()->height() * sheet_scale_));
+                     value.height() * sheet_scale_));
 
       if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
         current_sheet_ = key;
@@ -269,7 +267,7 @@ absl::Status GraphicsEditor::UpdateGfxTabView() {
         };
 
         current_sheet_canvas_.UpdateColorPainter(
-            *rom()->bitmap_manager()[sheet_id], current_color_, draw_tile_event,
+            rom()->bitmap_manager()[sheet_id], current_color_, draw_tile_event,
             tile_size_, current_scale_);
 
         ImGui::EndChild();
@@ -302,7 +300,7 @@ absl::Status GraphicsEditor::UpdateGfxTabView() {
       current_sheet_ = id;
       //  ImVec2(0x100, 0x40),
       current_sheet_canvas_.UpdateColorPainter(
-          *rom()->bitmap_manager()[id], current_color_,
+          rom()->bitmap_manager()[id], current_color_,
           [&]() {
 
           },
@@ -342,11 +340,10 @@ absl::Status GraphicsEditor::UpdatePaletteColumn() {
 
   if (refresh_graphics_ && !open_sheets_.empty()) {
     RETURN_IF_ERROR(
-        rom()->bitmap_manager()[current_sheet_]->ApplyPaletteWithTransparent(
+        rom()->bitmap_manager()[current_sheet_].ApplyPaletteWithTransparent(
             palette, edit_palette_sub_index_));
     rom()->UpdateBitmap(
-        rom()->mutable_bitmap_manager()->mutable_bitmap(current_sheet_).get(),
-        true);
+        rom()->mutable_bitmap_manager()->mutable_bitmap(current_sheet_), true);
     refresh_graphics_ = false;
   }
 

src/app/editor/modules/gfx_group_editor.cc

@@ -113,7 +113,7 @@ void GfxGroupEditor::DrawBlocksetViewer(bool sheet_only) {
       ImGui::BeginGroup();
       for (int i = 0; i < 8; i++) {
         int sheet_id = rom()->main_blockset_ids[selected_blockset_][i];
-        auto &sheet = *rom()->bitmap_manager()[sheet_id];
+        auto sheet = rom()->bitmap_manager()[sheet_id];
         gui::BitmapCanvasPipeline(blockset_canvas_, sheet, 256, 0x10 * 0x04,
                                   0x20, true, false, 22);
       }
@@ -166,7 +166,7 @@ void GfxGroupEditor::DrawRoomsetViewer() {
       ImGui::BeginGroup();
       for (int i = 0; i < 4; i++) {
         int sheet_id = rom()->room_blockset_ids[selected_roomset_][i];
-        auto &sheet = *rom()->bitmap_manager()[sheet_id];
+        auto sheet = rom()->bitmap_manager()[sheet_id];
         gui::BitmapCanvasPipeline(roomset_canvas_, sheet, 256, 0x10 * 0x04,
                                   0x20, true, false, 23);
       }
@@ -204,7 +204,7 @@ void GfxGroupEditor::DrawSpritesetViewer(bool sheet_only) {
       ImGui::BeginGroup();
       for (int i = 0; i < 4; i++) {
         int sheet_id = rom()->spriteset_ids[selected_spriteset_][i];
-        auto sheet = *rom()->bitmap_manager()[115 + sheet_id];
+        auto sheet = rom()->bitmap_manager()[115 + sheet_id];
         gui::BitmapCanvasPipeline(spriteset_canvas_, sheet, 256, 0x10 * 0x04,
                                   0x20, true, false, 24);
       }

src/app/editor/overworld_editor.cc

@@ -769,7 +769,7 @@ void OverworldEditor::DrawTile8Selector() {
       if (key >= 1) {
         top_left_y = graphics_bin_canvas_.zero_point().y + 0x40 * key;
       }
-      auto texture = value.get()->texture();
+      auto texture = value.texture();
       graphics_bin_canvas_.draw_list()->AddImage(
           (void *)texture,
           ImVec2(graphics_bin_canvas_.zero_point().x + 2, top_left_y),

src/app/editor/sprite_editor.cc

@@ -156,7 +156,7 @@ void SpriteEditor::DrawCurrentSheets() {
     graphics_sheet_canvas_.DrawTileSelector(32);
     for (int i = 0; i < 8; i++) {
       graphics_sheet_canvas_.DrawBitmap(
-          *rom()->bitmap_manager()[current_sheets_[i]], 1, (i * 0x40) + 1, 2);
+          rom()->bitmap_manager()[current_sheets_[i]], 1, (i * 0x40) + 1, 2);
     }
     graphics_sheet_canvas_.DrawGrid();
     graphics_sheet_canvas_.DrawOverlay();