drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 10 Activity

[keel,nostalgia] Fix converter type names

Browse Source
This commit is contained in:
Gary Talent 2025-04-17 00:37:05 -05:00
parent f1c2113dd3
commit 035ba8810f
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,19 +39,19 @@ static class: public keel::Module {
} }
[[nodiscard]] [[nodiscard]]
ox::Vector<keel::ConverterWrap> converters() const noexcept final { ox::Vector<keel::Converter> converters() const noexcept final {
return { return {
keel::ConverterWrap::make<ConvertNostalgiaPaletteToPaletteV1>(), keel::Converter::make<ConvertNostalgiaPaletteToPaletteV1>(),
keel::ConverterWrap::make<ConvertPaletteV1ToPaletteV2>(), keel::Converter::make<ConvertPaletteV1ToPaletteV2>(),
keel::ConverterWrap::make<ConvertPaletteV2ToPaletteV3>(), keel::Converter::make<ConvertPaletteV2ToPaletteV3>(),
keel::ConverterWrap::make<ConvertPaletteV3ToPaletteV4>(), keel::Converter::make<ConvertPaletteV3ToPaletteV4>(),
keel::ConverterWrap::make<ConvertPaletteV4ToPaletteV5>(), keel::Converter::make<ConvertPaletteV4ToPaletteV5>(),
keel::ConverterWrap::make<ConvertPaletteToCompactPalette>(), keel::Converter::make<ConvertPaletteToCompactPalette>(),
keel::ConverterWrap::make<ConvertTileSheetV1ToTileSheetV2>(), keel::Converter::make<ConvertTileSheetV1ToTileSheetV2>(),
keel::ConverterWrap::make<ConvertTileSheetV2ToTileSheetV3>(), keel::Converter::make<ConvertTileSheetV2ToTileSheetV3>(),
keel::ConverterWrap::make<ConvertTileSheetV3ToTileSheetV4>(), keel::Converter::make<ConvertTileSheetV3ToTileSheetV4>(),
keel::ConverterWrap::make<ConvertTileSheetV4ToTileSheetV5>(), keel::Converter::make<ConvertTileSheetV4ToTileSheetV5>(),
keel::ConverterWrap::make<ConvertTileSheetToCompactTileSheet>(), keel::Converter::make<ConvertTileSheetToCompactTileSheet>(),
}; };
} }

2
src/nostalgia/modules/sound/src/keel/keelmodule.cpp
View File

@ -26,7 +26,7 @@ static class: public keel::Module {
} }
[[nodiscard]] [[nodiscard]]
ox::Vector<keel::ConverterWrap> converters() const noexcept final { ox::Vector<keel::Converter> converters() const noexcept final {
return { return {
}; };
} }

4
src/olympic/keel/include/keel/context.hpp
View File

@ -22,7 +22,7 @@ class Context {
AssetManager assetManager; AssetManager assetManager;
ox::HashMap<ox::String, ox::UUID> pathToUuid; ox::HashMap<ox::String, ox::UUID> pathToUuid;
ox::HashMap<ox::UUIDStr, ox::String> uuidToPath; ox::HashMap<ox::UUIDStr, ox::String> uuidToPath;
ox::Vector<ConverterWrap> converters; ox::Vector<Converter> converters;
ox::Vector<PackTransform> packTransforms; ox::Vector<PackTransform> packTransforms;
#else #else
std::size_t preloadSectionOffset = 0; std::size_t preloadSectionOffset = 0;
@ -45,7 +45,7 @@ constexpr ox::SpanView<PackTransform> packTransforms(
#endif #endif
} }
constexpr ox::SpanView<ConverterWrap> converters( constexpr ox::SpanView<Converter> converters(
[[maybe_unused]] Context const&ctx) noexcept { [[maybe_unused]] Context const&ctx) noexcept {
#ifndef OX_BARE_METAL #ifndef OX_BARE_METAL
return ctx.converters; return ctx.converters;

2
src/olympic/keel/include/keel/module.hpp
View File

@ -32,7 +32,7 @@ class Module {
[[nodiscard]] [[nodiscard]]
virtual ox::Vector<TypeDescGenerator> types() const noexcept; virtual ox::Vector<TypeDescGenerator> types() const noexcept;
[[nodiscard]] [[nodiscard]]
virtual ox::Vector<ConverterWrap> converters() const noexcept; virtual ox::Vector<Converter> converters() const noexcept;
[[nodiscard]] [[nodiscard]]
virtual ox::Vector<PackTransform> packTransforms() const noexcept; virtual ox::Vector<PackTransform> packTransforms() const noexcept;
}; };

16
src/olympic/keel/include/keel/typeconv.hpp
View File

@ -129,7 +129,7 @@ class BaseConverter {
template<auto Func> template<auto Func>
class Converter: public BaseConverter { class ConverterFunc: public BaseConverter {
private: private:
template<typename SrcType, typename DstType> template<typename SrcType, typename DstType>
struct ParamExtractor { struct ParamExtractor {
@ -194,20 +194,20 @@ class Converter: public BaseConverter {
}; };
class ConverterWrap { class Converter {
private: private:
ox::AllocAlias<BaseConverter> m_buff{}; ox::AllocAlias<BaseConverter> m_buff{};
BaseConverter *m_conv{}; BaseConverter *m_conv{};
public: public:
template<auto Func> template<auto Func>
static ConverterWrap make() { static Converter make() {
ConverterWrap out; Converter out;
static_assert(sizeof(Converter<Func>) <= sizeof(out.m_buff)); static_assert(sizeof(ConverterFunc<Func>) <= sizeof(out.m_buff));
out.m_conv = new (out.m_buff.data()) Converter<Func>{}; out.m_conv = new (out.m_buff.data()) ConverterFunc<Func>{};
return out; return out;
} }
constexpr ConverterWrap() {} constexpr Converter() {}
ConverterWrap(ConverterWrap const &other): Converter(Converter const &other):
m_buff{other.m_buff}, m_buff{other.m_buff},
m_conv{m_buff.data()} {} m_conv{m_buff.data()} {}
[[nodiscard]] [[nodiscard]]

2
src/olympic/keel/src/module.cpp
View File

@ -24,7 +24,7 @@ ox::Vector<TypeDescGenerator> Module::types() const noexcept {
return {}; return {};
} }
ox::Vector<ConverterWrap> Module::converters() const noexcept { ox::Vector<Converter> Module::converters() const noexcept {
return {}; return {};
} }

4
src/olympic/keel/src/typeconv.cpp
View File

@ -9,7 +9,7 @@
namespace keel { namespace keel {
static ox::Result<BaseConverter const*> findConverter( static ox::Result<BaseConverter const*> findConverter(
ox::SpanView<ConverterWrap> const&converters, ox::SpanView<Converter> const&converters,
ox::StringViewCR srcTypeName, ox::StringViewCR srcTypeName,
int const srcTypeVersion, int const srcTypeVersion,
ox::StringViewCR dstTypeName, ox::StringViewCR dstTypeName,
@ -32,7 +32,7 @@ static ox::Result<ox::UPtr<Wrap>> convert(BaseConverter const&c, Context &ctx, W
static ox::Result<ox::UPtr<Wrap>> convert( static ox::Result<ox::UPtr<Wrap>> convert(
Context &ctx, Context &ctx,
ox::SpanView<ConverterWrap> const&converters, ox::SpanView<Converter> const&converters,
auto &src, auto &src,
ox::StringViewCR srcTypeName, ox::StringViewCR srcTypeName,
int const srcTypeVersion, int const srcTypeVersion,