From ba90ba2ca91c448d80722985811fc6bddc6e9bf2 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 11 Jan 2024 16:40:29 +0100 Subject: w --- loader/impl.hpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'loader/impl.hpp') diff --git a/loader/impl.hpp b/loader/impl.hpp index ad82e46d..0b718527 100644 --- a/loader/impl.hpp +++ b/loader/impl.hpp @@ -13,6 +13,7 @@ namespace floormat { struct anim_def; struct wall_info; +struct ground_info; } namespace floormat::loader_detail { @@ -45,31 +46,30 @@ struct loader_impl final : loader_ Trade::ImageData2D texture(StringView prefix, StringView filename) noexcept(false) override; // >-----> walls >-----> - struct wall_index { uint32_t val = (uint32_t)-1; }; tsl::robin_map wall_atlas_map; std::vector wall_atlas_array; std::vector missing_wall_atlases; - Pointer invalid_wall_atlas; - std::shared_ptr wall_atlas(StringView name, bool fail_ok = true) override; ArrayView wall_atlas_list() override; void get_wall_atlas_list(); - const wall_info& make_invalid_wall_atlas() noexcept override; - std::shared_ptr get_wall_atlas(StringView name, StringView path); + const wall_info& make_invalid_wall_atlas(); + std::shared_ptr get_wall_atlas(StringView name, StringView dir); // >-----> tile >-----> - tsl::robin_map> ground_atlas_map; - std::vector> ground_atlas_array; - - ArrayView> ground_atlases(StringView filename) noexcept(false) override; - std::shared_ptr ground_atlas(StringView filename, Vector2ub size, pass_mode pass) noexcept(false) override; + tsl::robin_map ground_atlas_map; + std::vector ground_atlas_array; + std::vector missing_ground_atlases; + Pointer invalid_ground_atlas; std::shared_ptr ground_atlas(StringView filename, bool fail_ok) noexcept(false) override; + ArrayView ground_atlas_list() noexcept(false) override; + void get_ground_atlas_list(); + const ground_info& make_invalid_ground_atlas(); + std::shared_ptr get_ground_atlas(StringView name, StringView path, Vector2ub size, pass_mode pass) noexcept(false) override; // >-----> anim >-----> tsl::robin_map> anim_atlas_map; std::vector anim_atlases; - ArrayView anim_atlas_list() override; std::shared_ptr anim_atlas(StringView name, StringView dir) noexcept(false) override; static anim_def deserialize_anim(StringView filename); @@ -78,7 +78,6 @@ struct loader_impl final : loader_ // >-----> scenery >-----> std::vector sceneries_array; tsl::robin_map sceneries_map; - ArrayView sceneries() override; const scenery_proto& scenery(StringView name) noexcept(false) override; void get_scenery_list(); @@ -86,7 +85,6 @@ struct loader_impl final : loader_ // >-----> vobjs >-----> tsl::robin_map vobj_atlas_map; std::vector vobjs; - std::shared_ptr make_vobj_anim_atlas(StringView name, StringView image_filename); const struct vobj_info& vobj(StringView name) override; ArrayView vobj_list() override; -- cgit v1.2.3