From 1cdd7753d37bcf8f626298c3df97a02cc73f266c Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 14:48:59 +0100
Subject: Load texture images in Worker

---
 assetFactory/assetFactory.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'assetFactory/assetFactory.cpp')

diff --git a/assetFactory/assetFactory.cpp b/assetFactory/assetFactory.cpp
index 46b4642..e27e575 100644
--- a/assetFactory/assetFactory.cpp
+++ b/assetFactory/assetFactory.cpp
@@ -99,21 +99,25 @@ AssetFactory::createTexutre() const
 {
 	if (!textureFragments.empty() && !texture) {
 		// * layout images
-		std::vector<TexturePacker::Image> imageSizes;
+		std::map<std::string_view, std::unique_ptr<const Image>> images;
 		std::transform(
-				textureFragments.begin(), textureFragments.end(), std::back_inserter(imageSizes), [](const auto & tf) {
-					return TexturePacker::Image {tf.second->image->width, tf.second->image->height};
+				textureFragments.begin(), textureFragments.end(), std::inserter(images, images.end()), [](auto && tf) {
+					return decltype(images)::value_type {tf.first, tf.second->image->get()};
 				});
+		std::vector<TexturePacker::Image> imageSizes;
+		std::transform(images.begin(), images.end(), std::back_inserter(imageSizes), [](const auto & i) {
+			return TexturePacker::Image {i.second->width, i.second->height};
+		});
 		const auto [layout, outSize] = TexturePacker {imageSizes}.pack();
 		// * create texture
 		texture = std::make_shared<TextureAtlas>(outSize.x, outSize.y, layout.size());
-		std::transform(textureFragments.begin(), textureFragments.end(),
+		std::transform(images.begin(), images.end(),
 				std::inserter(textureFragmentPositions, textureFragmentPositions.end()),
-				[position = layout.begin(), size = imageSizes.begin(), this](const auto & tf) mutable {
-					const auto m = texture->add(*position, *size, tf.second->image->data.data());
+				[position = layout.begin(), size = imageSizes.begin(), this](const auto & i) mutable {
+					const auto m = texture->add(*position, *size, i.second->data.data());
 					position++;
 					size++;
-					return decltype(textureFragmentPositions)::value_type {tf.first, m};
+					return decltype(textureFragmentPositions)::value_type {i.first, m};
 				});
 	}
 }
-- 
cgit v1.2.3