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

editor housekeeping

Browse Source
This commit is contained in:
scawful
2022-07-09 18:54:30 -04:00
parent b469cde90c
commit 908eb147a1
3 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/editor/assembly_editor.h
View File

@@ -24,8 +24,9 @@ class AssemblyEditor {
void DrawEditMenu(); void DrawEditMenu();
void SetEditorText(); void SetEditorText();
std::string current_file_;
bool file_is_loaded_ = false; bool file_is_loaded_ = false;
std::string current_file_;
TextEditor text_editor_; TextEditor text_editor_;
}; };

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

@@ -35,10 +35,6 @@ void OverworldEditor::Update() {
all_gfx_loaded_ = true; all_gfx_loaded_ = true;
} }
if (show_changelist_) {
DrawChangelist();
}
DrawToolset(); DrawToolset();
ImGui::Separator(); ImGui::Separator();
if (ImGui::BeginTable("#owEditTable", 2, ow_edit_flags, ImVec2(0, 0))) { if (ImGui::BeginTable("#owEditTable", 2, ow_edit_flags, ImVec2(0, 0))) {
@@ -80,14 +76,6 @@ void OverworldEditor::DrawToolset() {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Button(ICON_MD_REDO); ImGui::Button(ICON_MD_REDO);
ImGui::TableNextColumn();
if (ImGui::Button(ICON_MD_MANAGE_HISTORY)) {
if (!show_changelist_)
show_changelist_ = true;
else
show_changelist_ = false;
}
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text(ICON_MD_MORE_VERT); ImGui::Text(ICON_MD_MORE_VERT);
@@ -129,6 +117,9 @@ void OverworldEditor::DrawToolset() {
overworld_.Load(rom_, allGfx16Ptr); overworld_.Load(rom_, allGfx16Ptr);
} }
ImGui::TableNextColumn();
ImGui::Text(ICON_MD_MORE_VERT);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("Palette:"); ImGui::Text("Palette:");
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
@@ -428,15 +419,6 @@ void OverworldEditor::DrawTile8Selector() {
draw_list->PopClipRect(); draw_list->PopClipRect();
} }
void OverworldEditor::DrawChangelist() {
if (!ImGui::Begin("Changelist")) {
ImGui::End();
}
ImGui::Text("Test");
ImGui::End();
}
void OverworldEditor::LoadGraphics() { void OverworldEditor::LoadGraphics() {
for (int i = 0; i < kNumSheetsToLoad; i++) { for (int i = 0; i < kNumSheetsToLoad; i++) {
all_texture_sheet_[i] = rom_.DrawGraphicsSheet(i); all_texture_sheet_[i] = rom_.DrawGraphicsSheet(i);

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

@@ -28,8 +28,6 @@ class OverworldEditor {
void DrawTile16Selector(); void DrawTile16Selector();
void DrawTile8Selector(); void DrawTile8Selector();
void DrawChangelist();
void LoadBlockset(); void LoadBlockset();
void LoadGraphics(); void LoadGraphics();
@@ -61,7 +59,6 @@ class OverworldEditor {
bool isLoaded = false; bool isLoaded = false;
bool doneLoaded = false; bool doneLoaded = false;
bool opt_enable_grid = true; bool opt_enable_grid = true;
bool show_changelist_ = false;
bool all_gfx_loaded_ = false; bool all_gfx_loaded_ = false;
bool map_blockset_loaded_ = false; bool map_blockset_loaded_ = false;