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

Switch GfxGroupEditor to BitmapManager for gfx

Browse Source
This commit is contained in:
scawful
2023-11-12 19:18:05 -05:00
parent f868a7e580
commit bb806c51a7
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,15 +59,15 @@ absl::Status GfxGroupEditor::Update() {
ImGui::BeginGroup(); ImGui::BeginGroup();
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
int sheet_id = rom()->main_blockset_ids[selected_blockset_][i]; int sheet_id = rom()->main_blockset_ids[selected_blockset_][i];
auto &sheet = *rom()->BitmapManager()[sheet_id];
if (sheet_id != last_sheet_id_) { if (sheet_id != last_sheet_id_) {
last_sheet_id_ = sheet_id; last_sheet_id_ = sheet_id;
auto palette_group = rom()->GetPaletteGroup("ow_main"); auto palette_group = rom()->GetPaletteGroup("ow_main");
auto palette = palette_group[preview_palette_id_]; auto palette = palette_group[preview_palette_id_];
graphics_bin_[sheet_id].ApplyPalette(palette); sheet.ApplyPalette(palette);
rom()->UpdateBitmap(&graphics_bin_[sheet_id]); rom()->UpdateBitmap(&sheet);
} }
core::BitmapCanvasPipeline(blockset_canvas_, core::BitmapCanvasPipeline(blockset_canvas_, sheet, 256,
graphics_bin_[sheet_id], 256,
0x10 * 0x04, 0x20, true, false, 22); 0x10 * 0x04, 0x20, true, false, 22);
} }
ImGui::EndGroup(); ImGui::EndGroup();
@@ -109,8 +109,9 @@ absl::Status GfxGroupEditor::Update() {
ImGui::BeginGroup(); ImGui::BeginGroup();
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
int sheet_id = rom()->room_blockset_ids[selected_roomset_][i]; int sheet_id = rom()->room_blockset_ids[selected_roomset_][i];
core::BitmapCanvasPipeline(roomset_canvas_, graphics_bin_[sheet_id], auto &sheet = *rom()->BitmapManager()[sheet_id];
256, 0x10 * 0x04, 0x20, true, false, 23); core::BitmapCanvasPipeline(roomset_canvas_, sheet, 256, 0x10 * 0x04,
0x20, true, false, 23);
} }
ImGui::EndGroup(); ImGui::EndGroup();
} }
@@ -151,8 +152,8 @@ absl::Status GfxGroupEditor::Update() {
ImGui::BeginGroup(); ImGui::BeginGroup();
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
int sheet_id = rom()->spriteset_ids[selected_spriteset_][i]; int sheet_id = rom()->spriteset_ids[selected_spriteset_][i];
core::BitmapCanvasPipeline(spriteset_canvas_, auto sheet = *rom()->BitmapManager()[sheet_id];
graphics_bin_[sheet_id], 256, core::BitmapCanvasPipeline(spriteset_canvas_, sheet, 256,
0x10 * 0x04, 0x20, true, false, 24); 0x10 * 0x04, 0x20, true, false, 24);
} }
ImGui::EndGroup(); ImGui::EndGroup();
@@ -179,7 +180,6 @@ absl::Status GfxGroupEditor::Update() {
void GfxGroupEditor::InitBlockset(gfx::Bitmap tile16_blockset) { void GfxGroupEditor::InitBlockset(gfx::Bitmap tile16_blockset) {
tile16_blockset_bmp_ = tile16_blockset; tile16_blockset_bmp_ = tile16_blockset;
graphics_bin_ = rom()->GetGraphicsBin();
} }
} // namespace editor } // namespace editor

1
src/app/editor/modules/gfx_group_editor.h
View File

@@ -43,7 +43,6 @@ class GfxGroupEditor : public SharedROM {
gfx::SNESPalette palette_; gfx::SNESPalette palette_;
gfx::PaletteGroup palette_group_; gfx::PaletteGroup palette_group_;
gfx::Bitmap tile16_blockset_bmp_; gfx::Bitmap tile16_blockset_bmp_;
gfx::BitmapTable graphics_bin_;
std::vector<Bytes> tile16_individual_data_; std::vector<Bytes> tile16_individual_data_;
std::vector<gfx::Bitmap> tile16_individual_; std::vector<gfx::Bitmap> tile16_individual_;