From b2872650d68edd6b5ca570cca5db260a1a308507 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Fri, 1 Jul 2022 02:34:34 +0300 Subject: [PATCH] mini-fix --- src/voxel_engine.cpp | 2 +- src/voxels/ChunksLoader.cpp | 2 +- src/voxels/ChunksLoader.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp index 9fc3e307..4eafd412 100644 --- a/src/voxel_engine.cpp +++ b/src/voxel_engine.cpp @@ -92,7 +92,7 @@ void update_level(World* world, Level* level, vec3 position, float delta, long f } Level* load_level(World* world, Player* player) { - Level* level = new Level(world, player, new Chunks(32,1,32, 0,0,0), new PhysicsSolver(vec3(0, -gravity, 0))); + Level* level = new Level(world, player, new Chunks(34,1,34, 0,0,0), new PhysicsSolver(vec3(0, -gravity, 0))); world->wfile->readPlayer(player); Camera* camera = player->camera; diff --git a/src/voxels/ChunksLoader.cpp b/src/voxels/ChunksLoader.cpp index f71b5363..4c4796ad 100644 --- a/src/voxels/ChunksLoader.cpp +++ b/src/voxels/ChunksLoader.cpp @@ -33,7 +33,7 @@ void ChunksLoader::_thread(){ if (state == LOAD){ chunks.putChunk(chunk); if (!chunk->loaded){ - WorldGenerator::generate(chunk->voxels, chunk->x, chunk->y, chunk->z, world.load()->seed); + WorldGenerator::generate(chunk->voxels, chunk->x, chunk->y, chunk->z, world->seed); } lighting.onChunkLoaded(chunk->x, chunk->y, chunk->z, true); diff --git a/src/voxels/ChunksLoader.h b/src/voxels/ChunksLoader.h index 5e5a5b22..37c623fd 100644 --- a/src/voxels/ChunksLoader.h +++ b/src/voxels/ChunksLoader.h @@ -23,8 +23,8 @@ private: void _thread(); std::atomic current {nullptr}; std::atomic closes {nullptr}; - std::atomic world {nullptr}; std::atomic state {IDLE}; + World* world; void perform(Chunk* chunk, Chunk** closes_passed, LoaderMode mode); public: