Refactor GfxContext references to use gfx::GfxContext for consistency

This commit is contained in:
scawful
2024-12-30 19:04:20 -05:00
parent 618c33f2e8
commit 96095969c6
4 changed files with 4 additions and 6 deletions

View File

@@ -18,7 +18,7 @@ namespace editor {
/** /**
* @brief Popup window to edit Tile16 data * @brief Popup window to edit Tile16 data
*/ */
class Tile16Editor : public GfxContext, public SharedRom { class Tile16Editor : public gfx::GfxContext, public SharedRom {
public: public:
absl::Status InitBlockset(const gfx::Bitmap& tile16_blockset_bmp, absl::Status InitBlockset(const gfx::Bitmap& tile16_blockset_bmp,
const gfx::Bitmap& current_gfx_bmp, const gfx::Bitmap& current_gfx_bmp,

View File

@@ -349,7 +349,7 @@ absl::Status LoadAllPalettes(const std::vector<uint8_t> &rom_data,
return absl::OkStatus(); return absl::OkStatus();
} }
} // namespace gfx
std::unordered_map<uint8_t, gfx::Paletteset> GfxContext::palettesets_; std::unordered_map<uint8_t, gfx::Paletteset> GfxContext::palettesets_;
} // namespace gfx
} // namespace yaze } // namespace yaze

View File

@@ -404,7 +404,6 @@ struct Paletteset {
gfx::SnesPalette composite; /**< The composite palette. */ gfx::SnesPalette composite; /**< The composite palette. */
}; };
} // namespace gfx
/** /**
* @brief Shared graphical context across editors. * @brief Shared graphical context across editors.
*/ */
@@ -414,8 +413,7 @@ protected:
static std::unordered_map<uint8_t, gfx::Paletteset> palettesets_; static std::unordered_map<uint8_t, gfx::Paletteset> palettesets_;
}; };
} // namespace gfx
} // namespace yaze } // namespace yaze
#endif // YAZE_APP_GFX_PALETTE_H #endif // YAZE_APP_GFX_PALETTE_H

View File

@@ -57,7 +57,7 @@ constexpr int OverworldCustomTileGFXGroupEnabled = 0x140148;
/** /**
* @brief Represents a single Overworld map screen. * @brief Represents a single Overworld map screen.
*/ */
class OverworldMap : public GfxContext { class OverworldMap : public gfx::GfxContext {
public: public:
OverworldMap() = default; OverworldMap() = default;
OverworldMap(int index, Rom& rom, bool load_custom_data = false); OverworldMap(int index, Rom& rom, bool load_custom_data = false);