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

Deprecation bitmap_manager efforts

Browse Source
This commit is contained in:
scawful
2024-08-13 21:33:45 -04:00
parent dd496f1f4d
commit c3c310a84c
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/editor/graphics/screen_editor.cc
View File

@@ -332,11 +332,10 @@ void ScreenEditor::DrawDungeonMapsEditor() {
if (!dungeon_maps_loaded_) { if (!dungeon_maps_loaded_) {
if (LoadDungeonMaps().ok()) { if (LoadDungeonMaps().ok()) {
if (LoadDungeonMapTile16().ok()) { if (LoadDungeonMapTile16().ok()) {
auto bitmap_manager = rom()->mutable_bitmap_manager(); sheets_.emplace(0, rom()->gfx_sheets()[212]);
sheets_.emplace(0, *bitmap_manager->mutable_bitmap(212)); sheets_.emplace(1, rom()->gfx_sheets()[213]);
sheets_.emplace(1, *bitmap_manager->mutable_bitmap(213)); sheets_.emplace(2, rom()->gfx_sheets()[214]);
sheets_.emplace(2, *bitmap_manager->mutable_bitmap(214)); sheets_.emplace(3, rom()->gfx_sheets()[215]);
sheets_.emplace(3, *bitmap_manager->mutable_bitmap(215));
dungeon_maps_loaded_ = true; dungeon_maps_loaded_ = true;
} else { } else {
ImGui::Text("Failed to load dungeon map tile16"); ImGui::Text("Failed to load dungeon map tile16");

3
src/app/zelda3/dungeon/object_renderer.cc
View File

@@ -137,8 +137,7 @@ void DungeonObjectRenderer::UpdateObjectBitmap() {
int x = column * 8; int x = column * 8;
int y = row * 8; int y = row * 8;
auto sheet = auto sheet = rom()->mutable_gfx_sheets()->at(vram_.sheets[sheet_number]);
rom()->mutable_bitmap_manager()->at(vram_.sheets[sheet_number]);
// Copy the tile from VRAM using the read tile_id // Copy the tile from VRAM using the read tile_id
sheet.Get8x8Tile(tile_id, x, y, tilemap_, tilemap_offset); sheet.Get8x8Tile(tile_id, x, y, tilemap_, tilemap_offset);