} else if (!new_type.block_light && old_type.block_light) {
// obstacle removed
int level = 0;
+ Pos pos(ToPos(index));
for (int face = 0; face < Block::FACE_COUNT; ++face) {
- BlockLookup next_block(this, ToPos(index), Block::Face(face));
+ BlockLookup next_block(this, pos, Block::Face(face));
if (next_block) {
- level = std::min(level, next_block.GetLight());
+ level = std::max(level, next_block.GetLight());
}
}
if (level > 1) {
SetLight(index, level - 1);
- light_queue.emplace(this, ToPos(index));
+ light_queue.emplace(this, pos);
work_light();
}
}
float &dist,
glm::vec3 &normal
) const noexcept {
- // TODO: should be possible to heavily optimize this
int idx = 0;
blkid = -1;
dist = std::numeric_limits<float>::infinity();
, loaded()
, to_generate()
, to_free()
+, gen_timer(config.gen_limit)
, load_dist(config.load_dist)
, unload_dist(config.unload_dist) {
-
+ gen_timer.Start();
}
namespace {
return true;
}
}
- return nullptr;
+ return false;
}
bool ChunkLoader::Known(const Chunk::Pos &pos) noexcept {
return Generate(pos);
}
+bool ChunkLoader::OutOfRange(const Chunk::Pos &pos) const noexcept {
+ return std::abs(base.x - pos.x) > unload_dist
+ || std::abs(base.y - pos.y) > unload_dist
+ || std::abs(base.z - pos.z) > unload_dist;
+}
+
void ChunkLoader::Rebase(const Chunk::Pos &new_base) {
if (new_base == base) {
return;
// unload far away chunks
for (auto iter(loaded.begin()), end(loaded.end()); iter != end;) {
- if (std::abs(base.x - iter->Position().x) > unload_dist
- || std::abs(base.y - iter->Position().y) > unload_dist
- || std::abs(base.z - iter->Position().z) > unload_dist) {
+ if (OutOfRange(*iter)) {
auto saved = iter;
Remove(*saved);
++iter;
}
// abort far away queued chunks
for (auto iter(to_generate.begin()), end(to_generate.end()); iter != end;) {
- if (std::abs(base.x - iter->x) > unload_dist
- || std::abs(base.y - iter->y) > unload_dist
- || std::abs(base.z - iter->z) > unload_dist) {
+ if (OutOfRange(*iter)) {
iter = to_generate.erase(iter);
} else {
++iter;
Generate(pos - offset, pos + offset);
}
-void ChunkLoader::Update() {
- if (to_generate.empty()) {
+void ChunkLoader::Update(int dt) {
+ gen_timer.Update(dt);
+ if (!gen_timer.Hit() || to_generate.empty()) {
return;
}
if (iter->Position() == pos) {
iter->Relink();
loaded.splice(loaded.end(), to_free, iter);
- return;
}
}