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

update palette editor table columns

Browse Source
This commit is contained in:
scawful
2024-07-17 18:38:09 -04:00
parent 8501369fc1
commit ada4efe6b2
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/editor/graphics/palette_editor.cc
View File

@@ -84,6 +84,8 @@ absl::Status PaletteEditor::Update() {
"Palette Group Name", std::to_string(i), "Palette Group Name", std::to_string(i),
std::string(kPaletteGroupNames[i])); std::string(kPaletteGroupNames[i]));
} }
} else {
return absl::NotFoundError("ROM not open, no palettes to display");
} }
if (BeginTable("paletteEditorTable", 2, kPaletteTableFlags, ImVec2(0, 0))) { if (BeginTable("paletteEditorTable", 2, kPaletteTableFlags, ImVec2(0, 0))) {
@@ -120,17 +122,19 @@ absl::Status PaletteEditor::Update() {
} }
void PaletteEditor::DisplayCategoryTable() { void PaletteEditor::DisplayCategoryTable() {
if (BeginTable("Category Table", 6, if (BeginTable("Category Table", 8,
ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable |
ImGuiTableFlags_SizingStretchSame | ImGuiTableFlags_SizingStretchSame |
ImGuiTableFlags_Hideable, ImGuiTableFlags_Hideable,
ImVec2(0, 0))) { ImVec2(0, 0))) {
TableSetupColumn("Weapons and Gear"); TableSetupColumn("Weapons and Gear");
TableSetupColumn("World and Global Sprites"); TableSetupColumn("Overworld and Area Colors");
TableSetupColumn("Global Sprites");
TableSetupColumn("Sprites Aux1"); TableSetupColumn("Sprites Aux1");
TableSetupColumn("Sprites Aux2"); TableSetupColumn("Sprites Aux2");
TableSetupColumn("Sprites Aux3"); TableSetupColumn("Sprites Aux3");
TableSetupColumn("Maps and Items"); TableSetupColumn("Maps and Items");
TableSetupColumn("Dungeons");
TableHeadersRow(); TableHeadersRow();
TableNextRow(); TableNextRow();
@@ -157,25 +161,21 @@ void PaletteEditor::DisplayCategoryTable() {
status_ = DrawPaletteGroup(PaletteCategory::kAreaColors); status_ = DrawPaletteGroup(PaletteCategory::kAreaColors);
TreePop(); TreePop();
} }
if (TreeNode("Enemies")) {
status_ = DrawPaletteGroup(PaletteCategory::kGlobalSprites);
TreePop();
}
TableSetColumnIndex(2); TableSetColumnIndex(2);
status_ = DrawPaletteGroup(PaletteCategory::kSpritesAux1); status_ = DrawPaletteGroup(PaletteCategory::kGlobalSprites);
TreePop();
TableSetColumnIndex(3); TableSetColumnIndex(3);
status_ = DrawPaletteGroup(PaletteCategory::kSpritesAux2); status_ = DrawPaletteGroup(PaletteCategory::kSpritesAux1);
TableSetColumnIndex(4); TableSetColumnIndex(4);
status_ = DrawPaletteGroup(PaletteCategory::kSpritesAux3); status_ = DrawPaletteGroup(PaletteCategory::kSpritesAux2);
TableSetColumnIndex(5); TableSetColumnIndex(5);
if (TreeNode("Dungeons")) { status_ = DrawPaletteGroup(PaletteCategory::kSpritesAux3);
status_ = DrawPaletteGroup(PaletteCategory::kDungeons);
TreePop(); TableSetColumnIndex(6);
}
if (TreeNode("World Map")) { if (TreeNode("World Map")) {
status_ = DrawPaletteGroup(PaletteCategory::kWorldMap); status_ = DrawPaletteGroup(PaletteCategory::kWorldMap);
TreePop(); TreePop();
@@ -192,6 +192,11 @@ void PaletteEditor::DisplayCategoryTable() {
status_ = DrawPaletteGroup(PaletteCategory::kCrystal); status_ = DrawPaletteGroup(PaletteCategory::kCrystal);
TreePop(); TreePop();
} }
TableSetColumnIndex(7);
status_ = DrawPaletteGroup(PaletteCategory::kDungeons);
TreePop();
EndTable(); EndTable();
} }
} }