Add ScreenEditor to main Editor

This commit is contained in:
Justin Scofield
2022-07-19 20:53:03 +00:00
parent 3f4d589c98
commit 86150f82bd
4 changed files with 22 additions and 3 deletions

View File

@@ -357,6 +357,12 @@ void Editor::DrawDungeonEditor() {
END_TAB_ITEM() END_TAB_ITEM()
} }
void Editor::DrawScreenEditor() {
TAB_ITEM("Screens")
screen_editor_.Update();
END_TAB_ITEM()
}
void Editor::DrawGraphicsEditor() { void Editor::DrawGraphicsEditor() {
TAB_ITEM("Graphics") TAB_ITEM("Graphics")
END_TAB_ITEM() END_TAB_ITEM()

View File

@@ -11,6 +11,7 @@
#include "app/editor/assembly_editor.h" #include "app/editor/assembly_editor.h"
#include "app/editor/dungeon_editor.h" #include "app/editor/dungeon_editor.h"
#include "app/editor/overworld_editor.h" #include "app/editor/overworld_editor.h"
#include "app/editor/screen_editor.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
#include "app/gfx/snes_tile.h" #include "app/gfx/snes_tile.h"
#include "app/rom.h" #include "app/rom.h"
@@ -41,6 +42,7 @@ class Editor {
void DrawProjectEditor(); void DrawProjectEditor();
void DrawOverworldEditor(); void DrawOverworldEditor();
void DrawDungeonEditor(); void DrawDungeonEditor();
void DrawScreenEditor();
void DrawGraphicsEditor(); void DrawGraphicsEditor();
void DrawSpriteEditor(); void DrawSpriteEditor();
@@ -52,6 +54,7 @@ class Editor {
AssemblyEditor assembly_editor_; AssemblyEditor assembly_editor_;
OverworldEditor overworld_editor_; OverworldEditor overworld_editor_;
DungeonEditor dungeon_editor_; DungeonEditor dungeon_editor_;
ScreenEditor screen_editor_;
std::shared_ptr<SDL_Renderer> sdl_renderer_; std::shared_ptr<SDL_Renderer> sdl_renderer_;
std::unordered_map<uint, SDL_Texture *> image_cache_; std::unordered_map<uint, SDL_Texture *> image_cache_;

View File

@@ -1 +1,9 @@
#include "app/editor/screen_editor.h" #include "app/editor/screen_editor.h"
namespace yaze {
namespace app {
namespace editor {
void ScreenEditor::Update() {}
} // namespace editor
} // namespace app
} // namespace yaze

View File

@@ -9,6 +9,8 @@ namespace editor {
class ScreenEditor { class ScreenEditor {
public: public:
void Update();
private: private:
int sword_x_ = 0; int sword_x_ = 0;
int mx_click_ = 0; int mx_click_ = 0;
@@ -66,8 +68,8 @@ class ScreenEditor {
gfx::Bitmap tiles8Bitmap; // 0x20000 gfx::Bitmap tiles8Bitmap; // 0x20000
gfx::Bitmap floor_selector; gfx::Bitmap floor_selector;
// DungeonMap dungeon_maps_[14]; // DungeonMap dungeon_maps_[14];
// MapIcon selectedMapIcon; // MapIcon selectedMapIcon;
}; };
} // namespace editor } // namespace editor