diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2024-01-11 16:40:29 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-01-11 16:40:29 +0100 |
| commit | ba90ba2ca91c448d80722985811fc6bddc6e9bf2 (patch) | |
| tree | 2a81ee054bad7f76457be6e91359039fcc9a8780 /loader/json.cpp | |
| parent | d74df1b763979d281f76f3f30543aee8d8a638b7 (diff) | |
w
Diffstat (limited to 'loader/json.cpp')
| -rw-r--r-- | loader/json.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/loader/json.cpp b/loader/json.cpp index ed15edbc..31777aa2 100644 --- a/loader/json.cpp +++ b/loader/json.cpp @@ -4,7 +4,6 @@ #include "src/ground-atlas.hpp" #include "serialize/json-helper.hpp" #include "serialize/anim.hpp" -#include "serialize/ground-atlas.hpp" #include "serialize/scenery.hpp" #include "loader/scenery.hpp" #include <Corrade/Containers/ArrayViewStl.h> @@ -53,14 +52,4 @@ const scenery_proto& loader_impl::scenery(StringView name) noexcept(false) return it->second->proto; } -ArrayView<const std::shared_ptr<class ground_atlas>> loader_impl::ground_atlases(StringView filename) noexcept(false) -{ - if (!ground_atlas_array.empty()) [[likely]] - return ground_atlas_array; - ground_atlas_array = json_helper::from_json<std::vector<std::shared_ptr<class ground_atlas>>>( - Path::join(loader_::GROUND_TILESET_PATH, filename)); - fm_assert(!ground_atlas_array.empty()); - return ground_atlas_array; -} - } // namespace floormat::loader_detail |