rename Level.chunksStorage to Level.chunks

This commit is contained in:
MihailRis
2024-12-17 23:57:00 +03:00
parent 70370904db
commit 48d94036fd
14 changed files with 46 additions and 51 deletions
+3 -3
View File
@@ -24,7 +24,7 @@ Level::Level(
: settings(settings),
world(std::move(worldPtr)),
content(content),
chunksStorage(std::make_unique<GlobalChunks>(this)),
chunks(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)),
@@ -53,10 +53,10 @@ Level::Level(
}
events->listen(LevelEventType::EVT_CHUNK_SHOWN, [this](LevelEventType, Chunk* chunk) {
chunksStorage->incref(chunk);
chunks->incref(chunk);
});
events->listen(LevelEventType::EVT_CHUNK_HIDDEN, [this](LevelEventType, Chunk* chunk) {
chunksStorage->decref(chunk);
chunks->decref(chunk);
});
inventories = std::make_unique<Inventories>(*this);
}
+1 -1
View File
@@ -25,7 +25,7 @@ class Level {
public:
const Content* const content;
std::unique_ptr<GlobalChunks> chunksStorage;
std::unique_ptr<GlobalChunks> chunks;
std::unique_ptr<Inventories> inventories;
std::unique_ptr<PhysicsSolver> physics;
+1 -1
View File
@@ -66,7 +66,7 @@ void World::writeResources(const Content* content) {
void World::write(Level* level) {
const Content* content = level->content;
level->chunksStorage->saveAll();
level->chunks->saveAll();
info.nextEntityId = level->entities->peekNextID();
wfile->write(this, content);
+2 -2
View File
@@ -27,7 +27,7 @@ std::unique_ptr<VoxelFragment> VoxelFragment::create(
if (crop) {
VoxelsVolume volume(size.x, size.y, size.z);
volume.setPosition(start.x, start.y, start.z);
blocks_agent::get_voxels(*level.chunksStorage, &volume);
blocks_agent::get_voxels(*level.chunks, &volume);
auto end = start + size;
@@ -52,7 +52,7 @@ std::unique_ptr<VoxelFragment> VoxelFragment::create(
VoxelsVolume volume(size.x, size.y, size.z);
volume.setPosition(start.x, start.y, start.z);
blocks_agent::get_voxels(*level.chunksStorage, &volume);
blocks_agent::get_voxels(*level.chunks, &volume);
auto volVoxels = volume.getVoxels();
std::vector<voxel> voxels(size.x * size.y * size.z);