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

Move GraphicsSheetManager to snes.h

Browse Source
This commit is contained in:
scawful
2025-04-30 17:49:09 -04:00
parent 3bd05f6beb
commit e202d65780
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/rom.h
View File

@@ -225,23 +225,6 @@ class Rom {
zelda3_version version_ = zelda3_version::US; zelda3_version version_ = zelda3_version::US;
}; };
class GraphicsSheetManager {
public:
static GraphicsSheetManager& GetInstance() {
static GraphicsSheetManager instance;
return instance;
}
GraphicsSheetManager() = default;
virtual ~GraphicsSheetManager() = default;
std::array<gfx::Bitmap, kNumGfxSheets>& gfx_sheets() { return gfx_sheets_; }
auto gfx_sheet(int i) { return gfx_sheets_[i]; }
auto mutable_gfx_sheet(int i) { return &gfx_sheets_[i]; }
auto mutable_gfx_sheets() { return &gfx_sheets_; }
private:
std::array<gfx::Bitmap, kNumGfxSheets> gfx_sheets_;
};
/** /**
* @brief This function iterates over all graphics sheets in the Rom and loads * @brief This function iterates over all graphics sheets in the Rom and loads
* them into memory. Depending on the sheet's index, it may be uncompressed or * them into memory. Depending on the sheet's index, it may be uncompressed or

20
src/app/snes.h
View File

@@ -1,10 +1,30 @@
#ifndef YAZE_SNES_H_ #ifndef YAZE_SNES_H_
#define YAZE_SNES_H_ #define YAZE_SNES_H_
#include <array>
#include <cstdint> #include <cstdint>
#include "app/gfx/bitmap.h"
namespace yaze { namespace yaze {
class GraphicsSheetManager {
public:
static GraphicsSheetManager& GetInstance() {
static GraphicsSheetManager instance;
return instance;
}
GraphicsSheetManager() = default;
virtual ~GraphicsSheetManager() = default;
std::array<gfx::Bitmap, 223>& gfx_sheets() { return gfx_sheets_; }
auto gfx_sheet(int i) { return gfx_sheets_[i]; }
auto mutable_gfx_sheet(int i) { return &gfx_sheets_[i]; }
auto mutable_gfx_sheets() { return &gfx_sheets_; }
private:
std::array<gfx::Bitmap, 223> gfx_sheets_;
};
inline uint32_t SnesToPc(uint32_t addr) noexcept { inline uint32_t SnesToPc(uint32_t addr) noexcept {
constexpr uint32_t kFastRomRegion = 0x808000; constexpr uint32_t kFastRomRegion = 0x808000;
if (addr >= kFastRomRegion) { if (addr >= kFastRomRegion) {