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

Refactor GfxGroupEditor

Browse Source
This commit is contained in:
scawful
2024-08-25 14:33:01 -04:00
parent 6465486443
commit 3eaf320ff4
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/editor/graphics/gfx_group_editor.cc
View File

@@ -228,7 +228,7 @@ void DrawPaletteFromPaletteGroup(gfx::SnesPalette &palette) {
if (palette.empty()) { if (palette.empty()) {
return; return;
} }
for (int n = 0; n < palette.size(); n++) { for (size_t n = 0; n < palette.size(); n++) {
PushID(n); PushID(n);
if ((n % 8) != 0) SameLine(0.0f, GetStyle().ItemSpacing.y); if ((n % 8) != 0) SameLine(0.0f, GetStyle().ItemSpacing.y);

17
src/app/editor/graphics/gfx_group_editor.h
View File

@@ -1,8 +1,6 @@
#ifndef YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H #ifndef YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
#define YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H #define YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
#include "imgui/imgui.h"
#include <cmath> #include <cmath>
#include "absl/status/status.h" #include "absl/status/status.h"
@@ -16,6 +14,7 @@
#include "app/gui/style.h" #include "app/gui/style.h"
#include "app/rom.h" #include "app/rom.h"
#include "app/zelda3/overworld/overworld.h" #include "app/zelda3/overworld/overworld.h"
#include "imgui/imgui.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
@@ -40,13 +39,7 @@ class GfxGroupEditor : public SharedRom {
selected_spriteset_ = spriteset; selected_spriteset_ = spriteset;
} }
void InitBlockset(gfx::Bitmap* tile16_blockset) {
tile16_blockset_bmp_ = tile16_blockset;
}
private: private:
int preview_palette_id_ = 0;
int last_sheet_id_ = 0;
uint8_t selected_blockset_ = 0; uint8_t selected_blockset_ = 0;
uint8_t selected_roomset_ = 0; uint8_t selected_roomset_ = 0;
uint8_t selected_spriteset_ = 0; uint8_t selected_spriteset_ = 0;
@@ -57,14 +50,6 @@ class GfxGroupEditor : public SharedRom {
gui::Canvas spriteset_canvas_; gui::Canvas spriteset_canvas_;
gfx::SnesPalette palette_; gfx::SnesPalette palette_;
gfx::PaletteGroup palette_group_;
gfx::Bitmap* tile16_blockset_bmp_;
std::vector<std::vector<uint8_t>> tile16_individual_data_;
std::vector<gfx::Bitmap> tile16_individual_;
gui::BitmapViewer gfx_group_viewer_;
zelda3::overworld::Overworld overworld_;
}; };
} // namespace editor } // namespace editor