[keel] Split out Nostalgia Foundation and Pack lib into Keel

This commit is contained in:
2023-03-24 21:20:55 -05:00
parent 4a95a79926
commit 7beb3cc6fc
50 changed files with 185 additions and 206 deletions
+8 -8
View File
@@ -11,37 +11,37 @@
namespace nostalgia::scene {
class SceneModule: public foundation::Module {
class SceneModule: public keel::Module {
private:
SceneDocToSceneStaticConverter sceneDocToSceneStaticConverter;
public:
[[nodiscard]]
ox::Vector<foundation::TypeDescGenerator> types() const noexcept override {
ox::Vector<keel::TypeDescGenerator> types() const noexcept override {
return {
foundation::generateTypeDesc<SceneDoc>,
foundation::generateTypeDesc<SceneStatic>,
keel::generateTypeDesc<SceneDoc>,
keel::generateTypeDesc<SceneStatic>,
};
}
[[nodiscard]]
ox::Vector<const foundation::BaseConverter*> converters() const noexcept override {
ox::Vector<const keel::BaseConverter*> converters() const noexcept override {
return {
&sceneDocToSceneStaticConverter,
};
}
[[nodiscard]]
ox::Vector<foundation::PackTransform> packTransforms() const noexcept override {
ox::Vector<keel::PackTransform> packTransforms() const noexcept override {
return {
foundation::transformRule<SceneDoc, SceneStatic>,
keel::transformRule<SceneDoc, SceneStatic>,
};
}
};
static SceneModule mod;
const foundation::Module *module() noexcept {
const keel::Module *module() noexcept {
return &mod;
}
+2 -2
View File
@@ -4,10 +4,10 @@
#pragma once
#include <nostalgia/foundation/module.hpp>
#include <keel/module.hpp>
namespace nostalgia::scene {
const foundation::Module *module() noexcept;
const keel::Module *module() noexcept;
}
@@ -5,7 +5,7 @@
#include <imgui.h>
#include <nostalgia/core/gfx.hpp>
#include <nostalgia/foundation/media.hpp>
#include <keel/media.hpp>
#include <ox/std/memory.hpp>
#include "sceneeditor-imgui.hpp"
+1 -1
View File
@@ -8,7 +8,7 @@ namespace nostalgia::scene {
SceneEditor::SceneEditor(core::Context *ctx, ox::CRStringView path) {
m_ctx = ctx;
oxRequireT(scn, foundation::readObj<SceneStatic>(m_ctx, path));
oxRequireT(scn, keel::readObj<SceneStatic>(m_ctx, path));
m_scene = *scn;
}
+3 -3
View File
@@ -3,7 +3,7 @@
*/
#include <nostalgia/core/gfx.hpp>
#include <nostalgia/foundation/media.hpp>
#include <keel/media.hpp>
#include "typeconv.hpp"
@@ -34,10 +34,10 @@ constexpr void setLayerAttachments(unsigned layer, const TileDoc &srcTile, Scene
}
ox::Error SceneDocToSceneStaticConverter::convert(
foundation::Context *ctx,
keel::Context *ctx,
SceneDoc *src,
SceneStatic *dst) const noexcept {
oxRequire(ts, foundation::readObj<core::TileSheet>(ctx, src->tilesheet));
oxRequire(ts, keel::readObj<core::TileSheet>(ctx, src->tilesheet));
const auto layerCnt = src->tiles.size();
dst->setLayerCnt(layerCnt);
dst->tilesheet = ox::FileAddress(src->tilesheet);
+3 -3
View File
@@ -4,14 +4,14 @@
#pragma once
#include <nostalgia/foundation/typeconv.hpp>
#include <keel/typeconv.hpp>
#include "scenestatic.hpp"
namespace nostalgia::scene {
class SceneDocToSceneStaticConverter: public foundation::Converter<SceneDoc, SceneStatic> {
ox::Error convert(foundation::Context*, SceneDoc *src, SceneStatic *dst) const noexcept final;
class SceneDocToSceneStaticConverter: public keel::Converter<SceneDoc, SceneStatic> {
ox::Error convert(keel::Context*, SceneDoc *src, SceneStatic *dst) const noexcept final;
};
}