From b6cd1bfb40bbb0ef657092454c81def4e1b4907b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 3 Oct 2022 15:12:34 +0200 Subject: a --- loader-impl.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'loader-impl.cpp') diff --git a/loader-impl.cpp b/loader-impl.cpp index f2f38aac..5434af76 100644 --- a/loader-impl.cpp +++ b/loader-impl.cpp @@ -14,8 +14,6 @@ namespace Magnum::Examples { -using atlas_ptr = std::shared_ptr; - struct loader_impl final : loader_ { const Utility::Resource shader_res{"game/shaders"}; @@ -27,11 +25,11 @@ struct loader_impl final : loader_ Containers::Pointer tga_converter = image_converter_plugins.loadAndInstantiate("AnyImageConverter"); - std::unordered_map atlas_map; + std::unordered_map> atlas_map; std::string shader(const Containers::StringView& filename) override; Trade::ImageData2D tile_texture(const Containers::StringView& filename) override; - atlas_ptr tile_atlas(const Containers::StringView& filename, Vector2i size) override; + std::shared_ptr tile_atlas(const Containers::StringView& filename, Vector2i size) override; explicit loader_impl(); ~loader_impl() override; @@ -45,7 +43,7 @@ std::string loader_impl::shader(const Containers::StringView& filename) return ret; } -atlas_ptr loader_impl::tile_atlas(const Containers::StringView& name, Vector2i size) +std::shared_ptr loader_impl::tile_atlas(const Containers::StringView& name, Vector2i size) { auto it = atlas_map.find(name); if (it != atlas_map.end()) -- cgit v1.2.3