Resources: persistent asset storage

src/app.cpp

@@ -14,7 +14,7 @@ constexpr auto context_ci = le::Context::CreateInfo{
 };
 } // namespace
 
-App::App() : m_context(context_ci), m_data_loader(le::FileDataLoader::upfind("assets")), m_asset_loader(m_context.create_asset_loader(&m_data_loader)) {
+App::App() : m_context(context_ci), m_data_loader(le::FileDataLoader::upfind("assets")), m_resources(m_context.create_asset_loader(&m_data_loader)) {
 	bind_services();
 }
 
@@ -43,6 +43,6 @@ void App::bind_services() {
 	m_services.bind<le::IDataLoader>(&m_data_loader);
 	m_services.bind<le::FileDataLoader>(&m_data_loader);
 
-	m_services.bind(&m_asset_loader);
+	m_services.bind(&m_resources);
 }
 } // namespace miracle

src/app.hpp

@@ -2,6 +2,7 @@
 #include <le2d/context.hpp>
 #include <le2d/file_data_loader.hpp>
 #include <le2d/service_locator.hpp>
+#include <resources.hpp>
 
 namespace miracle {
 class App {
@@ -15,7 +16,7 @@ class App {
 
 	le::Context m_context;
 	le::FileDataLoader m_data_loader{};
-	le::AssetLoader m_asset_loader{};
+	Resources m_resources;
 
 	le::ServiceLocator m_services{};
 };

src/game.cpp

@@ -1,6 +1,7 @@
 #include <game.hpp>
 #include <glm/gtx/norm.hpp>
 #include <le2d/context.hpp>
+#include <resources.hpp>
 #include <cstddef>
 #include <format>
 #include <iterator>
@@ -15,8 +16,8 @@
 namespace miracle {
 Game::Game(gsl::not_null<le::ServiceLocator const*> services) : m_services(services), m_lighthouse(services), m_light(services) {
 	spawn_wave();
-	auto const& asset_loader = services->get<le::AssetLoader>();
-	m_font = asset_loader.load<le::IFont>("fonts/specialElite.ttf");
+	auto& resources = services->get<Resources>();
+	m_font = resources.load<le::IFont>("fonts/specialElite.ttf");
 	if (!m_font) { throw std::runtime_error{"Failed to load font"}; }
 }
 

src/game.hpp

@@ -4,7 +4,6 @@
 #include <le2d/event.hpp>
 #include <le2d/renderer.hpp>
 #include <le2d/service_locator.hpp>
-#include <memory>
 #include "enemy.hpp"
 #include "le2d/drawable/text.hpp"
 #include "le2d/resource/font.hpp"
@@ -29,7 +28,7 @@ class Game {
 	Lighthouse m_lighthouse;
 	Light m_light;
 
-	std::unique_ptr<le::IFont> m_font{};
+	le::IFont* m_font{};
 	le::drawable::Text m_score_text{};
 	le::drawable::Text m_health_text{};
 	int m_score{};

src/lighthouse.cpp

@@ -1,13 +1,13 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <lighthouse.hpp>
+#include <resources.hpp>
 #include "glm/gtx/norm.hpp"
 
 namespace miracle {
 Lighthouse::Lighthouse(gsl::not_null<le::ServiceLocator const*> services) : m_services(services) {
 	m_sprite.create(m_hitbox_diameter);
-	auto const& asset_loader = services->get<le::AssetLoader>();
-	m_texture = asset_loader.load<le::ITexture>("images/lighthouse.png");
-	m_sprite.texture = m_texture.get();
+	auto& resources = services->get<Resources>();
+	m_sprite.texture = resources.load<le::ITexture>("images/lighthouse.png");
 }
 
 void Lighthouse::rotate_towards_cursor(glm::vec2 cursor_pos) {

src/lighthouse.hpp

@@ -6,9 +6,7 @@
 #include <le2d/event.hpp>
 #include <le2d/renderer.hpp>
 #include <le2d/service_locator.hpp>
-#include <memory>
 #include "enemy.hpp"
-#include "le2d/resource/texture.hpp"
 
 namespace miracle {
 class Lighthouse {
@@ -26,7 +24,6 @@ class Lighthouse {
 	gsl::not_null<le::ServiceLocator const*> m_services;
 	float m_hitbox_diameter{150.0f};
 	float m_visibility_diameter{250.0f};
-	std::unique_ptr<le::ITexture> m_texture;
 	le::drawable::Circle m_sprite{};
 	float m_health{100};
 };

src/resources.cpp

@@ -0,0 +1,15 @@
+#include <resources.hpp>
+
+namespace miracle {
+Resources::Resources(le::AssetLoader asset_loader) : m_asset_loader(std::move(asset_loader)) {}
+
+void Resources::erase(std::string_view const uri) {
+	if (auto const it = m_map.find(uri); it != m_map.end()) { m_map.erase(it); }
+}
+
+auto Resources::find(std::string_view const uri, std::type_index const type) const -> le::IAsset* {
+	auto const it = m_map.find(uri);
+	if (it == m_map.end() || it->second.type != type) { return nullptr; }
+	return it->second.asset.get();
+}
+} // namespace miracle

src/resources.hpp

@@ -0,0 +1,67 @@
+#pragma once
+#include <djson/string_table.hpp>
+#include <klib/assert.hpp>
+#include <le2d/asset/asset_loader.hpp>
+#include <concepts>
+
+namespace miracle {
+class Resources {
+  public:
+	explicit Resources(le::AssetLoader asset_loader);
+
+	template <std::derived_from<le::IAsset> AssetTypeT>
+	[[nodiscard]] auto insert(std::string uri, std::unique_ptr<AssetTypeT> asset) -> AssetTypeT& {
+		KLIB_ASSERT(asset);
+		auto& ret = *asset;
+		m_map.insert_or_assign(std::move(uri), Entry::create(std::move(asset)));
+		return ret;
+	}
+
+	void erase(std::string_view uri);
+
+	[[nodiscard]] auto contains(std::string_view const uri) const -> bool { return m_map.contains(uri); }
+
+	template <std::derived_from<le::IAsset> AssetTypeT>
+	[[nodiscard]] auto peek(std::string_view const uri) const -> AssetTypeT* {
+		auto const it = m_map.find(uri);
+		if (it == m_map.end() || it->second.type != typeid(AssetTypeT)) { return nullptr; }
+		return static_cast<AssetTypeT*>(it->second.asset.get());
+	}
+
+	template <std::derived_from<le::IAsset> AssetTypeT>
+	[[nodiscard]] auto at(std::string_view const uri) const -> AssetTypeT& {
+		auto* ret = peek<AssetTypeT>(uri);
+		KLIB_ASSERT(ret);
+		return *ret;
+	}
+
+	template <std::derived_from<le::IAsset> AssetTypeT>
+	[[nodiscard]] auto load(std::string_view const uri) -> AssetTypeT* {
+		if (auto* ret = peek<AssetTypeT>(uri); ret) { return ret; }
+		std::unique_ptr<AssetTypeT> asset = m_asset_loader.load<AssetTypeT>(uri);
+		if (!asset) { return nullptr; }
+		return &insert(std::string{uri}, std::move(asset));
+	}
+
+	void clear() { m_map.clear(); }
+
+	[[nodiscard]] auto size() const -> std::size_t { return m_map.size(); }
+	[[nodiscard]] auto is_empty() const -> bool { return m_map.empty(); }
+
+  private:
+	struct Entry {
+		template <typename T>
+		[[nodiscard]] static auto create(std::unique_ptr<T> asset) -> Entry {
+			return Entry{.type = typeid(T), .asset = std::move(asset)};
+		}
+
+		std::type_index type;
+		std::unique_ptr<le::IAsset> asset{};
+	};
+
+	[[nodiscard]] auto find(std::string_view uri, std::type_index type) const -> le::IAsset*;
+
+	le::AssetLoader m_asset_loader;
+	dj::StringTable<Entry> m_map{};
+};
+} // namespace miracle