diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/world.cpp | 6 | ||||
| -rw-r--r-- | src/world.hpp | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/world.cpp b/src/world.cpp index 07a83afe..cefb2485 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -3,7 +3,11 @@ namespace floormat { -world::world() +world::world() : world{initial_capacity} +{ +} + +world::world(std::size_t capacity) : _chunks{capacity, hasher} { _chunks.max_load_factor(max_load_factor); } diff --git a/src/world.hpp b/src/world.hpp index 84659753..fcbb97a2 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -22,9 +22,10 @@ private: return int_hash((std::size_t)c.y << 16 | (std::size_t)c.x); }; - std::unordered_map<chunk_coords, chunk, decltype(hasher)> _chunks{initial_capacity, hasher}; + std::unordered_map<chunk_coords, chunk, decltype(hasher)> _chunks; mutable std::tuple<chunk*, chunk_coords>_last_chunk; std::size_t _last_collection = 0; + explicit world(std::size_t capacity); public: explicit world(); @@ -49,7 +50,7 @@ public: template<typename Hash, typename Alloc, typename Pred> world::world(std::unordered_map<chunk_coords, chunk, Hash, Alloc, Pred>&& chunks) : - _chunks{std::max(initial_capacity, std::size_t(1/max_load_factor * 2 * chunks.size())), hasher} + world{std::max(initial_capacity, std::size_t(1/max_load_factor * 2 * chunks.size()))} { for (auto&& [coord, c] : chunks) operator[](coord) = std::move(c); |