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

OverworldEditor column names

Browse Source
This commit is contained in:
Justin Scofield
2022-07-25 19:18:05 -04:00
parent 5f455b1d5e
commit ec40d548c5
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/editor/overworld_editor.cc
View File

@@ -131,13 +131,8 @@ absl::Status OverworldEditor::DrawToolset() {
void OverworldEditor::DrawOverworldMapSettings() { void OverworldEditor::DrawOverworldMapSettings() {
if (ImGui::BeginTable("#mapSettings", 7, ow_map_flags, ImVec2(0, 0), -1)) { if (ImGui::BeginTable("#mapSettings", 7, ow_map_flags, ImVec2(0, 0), -1)) {
ImGui::TableSetupColumn("##1stCol"); for (const auto &name : kOverworldSettingsColumnNames)
ImGui::TableSetupColumn("##gfxCol"); ImGui::TableSetupColumn(name.data());
ImGui::TableSetupColumn("##palCol");
ImGui::TableSetupColumn("##sprgfxCol");
ImGui::TableSetupColumn("##sprpalCol");
ImGui::TableSetupColumn("##msgidCol");
ImGui::TableSetupColumn("##2ndCol");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetNextItemWidth(100.f); ImGui::SetNextItemWidth(100.f);
@@ -175,7 +170,7 @@ void OverworldEditor::DrawOverworldMapSettings() {
ImGui::InputText("##msgid", spr_palette_, kMessageIdSize); ImGui::InputText("##msgid", spr_palette_, kMessageIdSize);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Checkbox("Show grid", &opt_enable_grid); ImGui::Checkbox("Show grid", &opt_enable_grid); // TODO
ImGui::EndTable(); ImGui::EndTable();
} }
} }

19
src/app/editor/overworld_editor.h
View File

@@ -19,11 +19,11 @@ namespace yaze {
namespace app { namespace app {
namespace editor { namespace editor {
static constexpr unsigned int k4BPP = 4; static constexpr uint k4BPP = 4;
static constexpr unsigned int kByteSize = 3; static constexpr uint kByteSize = 3;
static constexpr unsigned int kMessageIdSize = 5; static constexpr uint kMessageIdSize = 5;
static constexpr unsigned int kNumSheetsToLoad = 223; static constexpr uint kNumSheetsToLoad = 223;
static constexpr unsigned int kTile8DisplayHeight = 64; static constexpr uint kTile8DisplayHeight = 64;
static constexpr float kInputFieldSize = 30.f; static constexpr float kInputFieldSize = 30.f;
static constexpr absl::string_view kToolsetColumnNames[] = { static constexpr absl::string_view kToolsetColumnNames[] = {
@@ -32,11 +32,17 @@ static constexpr absl::string_view kToolsetColumnNames[] = {
"#entranceTool", "#exitTool", "#itemTool", "#spriteTool", "#entranceTool", "#exitTool", "#itemTool", "#spriteTool",
"#transportTool", "#musicTool", "#separator3", "#reloadTool"}; "#transportTool", "#musicTool", "#separator3", "#reloadTool"};
static constexpr absl::string_view kOverworldSettingsColumnNames[] = {
"##1stCol", "##gfxCol", "##palCol", "##sprgfxCol",
"##sprpalCol", "##msgidCol", "##2ndCol"};
class OverworldEditor { class OverworldEditor {
public: public:
void SetupROM(ROM &rom); void SetupROM(ROM &rom);
absl::Status Update(); absl::Status Update();
absl::Status Undo() { return absl::UnimplementedError("Undo"); }
private: private:
absl::Status DrawToolset(); absl::Status DrawToolset();
void DrawOverworldMapSettings(); void DrawOverworldMapSettings();
@@ -55,8 +61,7 @@ class OverworldEditor {
char spr_palette_[3] = ""; char spr_palette_[3] = "";
char message_id_[5] = ""; char message_id_[5] = "";
char staticgfx[16]; char staticgfx[16];
bool isLoaded = false;
bool doneLoaded = false;
bool opt_enable_grid = true; bool opt_enable_grid = true;
bool all_gfx_loaded_ = false; bool all_gfx_loaded_ = false;
bool map_blockset_loaded_ = false; bool map_blockset_loaded_ = false;