drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Squashed 'deps/nostalgia/' changes from 17f28d43..7233da75

Browse Source 
7233da75 [ox/std] Remove dedicated keys array from SmallMap
30797c71 [ox/std] Add small sz option to SmallMap
e8041121 [ox/std] Add missing oxExpect to timeMapStrToUuid
d054528e [ox/std] Remove empty if from SmallMap
09d840cf [ox/std] Add some functions for comparing HashMap and SmallMap
aeb1ef3b [ox/std] Cleanup SmallMap, make it easier to make potential changes
b66f61c2 [ox/std] Add hash function for UUID
b089bf46 [ox/std] Optimize Array compare
cd60c4ab [ox/std] Fix bugs in HashMap and SmallMap
d1845448 [ox/std] Add == and != operators to UUID
c4f6ee00 [nostalgia,olympic] Make performPackTransforms update type id when needed

git-subtree-dir: deps/nostalgia
git-subtree-split: 7233da75eaaea055ed0486895fc85606db86d0f4
This commit is contained in:
Gary Talent
2024-05-11 02:09:10 -05:00
parent 1e041bd2eb
commit f48824793c
10 changed files with 328 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,23 +58,25 @@ static class: public keel::Module {
ox::Vector<keel::PackTransform> packTransforms() const noexcept final {
return {
// convert tilesheets to CompactTileSheets
[](keel::Context &ctx, ox::Buffer &buff, ox::StringView typeId) -> ox::Error {
[](keel::Context &ctx, ox::Buffer &buff, ox::StringView typeId) -> ox::Result<bool> {
if (typeId == ox::ModelTypeId_v<TileSheetV1> ||
typeId == ox::ModelTypeId_v<TileSheetV2> ||
typeId == ox::ModelTypeId_v<TileSheetV3> ||
typeId == ox::ModelTypeId_v<TileSheetV4>) {
return keel::convertBuffToBuff<CompactTileSheet>(
ctx, buff, ox::ClawFormat::Metal).moveTo(buff);
oxReturnError(keel::convertBuffToBuff<CompactTileSheet>(
ctx, buff, ox::ClawFormat::Metal).moveTo(buff));
return true;
}
return {};
return false;
},
[](keel::Context &ctx, ox::Buffer &buff, ox::StringView typeId) -> ox::Error {
[](keel::Context &ctx, ox::Buffer &buff, ox::StringView typeId) -> ox::Result<bool> {
if (typeId == ox::ModelTypeId_v<NostalgiaPalette> ||
typeId == ox::ModelTypeId_v<PaletteV1>) {
return keel::convertBuffToBuff<Palette>(
ctx, buff, ox::ClawFormat::Metal).moveTo(buff);
oxReturnError(keel::convertBuffToBuff<Palette>(
ctx, buff, ox::ClawFormat::Metal).moveTo(buff));
return true;
}
return {};
return false;
},
};
}

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

@ -12,7 +12,7 @@
namespace keel {
class Context;
using PackTransform = ox::Error(*)(Context&, ox::Buffer &clawData, ox::StringView);
using PackTransform = ox::Result<bool>(*)(Context&, ox::Buffer &clawData, ox::StringView);
class Context {
public:

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

@ -162,11 +162,12 @@ ox::Result<ox::Buffer> convertBuffToBuff(
}
template<typename From, typename To, ox::ClawFormat fmt = ox::ClawFormat::Metal>
auto transformRule(keel::Context &ctx, ox::Buffer &buff, ox::StringView typeId) noexcept -> ox::Error {
ox::Result<bool> transformRule(keel::Context &ctx, ox::Buffer &buff, ox::StringView typeId) noexcept {
if (typeId == ox::ModelTypeId_v<From>) {
oxReturnError(keel::convertBuffToBuff<To>(ctx, buff, fmt).moveTo(buff));
return true;
}
return {};
return false;
};

8
src/olympic/keel/src/media.cpp
View File

@ -102,9 +102,13 @@ ox::Result<ox::String> uuidToPath(Context &ctx, ox::UUID const&uuid) noexcept {
}
ox::Error performPackTransforms(Context &ctx, ox::Buffer &clawData) noexcept {
oxRequire(typeId, readAssetTypeId(clawData).to<ox::String>());
oxRequireM(typeId, readAssetTypeId(clawData));
for (auto const tr : packTransforms(ctx)) {
oxReturnError(tr(ctx, clawData, typeId));
bool changed{};
oxReturnError(tr(ctx, clawData, typeId).moveTo(changed));
if (changed) {
oxReturnError(readAssetTypeId(clawData).moveTo(typeId));
}
}
return {};
}