From addf4eb6485a36d40096d87196ed786e6e16ab6d Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Mon, 9 Mar 2015 18:28:20 +0100 Subject: [PATCH] generate and unload chunks on player move slow as hell --- src/world.cpp | 80 +++++++++++++++++++++++++++++++++++++++++++++------ src/world.hpp | 5 ++++ 2 files changed, 76 insertions(+), 9 deletions(-) diff --git a/src/world.cpp b/src/world.cpp index 7f30d71..fb1023f 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -14,6 +14,7 @@ World::World() , blockNoise(0) , colorNoise(1) , player() +, player_chunk(0, 0, 0) , loaded() , to_generate() { blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &blockShape }); // white block @@ -46,7 +47,9 @@ void World::Generate(const glm::tvec3 &from, const glm::tvec3 &to) { for (int y = from.y; y < to.y; ++y) { for (int x = from.x; x < to.x; ++x) { glm::vec3 pos{float(x), float(y), float(z)}; - if (x == 0 && y == 0 && z == 0) { + if (ChunkAvailable(pos)) { + continue; + } else if (x == 0 && y == 0 && z == 0) { loaded.emplace_back(); loaded.back().Position(pos); Generate(loaded.back()); @@ -128,19 +131,45 @@ bool World::Intersection( } -Chunk &World::Next(const Chunk &to, const glm::vec3 &dir) { - const glm::vec3 tgt_pos = to.Position() + dir; - for (Chunk &chunk : LoadedChunks()) { - if (chunk.Position() == tgt_pos) { - return chunk; +Chunk *World::ChunkLoaded(const glm::tvec3 &pos) { + for (Chunk &chunk : loaded) { + if (glm::tvec3(chunk.Position()) == pos) { + return &chunk; } } + return nullptr; +} + +Chunk *World::ChunkQueued(const glm::tvec3 &pos) { for (Chunk &chunk : to_generate) { - if (chunk.Position() == tgt_pos) { - Generate(chunk); - return chunk; + if (glm::tvec3(chunk.Position()) == pos) { + return &chunk; } } + return nullptr; +} + +Chunk *World::ChunkAvailable(const glm::tvec3 &pos) { + Chunk *chunk = ChunkLoaded(pos); + if (chunk) return chunk; + + return ChunkQueued(pos); +} + +Chunk &World::Next(const Chunk &to, const glm::vec3 &dir) { + const glm::vec3 tgt_pos = to.Position() + dir; + + Chunk *chunk = ChunkLoaded(tgt_pos); + if (chunk) { + return *chunk; + } + + chunk = ChunkQueued(tgt_pos); + if (chunk) { + Generate(*chunk); + return *chunk; + } + loaded.emplace_back(); loaded.back().Position(tgt_pos); Generate(loaded.back()); @@ -151,6 +180,39 @@ Chunk &World::Next(const Chunk &to, const glm::vec3 &dir) { void World::Update(int dt) { player.Update(dt); + CheckChunkGeneration(); +} + +void World::CheckChunkGeneration() { + if (player.ChunkCoords() != player_chunk) { + player_chunk = player.ChunkCoords(); + + constexpr int max_dist = 8; + // unload far away chunks + for (auto iter(loaded.begin()), end(loaded.end()); iter != end;) { + if (std::abs(player_chunk.x - iter->Position().x) > max_dist + || std::abs(player_chunk.y - iter->Position().y) > max_dist + || std::abs(player_chunk.z - iter->Position().z) > max_dist) { + iter = loaded.erase(iter); + } else { + ++iter; + } + } + // abort far away queued chunks + for (auto iter(to_generate.begin()), end(to_generate.end()); iter != end;) { + if (std::abs(player_chunk.x - iter->Position().x) > max_dist + || std::abs(player_chunk.y - iter->Position().y) > max_dist + || std::abs(player_chunk.z - iter->Position().z) > max_dist) { + iter = to_generate.erase(iter); + } else { + ++iter; + } + } + // add missing new chunks + glm::tvec3 offset(max_dist, max_dist, max_dist); + Generate(player_chunk - offset, player_chunk + offset); + } + if (!to_generate.empty()) { Generate(to_generate.front()); loaded.splice(loaded.end(), to_generate, to_generate.begin()); diff --git a/src/world.hpp b/src/world.hpp index 8ef2b21..6b6aaf0 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -34,9 +34,13 @@ public: Entity &Player() { return player; } + Chunk *ChunkLoaded(const glm::tvec3 &); + Chunk *ChunkQueued(const glm::tvec3 &); + Chunk *ChunkAvailable(const glm::tvec3 &); Chunk &Next(const Chunk &, const glm::vec3 &dir); void Update(int dt); + void CheckChunkGeneration(); void Render(DirectionalLighting &); @@ -53,6 +57,7 @@ private: SimplexNoise colorNoise; Entity player; + glm::tvec3 player_chunk; std::list loaded; std::list to_generate; -- 2.39.2