rename ChunksStorage to GlobalChunks

src/frontend/debug_panel.cpp

@@ -21,7 +21,7 @@
 #include "voxels/Block.hpp"
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
-#include "voxels/ChunksStorage.hpp"
+#include "voxels/GlobalChunks.hpp"
 #include "world/Level.hpp"
 #include "world/World.hpp"
 

src/frontend/hud.cpp

@@ -40,7 +40,7 @@
 #include "voxels/Block.hpp"
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
-#include "voxels/ChunksStorage.hpp"
+#include "voxels/GlobalChunks.hpp"
 #include "window/Camera.hpp"
 #include "window/Events.hpp"
 #include "window/input.hpp"

src/logic/ChunksController.cpp

@@ -14,7 +14,7 @@
 #include "voxels/Block.hpp"
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
-#include "voxels/ChunksStorage.hpp"
+#include "voxels/GlobalChunks.hpp"
 #include "world/Level.hpp"
 #include "world/World.hpp"
 #include "world/generator/WorldGenerator.hpp"

src/logic/scripting/lua/libs/libblock.cpp

@@ -7,7 +7,7 @@
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
 #include "voxels/voxel.hpp"
-#include "voxels/ChunksStorage.hpp"
+#include "voxels/GlobalChunks.hpp"
 #include "world/Level.hpp"
 #include "maths/voxmaths.hpp"
 #include "data/StructLayout.hpp"

src/logic/scripting/lua/libs/libworld.cpp

@@ -13,7 +13,7 @@
 #include "lighting/Lighting.hpp"
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
-#include "voxels/ChunksStorage.hpp"
+#include "voxels/GlobalChunks.hpp"
 #include "world/Level.hpp"
 #include "world/World.hpp"
 

src/voxels/GlobalChunks.cpp

@@ -1,4 +1,4 @@
-#include "ChunksStorage.hpp"
+#include "GlobalChunks.hpp"
 
 #include <algorithm>
 
@@ -28,10 +28,10 @@ inline long long keyfrom(int x, int z) {
 
 static debug::Logger logger("chunks-storage");
 
-ChunksStorage::ChunksStorage(Level* level) : level(level) {
+GlobalChunks::GlobalChunks(Level* level) : level(level) {
 }
 
-std::shared_ptr<Chunk> ChunksStorage::fetch(int x, int z) {
+std::shared_ptr<Chunk> GlobalChunks::fetch(int x, int z) {
     const auto& found = chunksMap.find(keyfrom(x, z));
     if (found == chunksMap.end()) {
         return nullptr;
@@ -63,11 +63,11 @@ static void check_voxels(const ContentIndices& indices, Chunk& chunk) {
     }
 }
 
-void ChunksStorage::erase(int x, int z) {
+void GlobalChunks::erase(int x, int z) {
     chunksMap.erase(keyfrom(x, z));
 }
 
-std::shared_ptr<Chunk> ChunksStorage::create(int x, int z) {
+std::shared_ptr<Chunk> GlobalChunks::create(int x, int z) {
     const auto& found = chunksMap.find(keyfrom(x, z));
     if (found != chunksMap.end()) {
         return found->second;
@@ -120,19 +120,19 @@ std::shared_ptr<Chunk> ChunksStorage::create(int x, int z) {
     return chunk;
 }
 
-void ChunksStorage::pinChunk(std::shared_ptr<Chunk> chunk) {
+void GlobalChunks::pinChunk(std::shared_ptr<Chunk> chunk) {
     pinnedChunks[{chunk->x, chunk->z}] = std::move(chunk);
 }
 
-void ChunksStorage::unpinChunk(int x, int z) {
+void GlobalChunks::unpinChunk(int x, int z) {
     pinnedChunks.erase({x, z});
 }
 
-size_t ChunksStorage::size() const {
+size_t GlobalChunks::size() const {
     return chunksMap.size();
 }
 
-voxel* ChunksStorage::get(int x, int y, int z) const {
+voxel* GlobalChunks::get(int x, int y, int z) const {
     if (y < 0 || y >= CHUNK_H) {
         return nullptr;
     }
@@ -150,7 +150,7 @@ voxel* ChunksStorage::get(int x, int y, int z) const {
     return &chunk->voxels[(y * CHUNK_D + lz) * CHUNK_W + lx];
 }
 
-void ChunksStorage::incref(Chunk* chunk) {
+void GlobalChunks::incref(Chunk* chunk) {
     auto key = reinterpret_cast<ptrdiff_t>(chunk);
     const auto& found = refCounters.find(key);
     if (found == refCounters.end()) {
@@ -160,7 +160,7 @@ void ChunksStorage::incref(Chunk* chunk) {
     found->second++;
 }
 
-void ChunksStorage::decref(Chunk* chunk) {
+void GlobalChunks::decref(Chunk* chunk) {
     auto key = reinterpret_cast<ptrdiff_t>(chunk);
     const auto& found = refCounters.find(key);
     if (found == refCounters.end()) {
@@ -180,7 +180,7 @@ void ChunksStorage::decref(Chunk* chunk) {
     }
 }
 
-void ChunksStorage::save(Chunk* chunk) {
+void GlobalChunks::save(Chunk* chunk) {
     if (chunk == nullptr) {
         return;
     }
@@ -204,7 +204,7 @@ void ChunksStorage::save(Chunk* chunk) {
     );
 }
 
-void ChunksStorage::saveAll() {
+void GlobalChunks::saveAll() {
     for (const auto& [_, chunk] : chunksMap) {
         save(chunk.get());
     }

src/voxels/GlobalChunks.hpp

@@ -12,14 +12,14 @@
 class Chunk;
 class Level;
 
-class ChunksStorage {
+class GlobalChunks {
     Level* level;
     std::unordered_map<long long, std::shared_ptr<Chunk>> chunksMap;
     std::unordered_map<glm::ivec2, std::shared_ptr<Chunk>> pinnedChunks;
     std::unordered_map<ptrdiff_t, int> refCounters;
 public:
-    ChunksStorage(Level* level);
+    GlobalChunks(Level* level);
-    ~ChunksStorage() = default;
+    ~GlobalChunks() = default;
 
     std::shared_ptr<Chunk> fetch(int x, int z);
     std::shared_ptr<Chunk> create(int x, int z);

src/world/Level.cpp

@@ -13,7 +13,7 @@
 #include "settings.hpp"
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
-#include "voxels/ChunksStorage.hpp"
+#include "voxels/GlobalChunks.hpp"
 #include "window/Camera.hpp"
 #include "LevelEvents.hpp"
 #include "World.hpp"
@@ -25,7 +25,7 @@ Level::Level(
 )
     : world(std::move(worldPtr)),
       content(content),
-      chunksStorage(std::make_unique<ChunksStorage>(this)),
+      chunksStorage(std::make_unique<GlobalChunks>(this)),
       physics(std::make_unique<PhysicsSolver>(glm::vec3(0, -22.6f, 0))),
       events(std::make_unique<LevelEvents>()),
       entities(std::make_unique<Entities>(this)),

src/world/Level.hpp

@@ -15,7 +15,7 @@ class Inventories;
 class LevelEvents;
 class Lighting;
 class PhysicsSolver;
-class ChunksStorage;
+class GlobalChunks;
 class Camera;
 class Players;
 struct EngineSettings;
@@ -27,7 +27,7 @@ public:
     const Content* const content;
     
     std::unique_ptr<Chunks> chunks;
-    std::unique_ptr<ChunksStorage> chunksStorage;
+    std::unique_ptr<GlobalChunks> chunksStorage;
     std::unique_ptr<Inventories> inventories;
 
     std::unique_ptr<PhysicsSolver> physics;

src/world/World.cpp

@@ -15,7 +15,7 @@
 #include "settings.hpp"
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
-#include "voxels/ChunksStorage.hpp"
+#include "voxels/GlobalChunks.hpp"
 #include "world/generator/WorldGenerator.hpp"
 #include "world/generator/GeneratorDef.hpp"
 #include "Level.hpp"

src/world/generator/VoxelFragment.cpp

@@ -8,7 +8,7 @@
 #include "content/Content.hpp"
 #include "voxels/Chunks.hpp"
 #include "voxels/Block.hpp"
-#include "voxels/ChunksStorage.hpp"
+#include "voxels/GlobalChunks.hpp"
 #include "voxels/VoxelsVolume.hpp"
 #include "world/Level.hpp"
 #include "core_defs.hpp"