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

OverworldEditor housekeeping

Browse Source
This commit is contained in:
Justin Scofield
2022-07-19 19:24:10 +00:00
parent 88b6fa5b00
commit b4543fbfa2
2 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,10 +257,10 @@ void OverworldEditor::DrawTile16Selector() const {
if (map_blockset_loaded_) { if (map_blockset_loaded_) {
draw_list->AddImage( draw_list->AddImage(
(void *)mapblockset16Bitmap.GetTexture(), (void *)tile16_blockset_bmp_.GetTexture(),
ImVec2(canvas_p0.x + 2, canvas_p0.y + 2), ImVec2(canvas_p0.x + 2, canvas_p0.y + 2),
ImVec2(canvas_p0.x + (mapblockset16Bitmap.GetWidth() * 2), ImVec2(canvas_p0.x + (tile16_blockset_bmp_.GetWidth() * 2),
canvas_p0.y + (mapblockset16Bitmap.GetHeight() * 2))); canvas_p0.y + (tile16_blockset_bmp_.GetHeight() * 2)));
} }
// Draw grid + all lines in the canvas // Draw grid + all lines in the canvas

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

@@ -18,6 +18,11 @@ namespace app {
namespace editor { namespace editor {
static constexpr unsigned int k4BPP = 4; static constexpr unsigned int k4BPP = 4;
static constexpr unsigned int kByteSize = 3;
static constexpr unsigned int kMessageIdSize = 5;
static constexpr unsigned int kNumSheetsToLoad = 223;
static constexpr unsigned int kTile8DisplayHeight = 64;
static constexpr float kInputFieldSize = 30.f;
class OverworldEditor { class OverworldEditor {
public: public:
@@ -36,27 +41,6 @@ class OverworldEditor {
void LoadBlockset(); void LoadBlockset();
void LoadGraphics(); void LoadGraphics();
ROM rom_;
zelda3::Overworld overworld_;
gfx::SNESPalette palette_;
gui::Canvas overworld_map_canvas_;
gui::Canvas pseudo_vram_canvas_;
// pointer size 1048576
gfx::Bitmap tile16_blockset_bmp_;
// pointer size 32768
gfx::Bitmap current_gfx_bmp_;
// pointer size 456704
gfx::Bitmap allgfxBitmap;
gfx::Bitmap mapblockset16Bitmap;
std::unordered_map<unsigned int, SDL_Texture *> all_texture_sheet_;
std::unordered_map<unsigned int, gfx::Bitmap> graphics_bin_;
int current_world_ = 0; int current_world_ = 0;
char map_gfx_[3] = ""; char map_gfx_[3] = "";
char map_palette_[3] = ""; char map_palette_[3] = "";
@@ -71,11 +55,19 @@ class OverworldEditor {
bool map_blockset_loaded_ = false; bool map_blockset_loaded_ = false;
bool vram_loaded_ = false; bool vram_loaded_ = false;
constexpr static int kByteSize = 3; std::unordered_map<unsigned int, SDL_Texture *> all_texture_sheet_;
constexpr static int kMessageIdSize = 5; std::unordered_map<unsigned int, gfx::Bitmap> graphics_bin_;
constexpr static int kNumSheetsToLoad = 223;
constexpr static int kTile8DisplayHeight = 64; ROM rom_;
constexpr static float kInputFieldSize = 30.f; zelda3::Overworld overworld_;
gfx::SNESPalette palette_;
gfx::Bitmap tile16_blockset_bmp_; // pointer size 1048576
gfx::Bitmap current_gfx_bmp_; // pointer size 32768
gfx::Bitmap all_gfx_bmp; // pointer size 456704
gui::Canvas overworld_map_canvas_;
gui::Canvas pseudo_vram_canvas_;
ImVec4 current_palette_[8]; ImVec4 current_palette_[8];