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

update usage stats grids

Browse Source
This commit is contained in:
scawful
2024-09-01 14:31:54 -04:00
parent 4768e7a3ce
commit 7650c56e8d
2 changed files with 81 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/app/editor/overworld/overworld_editor.cc
View File

@@ -1268,54 +1268,94 @@ void OverworldEditor::DrawOverworldProperties() {
for (int i = 0; i < 0x40; i++) { for (int i = 0; i < 0x40; i++) {
std::string area_graphics_str = absl::StrFormat( std::string area_graphics_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i)->area_graphics()); "%02hX", overworld_.overworld_map(i)->area_graphics());
properties_canvas_.mutable_labels(0)->push_back(area_graphics_str); properties_canvas_.mutable_labels(OverworldProperty::LW_AREA_GFX)
->push_back(area_graphics_str);
area_graphics_str = absl::StrFormat( area_graphics_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i + 0x40)->area_graphics()); "%02hX", overworld_.overworld_map(i + 0x40)->area_graphics());
properties_canvas_.mutable_labels(3)->push_back(area_graphics_str); properties_canvas_.mutable_labels(OverworldProperty::DW_AREA_GFX)
} ->push_back(area_graphics_str);
for (int i = 0; i < 0x40; i++) {
std::string area_palette_str = std::string area_palette_str =
absl::StrFormat("%02hX", overworld_.overworld_map(i)->area_palette()); absl::StrFormat("%02hX", overworld_.overworld_map(i)->area_palette());
properties_canvas_.mutable_labels(1)->push_back(area_palette_str); properties_canvas_.mutable_labels(OverworldProperty::LW_AREA_PAL)
->push_back(area_palette_str);
area_palette_str = absl::StrFormat( area_palette_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i + 0x40)->area_palette()); "%02hX", overworld_.overworld_map(i + 0x40)->area_palette());
properties_canvas_.mutable_labels(4)->push_back(area_palette_str); properties_canvas_.mutable_labels(OverworldProperty::DW_AREA_PAL)
} ->push_back(area_palette_str);
for (int i = 0; i < 0x40; i++) {
std::string sprite_gfx_str = absl::StrFormat( std::string sprite_gfx_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i)->sprite_graphics(1)); "%02hX", overworld_.overworld_map(i)->sprite_graphics(1));
properties_canvas_.mutable_labels(6)->push_back(sprite_gfx_str); properties_canvas_.mutable_labels(OverworldProperty::LW_SPR_GFX_PART1)
->push_back(sprite_gfx_str);
sprite_gfx_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i)->sprite_graphics(2));
properties_canvas_.mutable_labels(OverworldProperty::LW_SPR_GFX_PART2)
->push_back(sprite_gfx_str);
sprite_gfx_str = absl::StrFormat( sprite_gfx_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i + 0x40)->sprite_graphics(1)); "%02hX", overworld_.overworld_map(i + 0x40)->sprite_graphics(1));
properties_canvas_.mutable_labels(7)->push_back(sprite_gfx_str); properties_canvas_.mutable_labels(OverworldProperty::DW_SPR_GFX_PART1)
} ->push_back(sprite_gfx_str);
for (int i = 0; i < 0x40; i++) {
sprite_gfx_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i + 0x40)->sprite_graphics(2));
properties_canvas_.mutable_labels(OverworldProperty::DW_SPR_GFX_PART2)
->push_back(sprite_gfx_str);
std::string sprite_palette_str = absl::StrFormat( std::string sprite_palette_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i)->sprite_palette(1)); "%02hX", overworld_.overworld_map(i)->sprite_palette(1));
properties_canvas_.mutable_labels(2)->push_back(sprite_palette_str); properties_canvas_.mutable_labels(OverworldProperty::LW_SPR_PAL_PART1)
->push_back(sprite_palette_str);
sprite_palette_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i)->sprite_palette(2));
properties_canvas_.mutable_labels(OverworldProperty::LW_SPR_PAL_PART2)
->push_back(sprite_palette_str);
sprite_palette_str = absl::StrFormat( sprite_palette_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i + 0x40)->sprite_palette(1)); "%02hX", overworld_.overworld_map(i + 0x40)->sprite_palette(1));
properties_canvas_.mutable_labels(5)->push_back(sprite_palette_str); properties_canvas_.mutable_labels(OverworldProperty::DW_SPR_PAL_PART1)
->push_back(sprite_palette_str);
sprite_palette_str = absl::StrFormat(
"%02hX", overworld_.overworld_map(i + 0x40)->sprite_palette(2));
properties_canvas_.mutable_labels(OverworldProperty::DW_SPR_PAL_PART2)
->push_back(sprite_palette_str);
} }
init_properties = true; init_properties = true;
} }
Text("Area Gfx LW/DW"); Text("Area Gfx LW/DW");
properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32, 0); properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32,
OverworldProperty::LW_AREA_GFX);
SameLine(); SameLine();
properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32, 1); properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32,
OverworldProperty::DW_AREA_GFX);
ImGui::Separator(); ImGui::Separator();
Text("Sprite Gfx LW/DW"); Text("Sprite Gfx LW/DW");
properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32, 6); properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32,
OverworldProperty::LW_SPR_GFX_PART1);
SameLine(); SameLine();
properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32, 7); properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32,
OverworldProperty::DW_SPR_GFX_PART1);
SameLine();
properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32,
OverworldProperty::LW_SPR_GFX_PART2);
SameLine();
properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32,
OverworldProperty::DW_SPR_GFX_PART2);
ImGui::Separator(); ImGui::Separator();
Text("Area Pal LW/DW"); Text("Area Pal LW/DW");
properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32, 2); properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32,
OverworldProperty::LW_AREA_PAL);
SameLine(); SameLine();
properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32, 3); properties_canvas_.UpdateInfoGrid(ImVec2(256, 256), 8, 2.0f, 32,
OverworldProperty::DW_AREA_PAL);
static bool show_gfx_group = false; static bool show_gfx_group = false;
Checkbox("Show Gfx Group Editor", &show_gfx_group); Checkbox("Show Gfx Group Editor", &show_gfx_group);

