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

move assembly_editor to code dir

Browse Source
This commit is contained in:
scawful
2024-07-13 13:37:56 -04:00
parent 934b9e05f3
commit a3c6b0cdec
7 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -15,7 +15,7 @@ set(
app/editor/sprite_editor.cc app/editor/sprite_editor.cc
app/editor/modules/music_editor.cc app/editor/modules/music_editor.cc
app/editor/modules/palette_editor.cc app/editor/modules/palette_editor.cc
app/editor/modules/assembly_editor.cc app/editor/code/assembly_editor.cc
app/editor/modules/tile16_editor.cc app/editor/modules/tile16_editor.cc
app/editor/modules/gfx_group_editor.cc app/editor/modules/gfx_group_editor.cc
app/editor/context/gfx_context.cc app/editor/context/gfx_context.cc

0
src/app/editor/modules/assembly_editor.cc → src/app/editor/code/assembly_editor.cc
View File

0
src/app/editor/modules/assembly_editor.h → src/app/editor/code/assembly_editor.h
View File

7
src/app/editor/master_editor.cc
View File

@@ -15,7 +15,7 @@
#include "app/core/platform/file_dialog.h" #include "app/core/platform/file_dialog.h"
#include "app/editor/dungeon_editor.h" #include "app/editor/dungeon_editor.h"
#include "app/editor/graphics_editor.h" #include "app/editor/graphics_editor.h"
#include "app/editor/modules/assembly_editor.h" #include "app/editor/code/assembly_editor.h"
#include "app/editor/modules/music_editor.h" #include "app/editor/modules/music_editor.h"
#include "app/editor/modules/palette_editor.h" #include "app/editor/modules/palette_editor.h"
#include "app/editor/overworld_editor.h" #include "app/editor/overworld_editor.h"
@@ -214,6 +214,11 @@ absl::Status MasterEditor::Update() {
music_editor_.Update(); music_editor_.Update();
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
// if (ImGui::TabItemButton("+", kDungeonTabFlags)) {
// }
END_TAB_BAR() END_TAB_BAR()
ImGui::End(); ImGui::End();

2
src/app/editor/master_editor.h
View File

@@ -15,7 +15,7 @@
#include "app/editor/context/gfx_context.h" #include "app/editor/context/gfx_context.h"
#include "app/editor/dungeon_editor.h" #include "app/editor/dungeon_editor.h"
#include "app/editor/graphics_editor.h" #include "app/editor/graphics_editor.h"
#include "app/editor/modules/assembly_editor.h" #include "app/editor/code/assembly_editor.h"
#include "app/editor/modules/music_editor.h" #include "app/editor/modules/music_editor.h"
#include "app/editor/modules/palette_editor.h" #include "app/editor/modules/palette_editor.h"
#include "app/editor/overworld_editor.h" #include "app/editor/overworld_editor.h"

2
src/app/editor/modules/music_editor.cc
View File

@@ -3,7 +3,7 @@
#include <imgui/imgui.h> #include <imgui/imgui.h>
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "app/editor/modules/assembly_editor.h" #include "app/editor/code/assembly_editor.h"
#include "app/gui/canvas.h" #include "app/gui/canvas.h"
#include "app/gui/icons.h" #include "app/gui/icons.h"
#include "app/gui/input.h" #include "app/gui/input.h"

2
src/app/editor/modules/music_editor.h
View File

@@ -4,7 +4,7 @@
#include <imgui/imgui.h> #include <imgui/imgui.h>
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "app/editor/modules/assembly_editor.h" #include "app/editor/code/assembly_editor.h"
#include "app/gui/canvas.h" #include "app/gui/canvas.h"
#include "app/gui/icons.h" #include "app/gui/icons.h"
#include "app/gui/input.h" #include "app/gui/input.h"