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

Move InitBlockset to header file of tile16 editor

Browse Source
This commit is contained in:
scawful
2024-04-07 12:57:54 -04:00
parent 779c756b8b
commit 653866f2df
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,18 +233,6 @@ void Tile16Editor::DrawTileEditControls() {
ImGui::Checkbox("Priority Tile", &priority_tile); ImGui::Checkbox("Priority Tile", &priority_tile);
} }
absl::Status Tile16Editor::InitBlockset(
const gfx::Bitmap& tile16_blockset_bmp, gfx::Bitmap current_gfx_bmp,
const std::vector<gfx::Bitmap>& tile16_individual,
uint8_t all_tiles_types[0x200]) {
all_tiles_types_ = all_tiles_types;
tile16_blockset_bmp_ = tile16_blockset_bmp;
tile16_individual_ = tile16_individual;
current_gfx_bmp_ = current_gfx_bmp;
tile8_gfx_data_ = current_gfx_bmp_.vector();
return absl::OkStatus();
}
absl::Status Tile16Editor::LoadTile8() { absl::Status Tile16Editor::LoadTile8() {
ASSIGN_OR_RETURN(auto ow_main_pal_group, rom()->palette_group("ow_main")); ASSIGN_OR_RETURN(auto ow_main_pal_group, rom()->palette_group("ow_main"));

14
src/app/editor/modules/tile16_editor.h
View File

@@ -38,10 +38,16 @@ class Tile16Editor : public GfxContext, public SharedROM {
absl::Status UpdateTransferTileCanvas(); absl::Status UpdateTransferTileCanvas();
absl::Status InitBlockset(const gfx::Bitmap& tile16_blockset_bmp, void InitBlockset(const gfx::Bitmap& tile16_blockset_bmp,
gfx::Bitmap current_gfx_bmp, gfx::Bitmap current_gfx_bmp,
const std::vector<gfx::Bitmap>& tile16_individual, const std::vector<gfx::Bitmap>& tile16_individual,
uint8_t all_tiles_types[0x200]); uint8_t all_tiles_types[0x200]) {
all_tiles_types_ = all_tiles_types;
tile16_blockset_bmp_ = tile16_blockset_bmp;
tile16_individual_ = tile16_individual;
current_gfx_bmp_ = current_gfx_bmp;
tile8_gfx_data_ = current_gfx_bmp_.vector();
}
absl::Status LoadTile8(); absl::Status LoadTile8();