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

housekeeping, accessors, gui, etc

Browse Source
This commit is contained in:
scawful
2023-11-20 21:12:02 -05:00
parent 4ef2540d15
commit bbe76ac83c
12 changed files with 99 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/editor/modules/gfx_group_editor.cc
View File

@@ -59,7 +59,7 @@ absl::Status GfxGroupEditor::Update() {
ImGui::BeginGroup();
for (int i = 0; i < 8; i++) {
int sheet_id = rom()->main_blockset_ids[selected_blockset_][i];
auto &sheet = *rom()->BitmapManager()[sheet_id];
auto &sheet = *rom()->bitmap_manager()[sheet_id];
if (sheet_id != last_sheet_id_) {
last_sheet_id_ = sheet_id;
auto palette_group = rom()->GetPaletteGroup("ow_main");
@@ -109,7 +109,7 @@ absl::Status GfxGroupEditor::Update() {
ImGui::BeginGroup();
for (int i = 0; i < 4; i++) {
int sheet_id = rom()->room_blockset_ids[selected_roomset_][i];
auto &sheet = *rom()->BitmapManager()[sheet_id];
auto &sheet = *rom()->bitmap_manager()[sheet_id];
core::BitmapCanvasPipeline(roomset_canvas_, sheet, 256, 0x10 * 0x04,
0x20, true, false, 23);
}
@@ -152,7 +152,7 @@ absl::Status GfxGroupEditor::Update() {
ImGui::BeginGroup();
for (int i = 0; i < 4; i++) {
int sheet_id = rom()->spriteset_ids[selected_spriteset_][i];
auto sheet = *rom()->BitmapManager()[sheet_id];
auto sheet = *rom()->bitmap_manager()[sheet_id];
core::BitmapCanvasPipeline(spriteset_canvas_, sheet, 256,
0x10 * 0x04, 0x20, true, false, 24);
}

2
src/app/editor/modules/tile16_editor.cc
View File

@@ -120,7 +120,7 @@ absl::Status Tile16Editor::Update() {
if (transfer_started_ && !transfer_blockset_loaded_) {
PRINT_IF_ERROR(transfer_rom_.LoadAllGraphicsData())
graphics_bin_ = transfer_rom_.GetGraphicsBin();
graphics_bin_ = transfer_rom_.graphics_bin();
// Load the Link to the Past overworld.
PRINT_IF_ERROR(transfer_overworld_.Load(transfer_rom_))