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

remove imgui_test_engine from editor namespace

Browse Source
This commit is contained in:
scawful
2024-07-31 07:41:34 -04:00
parent cfdefef2db
commit 439a55e3cb
6 changed files with 30 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,18 +3,16 @@
#define IMGUI_DEFINE_MATH_OPERATORS
#include <ImGuiColorTextEdit/TextEditor.h>
#include <ImGuiFileDialog/ImGuiFileDialog.h>
#include <imgui/imgui.h>
#include <imgui/misc/cpp/imgui_stdlib.h>
#include <imgui_memory_editor.h>
#include <imgui_test_engine/imgui_te_context.h>
#include "ImGuiColorTextEdit/TextEditor.h"
#include "ImGuiFileDialog/ImGuiFileDialog.h"
#include "imgui/imgui.h"
#include "imgui/misc/cpp/imgui_stdlib.h"
#include "imgui_memory_editor.h"
#include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/constants.h"
#include "app/core/project.h"
#include "app/core/testable.h"
#include "app/editor/code/assembly_editor.h"
#include "app/editor/code/memory_editor.h"
#include "app/editor/dungeon/dungeon_editor.h"
@@ -59,8 +57,7 @@ namespace editor {
*/
class MasterEditor : public SharedRom,
public context::GfxContext,
public core::ExperimentFlags,
public core::GuiTestable {
public core::ExperimentFlags {
public:
MasterEditor() {
current_editor_ = &overworld_editor_;
@@ -79,8 +76,6 @@ class MasterEditor : public SharedRom,
auto emulator() -> emu::Emulator& { return emulator_; }
auto quit() { return quit_; }
void RegisterTests(ImGuiTestEngine* e) override;
private:
void ManageActiveEditors();
void ManageKeyboardShortcuts();
@@ -142,4 +137,4 @@ class MasterEditor : public SharedRom,
} // namespace app
} // namespace yaze
#endif // YAZE_APP_EDITOR_MASTER_EDITOR_H
#endif // YAZE_APP_EDITOR_MASTER_EDITOR_H