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

Refactor Tile16Editor

Browse Source
This commit is contained in:
scawful
2025-03-13 09:26:39 -04:00
parent e7720019fd
commit 12d2d212fd
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/editor/graphics/tile16_editor.cc
View File

@@ -85,16 +85,6 @@ absl::Status Tile16Editor::Update() {
return absl::InvalidArgumentError("Blockset not initialized, open a ROM."); return absl::InvalidArgumentError("Blockset not initialized, open a ROM.");
} }
RETURN_IF_ERROR(DrawMenu());
if (BeginTabBar("Tile16 Editor Tabs")) {
DrawTile16Editor();
RETURN_IF_ERROR(UpdateTile16Transfer());
EndTabBar();
}
return absl::OkStatus();
}
absl::Status Tile16Editor::DrawMenu() {
if (BeginMenuBar()) { if (BeginMenuBar()) {
if (BeginMenu("View")) { if (BeginMenu("View")) {
Checkbox("Show Collision Types", Checkbox("Show Collision Types",
@@ -103,6 +93,12 @@ absl::Status Tile16Editor::DrawMenu() {
} }
EndMenuBar(); EndMenuBar();
} }
if (BeginTabBar("Tile16 Editor Tabs")) {
DrawTile16Editor();
RETURN_IF_ERROR(UpdateTile16Transfer());
EndTabBar();
}
return absl::OkStatus(); return absl::OkStatus();
} }
@@ -118,20 +114,12 @@ void Tile16Editor::DrawTile16Editor() {
TableNextRow(); TableNextRow();
TableNextColumn(); TableNextColumn();
status_ = UpdateBlockset(); status_ = UpdateBlockset();
if (!status_.ok()) {
EndTable();
}
TableNextColumn(); TableNextColumn();
status_ = UpdateTile16Edit(); status_ = UpdateTile16Edit();
if (status_ != absl::OkStatus()) {
EndTable();
}
status_ = DrawTileEditControls();
EndTable(); EndTable();
} }
EndTabItem(); EndTabItem();
} }
} }
@@ -248,10 +236,7 @@ absl::Status Tile16Editor::UpdateTile16Edit() {
tile16_edit_canvas_.DrawOverlay(); tile16_edit_canvas_.DrawOverlay();
} }
EndChild(); EndChild();
return absl::OkStatus();
}
absl::Status Tile16Editor::DrawTileEditControls() {
Separator(); Separator();
Text("Options:"); Text("Options:");
gui::InputHexByte("Palette", &notify_palette.edit()); gui::InputHexByte("Palette", &notify_palette.edit());

3
src/app/editor/graphics/tile16_editor.h
View File

@@ -32,7 +32,6 @@ class Tile16Editor : public gfx::GfxContext, public SharedRom {
std::array<uint8_t, 0x200> &all_tiles_types); std::array<uint8_t, 0x200> &all_tiles_types);
absl::Status Update(); absl::Status Update();
absl::Status DrawMenu();
void DrawTile16Editor(); void DrawTile16Editor();
absl::Status UpdateTile16Transfer(); absl::Status UpdateTile16Transfer();
@@ -42,8 +41,6 @@ class Tile16Editor : public gfx::GfxContext, public SharedRom {
absl::Status UpdateTile16Edit(); absl::Status UpdateTile16Edit();
absl::Status DrawTileEditControls();
absl::Status UpdateTransferTileCanvas(); absl::Status UpdateTransferTileCanvas();
absl::Status LoadTile8(); absl::Status LoadTile8();