diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-05 19:54:08 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-05 19:54:08 +0100 |
commit | b97413c5561a59acac86e053a1aa8bd7905456f2 (patch) | |
tree | c4982073679119e88df44d65a42975560ff2082f | |
parent | 141ecedcacda8fa094a22da067fe24423f0d6f38 (diff) |
a
-rw-r--r-- | loader/loader-impl.cpp | 2 | ||||
-rw-r--r-- | serialize/string.hpp | 4 | ||||
-rw-r--r-- | src/anim-atlas.cpp | 1 | ||||
-rw-r--r-- | src/anim-atlas.hpp | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/loader/loader-impl.cpp b/loader/loader-impl.cpp index 9e6de31e..69a5f8ab 100644 --- a/loader/loader-impl.cpp +++ b/loader/loader-impl.cpp @@ -31,8 +31,6 @@ struct loader_impl final : loader_ importer_plugins.loadAndInstantiate("AnyImageImporter"); PluginManager::Manager<Trade::AbstractImageConverter> image_converter_plugins; - Containers::Pointer<Trade::AbstractImageConverter> tga_converter = - image_converter_plugins.loadAndInstantiate("AnyImageConverter"); std::unordered_map<std::string, std::shared_ptr<struct tile_atlas>> atlas_map; diff --git a/serialize/string.hpp b/serialize/string.hpp index a3923527..66e448a4 100644 --- a/serialize/string.hpp +++ b/serialize/string.hpp @@ -10,10 +10,6 @@ using StringView = BasicStringView<const char>; } // namespace Corrade::Containers -namespace floormat { - -} // namespace floormat - namespace nlohmann { template<> diff --git a/src/anim-atlas.cpp b/src/anim-atlas.cpp index 2e4361df..c5a54a3d 100644 --- a/src/anim-atlas.cpp +++ b/src/anim-atlas.cpp @@ -41,6 +41,7 @@ anim_atlas& anim_atlas::operator=(anim_atlas&&) noexcept = default; StringView anim_atlas::name() const noexcept { return _name; } GL::Texture2D& anim_atlas::texture() noexcept { return _tex; } const Serialize::anim& anim_atlas::info() const noexcept { return _info; } +Vector2ui anim_atlas::pixel_size() const noexcept { return _pixel_size; } auto anim_atlas::group(rotation r) const noexcept -> const anim_group& { diff --git a/src/anim-atlas.hpp b/src/anim-atlas.hpp index 4c7140d9..b4514df9 100644 --- a/src/anim-atlas.hpp +++ b/src/anim-atlas.hpp @@ -26,6 +26,7 @@ struct anim_atlas final StringView name() const noexcept; GL::Texture2D& texture() noexcept; const anim_info& info() const noexcept; + Vector2ui pixel_size() const noexcept; const anim_group& group(rotation r) const noexcept; const anim_frame& frame(rotation r, std::size_t frame) const noexcept; |