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

Refactor DungeonEditor::RefreshGraphics for improved readability and consistency

Browse Source
This commit is contained in:
scawful
2024-12-29 16:02:47 -05:00
parent bf862f2d5a
commit 17659eccab
1 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/editor/dungeon/dungeon_editor.cc
View File

@@ -10,6 +10,7 @@
#include "app/rom.h" #include "app/rom.h"
#include "app/zelda3/dungeon/object_names.h" #include "app/zelda3/dungeon/object_names.h"
#include "imgui/imgui.h" #include "imgui/imgui.h"
#include "imgui_memory_editor.h"
#include "zelda3/dungeon/room.h" #include "zelda3/dungeon/room.h"
namespace yaze { namespace yaze {
@@ -117,36 +118,24 @@ absl::Status DungeonEditor::Initialize() {
} }
absl::Status DungeonEditor::RefreshGraphics() { absl::Status DungeonEditor::RefreshGraphics() {
for (int i = 0; i < 8; i++) { std::for_each_n(
int block = rooms_[current_room_id_].blocks()[i]; rooms_[current_room_id_].blocks().begin(), 8,
RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
current_palette_group_[current_palette_id_], 0));
Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]);
}
std::for_each_n(rooms_[current_room_id_].blocks().begin(), 8,
[this](int block) -> absl::Status { [this](int block) -> absl::Status {
RETURN_IF_ERROR( RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
graphics_bin_[block].ApplyPaletteWithTransparent(
current_palette_group_[current_palette_id_], 0)); current_palette_group_[current_palette_id_], 0));
Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]); Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]);
return absl::OkStatus(); return absl::OkStatus();
}); });
auto sprites_aux1_pal_group = rom()->palette_group().sprites_aux1; auto sprites_aux1_pal_group = rom()->palette_group().sprites_aux1;
std::for_each_n(rooms_[current_room_id_].blocks().begin() + 8, 8, std::for_each_n(
rooms_[current_room_id_].blocks().begin() + 8, 8,
[this, &sprites_aux1_pal_group](int block) -> absl::Status { [this, &sprites_aux1_pal_group](int block) -> absl::Status {
RETURN_IF_ERROR( RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
graphics_bin_[block].ApplyPaletteWithTransparent(
sprites_aux1_pal_group[current_palette_id_], 0)); sprites_aux1_pal_group[current_palette_id_], 0));
Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]); Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]);
return absl::OkStatus(); return absl::OkStatus();
}); });
for (int i = 9; i < 16; i++) {
int block = rooms_[current_room_id_].blocks()[i];
RETURN_IF_ERROR(graphics_bin_[block].ApplyPaletteWithTransparent(
sprites_aux1_pal_group[current_palette_id_], 0));
Renderer::GetInstance().UpdateBitmap(&graphics_bin_[block]);
}
return absl::OkStatus(); return absl::OkStatus();
} }