From 4585c9cafa87cad6b54397af7e9375cc31b72f89 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:38:57 +1000 Subject: Lazy-loading of ImageOperation inside Directives also fixed cases of drawables not staying centered after adding directives that scale --- source/game/StarImageMetadataDatabase.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source/game/StarImageMetadataDatabase.cpp') diff --git a/source/game/StarImageMetadataDatabase.cpp b/source/game/StarImageMetadataDatabase.cpp index e47c841..c5ebd84 100644 --- a/source/game/StarImageMetadataDatabase.cpp +++ b/source/game/StarImageMetadataDatabase.cpp @@ -121,6 +121,8 @@ AssetPath ImageMetadataDatabase::filterProcessing(AssetPath const& path) { AssetPath newPath = { path.basePath, path.subPath, {} }; String filtered; + for (auto& directives : path.directives.list()) + directives.loadOperations(); path.directives.forEach([&](auto const& entry, Directives const& directives) { ImageOperation const& operation = entry.operation; if (!(operation.is() || @@ -184,6 +186,8 @@ Vec2U ImageMetadataDatabase::calculateImageSize(AssetPath const& path) const { OperationSizeAdjust(Vec2U& size) : imageSize(size), hasError(false) {}; + void operator()(NullImageOperation const&) {} + void operator()(ErrorImageOperation const&) {} void operator()(HueShiftImageOperation const&) {} @@ -231,6 +235,9 @@ Vec2U ImageMetadataDatabase::calculateImageSize(AssetPath const& path) const { OperationSizeAdjust osa(imageSize); + for (auto& directives : path.directives.list()) + directives.loadOperations(); + bool complete = path.directives.forEachAbortable([&](auto const& entry, Directives const& directives) -> bool { entry.operation.call(osa); return !osa.hasError; -- cgit v1.2.3