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

SDL_Texture streaming in ROM, dungeon housekeeping

Browse Source
This commit is contained in:
scawful
2023-11-26 16:50:29 -05:00
parent d2fa9c0c53
commit e529e6ca34
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/rom.cc
View File

@@ -203,8 +203,8 @@ absl::StatusOr<Bytes> ROM::Load2BppGraphics() {
} }
absl::Status ROM::LoadLinkGraphics() { absl::Status ROM::LoadLinkGraphics() {
const auto link_gfx_offset = 0x80000; const auto link_gfx_offset = 81920; // $10:8000
const auto link_gfx_length = 0x500; const auto link_gfx_length = 0x800;
// Load Links graphics from the ROM // Load Links graphics from the ROM
for (int i = 0; i < 14; i++) { for (int i = 0; i < 14; i++) {

23
src/app/rom.h
View File

@@ -475,14 +475,27 @@ class ROM : public core::ExperimentFlags {
renderer_ = renderer; renderer_ = renderer;
} }
void RenderBitmap(gfx::Bitmap* bitmap) const { void RenderBitmap(gfx::Bitmap* bitmap) {
bitmap->CreateTexture(renderer_); if (flags()->kLoadTexturesAsStreaming) {
// bitmaps_to_create_.emplace(bitmap);
bitmap->CreateTexture(renderer_.get());
} else {
bitmap->CreateTexture(renderer_);
}
} }
void UpdateBitmap(gfx::Bitmap* bitmap) const { void UpdateBitmap(gfx::Bitmap* bitmap) {
bitmap->UpdateTexture(renderer_); if (flags()->kLoadTexturesAsStreaming) {
// bitmaps_to_render_.emplace(bitmap);
bitmap->UpdateTexture(renderer_.get());
} else {
bitmap->UpdateTexture(renderer_);
}
} }
std::stack<gfx::Bitmap*> bitmaps_to_create_;
std::stack<gfx::Bitmap*> bitmaps_to_render_;
auto bitmap_manager() { return graphics_manager_; } auto bitmap_manager() { return graphics_manager_; }
std::vector<std::vector<uint8_t>> main_blockset_ids; std::vector<std::vector<uint8_t>> main_blockset_ids;
@@ -604,7 +617,7 @@ class SharedROM {
return rom; return rom;
} }
private: // private:
static std::shared_ptr<ROM> shared_rom_; static std::shared_ptr<ROM> shared_rom_;
}; };

2
src/app/zelda3/dungeon/room_object.h
View File

@@ -188,7 +188,7 @@ class DungeonObjectRenderer : public SharedROM {
emu::MemoryImpl memory_; emu::MemoryImpl memory_;
emu::ClockImpl clock_; emu::ClockImpl clock_;
emu::CPU cpu{memory_, clock_}; emu::CPU cpu{memory_, clock_};
emu::PPU ppu{memory_, clock_}; emu::Ppu ppu{memory_, clock_};
gfx::Bitmap bitmap_; gfx::Bitmap bitmap_;
PseudoVram vram_; PseudoVram vram_;
}; };