26
src/app/editor/overworld/overworld_editor.h
View File

@@ -50,11 +50,12 @@ constexpr ImGuiTableFlags kOWEditFlags =
ImGuiTableFlags_BordersV; ImGuiTableFlags_BordersV;
static constexpr absl::string_view kToolsetColumnNames[] = { static constexpr absl::string_view kToolsetColumnNames[] = {
"#undoTool", "#redoTool", "#separator2", "#zoomOutTool", "#undoTool", "#redoTool", "#separator2", "#zoomOutTool",
"#zoomInTool", "#separator", "#drawTool", "#history", "#zoomInTool", "#separator", "#drawTool", "#history",
"#entranceTool", "#exitTool", "#itemTool", "#spriteTool", "#entranceTool", "#exitTool", "#itemTool", "#spriteTool",
"#transportTool", "#musicTool", "#separator3", "#tilemapTool", "#transportTool", "#musicTool", "#separator3", "#tilemapTool",
"propertiesTool", "#separator4", "#experimentalTool", "#properties", "#separator5"}; "propertiesTool", "#separator4", "#experimentalTool", "#properties",
"#separator5"};
constexpr absl::string_view kWorldList = constexpr absl::string_view kWorldList =
"Light World\0Dark World\0Extra World\0"; "Light World\0Dark World\0Extra World\0";
@@ -230,6 +231,21 @@ class OverworldEditor : public Editor,
EditingMode current_mode = EditingMode::DRAW_TILE; EditingMode current_mode = EditingMode::DRAW_TILE;
EditingMode previous_mode = EditingMode::DRAW_TILE; EditingMode previous_mode = EditingMode::DRAW_TILE;
enum OverworldProperty {
LW_AREA_GFX,
DW_AREA_GFX,
LW_AREA_PAL,
DW_AREA_PAL,
LW_SPR_GFX_PART1,
LW_SPR_GFX_PART2,
DW_SPR_GFX_PART1,
DW_SPR_GFX_PART2,
LW_SPR_PAL_PART1,
LW_SPR_PAL_PART2,
DW_SPR_PAL_PART1,
DW_SPR_PAL_PART2,
};
int current_world_ = 0; int current_world_ = 0;
int current_map_ = 0; int current_map_ = 0;
int current_parent_ = 0; int current_parent_ = 0;