drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[nostalgia] Cleanup Keel modules

Browse Source
This commit is contained in:
Gary Talent 2023-06-17 20:52:44 -05:00
parent 6680ffa7a8
commit 76a8499630
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nostalgia/modules/core/src/keel/keelmodule.cpp
View File

@ -14,12 +14,12 @@
namespace nostalgia::core { namespace nostalgia::core {
class CoreModule: public keel::Module { class KeelModule: public keel::Module {
private: private:
NostalgiaPaletteToPaletteConverter nostalgiaPaletteToPaletteConverter; NostalgiaPaletteToPaletteConverter m_nostalgiaPaletteToPaletteConverter;
TileSheetV1ToTileSheetConverter nostalgiaGraphicToTileSheetConverter; TileSheetV1ToTileSheetConverter m_tileSheetV1ToTileSheetV2Converter;
TileSheetToCompactTileSheetConverter tileSheetToCompactTileSheetConverter; TileSheetToCompactTileSheetConverter m_tileSheetToCompactTileSheetConverter;
TileSheetV2ToTileSheetConverter tileSheetV2ToTileSheetConverter; TileSheetV2ToTileSheetConverter m_tileSheetV2ToTileSheetConverter;
public: public:
[[nodiscard]] [[nodiscard]]
@ -29,7 +29,6 @@ class CoreModule: public keel::Module {
keel::generateTypeDesc<TileSheetV2>, keel::generateTypeDesc<TileSheetV2>,
keel::generateTypeDesc<TileSheet>, keel::generateTypeDesc<TileSheet>,
keel::generateTypeDesc<CompactTileSheet>, keel::generateTypeDesc<CompactTileSheet>,
keel::generateTypeDesc<NostalgiaPalette>,
keel::generateTypeDesc<Palette>, keel::generateTypeDesc<Palette>,
}; };
} }
@ -37,10 +36,10 @@ class CoreModule: public keel::Module {
[[nodiscard]] [[nodiscard]]
ox::Vector<const keel::BaseConverter*> converters() const noexcept final { ox::Vector<const keel::BaseConverter*> converters() const noexcept final {
return { return {
&nostalgiaPaletteToPaletteConverter, &m_nostalgiaPaletteToPaletteConverter,
&nostalgiaGraphicToTileSheetConverter, &m_tileSheetV1ToTileSheetV2Converter,
&tileSheetToCompactTileSheetConverter, &m_tileSheetV2ToTileSheetConverter,
&tileSheetV2ToTileSheetConverter, &m_tileSheetToCompactTileSheetConverter,
}; };
} }
@ -50,7 +49,8 @@ class CoreModule: public keel::Module {
// convert tilesheets to CompactTileSheets // convert tilesheets to CompactTileSheets
[](keel::Context *ctx, ox::Buffer *buff) -> ox::Error { [](keel::Context *ctx, ox::Buffer *buff) -> ox::Error {
oxRequire(hdr, keel::readAssetHeader(*buff)); oxRequire(hdr, keel::readAssetHeader(*buff));
const auto typeId = ox::buildTypeId(hdr.clawHdr.typeName, hdr.clawHdr.typeVersion, hdr.clawHdr.typeParams); const auto typeId = ox::buildTypeId(
hdr.clawHdr.typeName, hdr.clawHdr.typeVersion, hdr.clawHdr.typeParams);
if (typeId == ox::buildTypeId<TileSheetV1>() || if (typeId == ox::buildTypeId<TileSheetV1>() ||
typeId == ox::buildTypeId<TileSheetV2>() || typeId == ox::buildTypeId<TileSheetV2>() ||
typeId == ox::buildTypeId<TileSheet>()) { typeId == ox::buildTypeId<TileSheet>()) {
@ -63,7 +63,7 @@ class CoreModule: public keel::Module {
} }
}; };
static CoreModule mod; static KeelModule mod;
const keel::Module *keelModule() noexcept { const keel::Module *keelModule() noexcept {
return &mod; return &mod;
} }

4
src/nostalgia/modules/scene/src/keel/keelmodule.cpp
View File

@ -12,7 +12,7 @@ namespace nostalgia::scene {
class SceneModule: public keel::Module { class SceneModule: public keel::Module {
private: private:
SceneDocToSceneStaticConverter sceneDocToSceneStaticConverter; SceneDocToSceneStaticConverter m_sceneDocToSceneStaticConverter;
public: public:
[[nodiscard]] [[nodiscard]]
@ -26,7 +26,7 @@ class SceneModule: public keel::Module {
[[nodiscard]] [[nodiscard]]
ox::Vector<const keel::BaseConverter*> converters() const noexcept override { ox::Vector<const keel::BaseConverter*> converters() const noexcept override {
return { return {
&sceneDocToSceneStaticConverter, &m_sceneDocToSceneStaticConverter,
}; };
} }