scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mark BitmapManager as deprecated, transitioning to fixed arrays or vectors over hash map

Browse Source
This commit is contained in:
scawful
2024-08-06 19:19:28 -04:00
parent 543bc3d204
commit 7e5b3858f4
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/gfx/bitmap.h
View File

@@ -234,6 +234,7 @@ using BitmapTable = std::unordered_map<int, gfx::Bitmap>;
/** /**
* @brief Hash map container of shared pointers to Bitmaps. * @brief Hash map container of shared pointers to Bitmaps.
* \deprecated Moved to fixed array or vector for storing groups of bitmaps.
*/ */
class BitmapManager { class BitmapManager {
private: private:

15
src/app/rom.h
View File

@@ -421,13 +421,15 @@ class Rom : public core::ExperimentFlags {
// Full graphical data for the game // Full graphical data for the game
Bytes graphics_buffer() const { return graphics_buffer_; } Bytes graphics_buffer() const { return graphics_buffer_; }
gfx::BitmapTable graphics_bin() const { return graphics_bin_; } [[deprecated]] gfx::BitmapTable graphics_bin() const { return graphics_bin_; }
gfx::Bitmap* mutable_graphics_sheet(int index) { [[deprecated]] gfx::Bitmap* mutable_graphics_sheet(int index) {
return &graphics_bin_.at(index); return &graphics_bin_.at(index);
} }
auto bitmap_manager() { return graphics_manager_; }
auto mutable_bitmap_manager() { return &graphics_manager_; } [[deprecated]] auto bitmap_manager() { return graphics_manager_; }
[[deprecated]] auto mutable_bitmap_manager() { return &graphics_manager_; }
auto link_graphics() { return link_graphics_; } auto link_graphics() { return link_graphics_; }
auto mutable_link_graphics() { return &link_graphics_; } auto mutable_link_graphics() { return &link_graphics_; }
@@ -505,7 +507,6 @@ class Rom : public core::ExperimentFlags {
void SaveGroupsToRom(); void SaveGroupsToRom();
auto resource_label() { return &resource_label_manager_; } auto resource_label() { return &resource_label_manager_; }
auto font_gfx_data() { return font_gfx_data_; }
private: private:
struct WriteAction { struct WriteAction {
@@ -569,7 +570,9 @@ class Rom : public core::ExperimentFlags {
Z3_Version version_ = Z3_Version::US; Z3_Version version_ = Z3_Version::US;
gfx::BitmapTable graphics_bin_; gfx::BitmapTable graphics_bin_;
gfx::BitmapManager graphics_manager_;
[[deprecated("BitmapManager has unpredictable destructor behavior.")]] gfx::
BitmapManager graphics_manager_;
gfx::BitmapTable link_graphics_; gfx::BitmapTable link_graphics_;
gfx::SnesPalette link_palette_; gfx::SnesPalette link_palette_;
gfx::PaletteGroupMap palette_groups_; gfx::PaletteGroupMap palette_groups_;