#include <glm/gtx/transform.hpp>
+namespace {
+
+blank::Model::Buffer buf;
+
+}
+
namespace blank {
Chunk::Chunk(const BlockTypeRegistry &types)
}
float cur_dist;
glm::vec3 cur_norm;
- Block::Pos pos(float(x) + 0.5f, float(y) + 0.5f, float(z) + 0.5f);
- if (Type(blocks[id]).shape->Intersects(ray, glm::translate(M, pos), cur_dist, cur_norm)) {
+ if (Type(blocks[id]).shape->Intersects(ray, M * ToTransform(id), cur_dist, cur_norm)) {
if (cur_dist < closest_dist) {
closest_id = id;
closest_dist = cur_dist;
if (dirty) {
Update();
}
- model.CheckUpdate();
}
void Chunk::Update() {
vtx_count += shape->VertexCount();
idx_count += shape->VertexIndexCount();
}
- model.Clear();
- model.Reserve(vtx_count, idx_count);
+ buf.Clear();
+ buf.Reserve(vtx_count, idx_count);
Model::Index vtx_counter = 0;
for (size_t i = 0; i < Size(); ++i) {
+ if (Obstructed(i)) continue;
+
const BlockType &type = Type(blocks[i]);
- type.FillModel(model, ToCoords(i), vtx_counter);
+ type.FillModel(buf, ToTransform(i), vtx_counter);
vtx_counter += type.shape->VertexCount();
}
- model.Invalidate();
+ model.Update(buf);
dirty = false;
}
+bool Chunk::Obstructed(int idx) const {
+ if (IsBorder(idx)) return false;
+
+ // not checking neighbor visibility here, so all
+ // invisible blocks must have their fill set to 6x false
+ // (the default, so should be okay)
+
+ const BlockType &right = Type(blocks[idx + 1]);
+ if (!right.fill.left) return false;
+
+ const BlockType &left = Type(blocks[idx - 1]);
+ if (!left.fill.right) return false;
+
+ const BlockType &up = Type(blocks[idx + Width()]);
+ if (!up.fill.down) return false;
+
+ const BlockType &down = Type(blocks[idx - Width()]);
+ if (!down.fill.up) return false;
+
+ const BlockType &front = Type(blocks[idx + Width() * Height()]);
+ if (!front.fill.back) return false;
+
+ const BlockType &back = Type(blocks[idx - Width() * Height()]);
+ if (!back.fill.front) return false;
+
+ return true;
+}
+
+glm::mat4 Chunk::ToTransform(int idx) const {
+ return glm::translate(glm::mat4(1.0f), ToCoords(idx)) * blocks[idx].Transform();
+}
+
ChunkLoader::ChunkLoader(const BlockTypeRegistry ®, const Generator &gen)
: base(0, 0, 0)
explicit ChunkLess(const Chunk::Pos &base)
: base(base) { }
- bool operator ()(const Chunk &a, const Chunk &b) const {
- Chunk::Pos da(base - a.Position());
- Chunk::Pos db(base - b.Position());
+ bool operator ()(const Chunk::Pos &a, const Chunk::Pos &b) const {
+ Chunk::Pos da(base - a);
+ Chunk::Pos db(base - b);
return
da.x * da.x + da.y * da.y + da.z * da.z <
db.x * db.x + db.y * db.y + db.z * db.z;
loaded.emplace_back(reg);
loaded.back().Position(pos);
gen(loaded.back());
+
+ // orientation testing
+ // for (int i = 0; i < Block::FACE_COUNT; ++i) {
+ // for (int j = 0; j < Block::TURN_COUNT; ++j) {
+ // loaded.back().BlockAt(512 * j + 2 * i) = Block(3 * (j + 1), Block::Face(i), Block::Turn(j));
+ // }
+ // }
+ // loaded.back().Invalidate();
+ // loaded.back().CheckUpdate();
} else {
- to_generate.emplace_back(reg);
- to_generate.back().Position(pos);
+ to_generate.emplace_back(pos);
}
}
}
return nullptr;
}
-Chunk *ChunkLoader::Queued(const Chunk::Pos &pos) {
- for (Chunk &chunk : to_generate) {
- if (chunk.Position() == pos) {
- return &chunk;
+bool ChunkLoader::Queued(const Chunk::Pos &pos) {
+ for (const Chunk::Pos &chunk : to_generate) {
+ if (chunk == pos) {
+ return true;
}
}
return nullptr;
}
-Chunk *ChunkLoader::Known(const Chunk::Pos &pos) {
- Chunk *chunk = Loaded(pos);
- if (chunk) return chunk;
-
+bool ChunkLoader::Known(const Chunk::Pos &pos) {
+ if (Loaded(pos)) return true;
return Queued(pos);
}
return *chunk;
}
- chunk = Queued(pos);
- if (chunk) {
- gen(*chunk);
- return *chunk;
+ for (auto iter(to_generate.begin()), end(to_generate.end()); iter != end; ++iter) {
+ if (*iter == pos) {
+ to_generate.erase(iter);
+ break;
+ }
}
loaded.emplace_back(reg);
}
// abort far away queued chunks
for (auto iter(to_generate.begin()), end(to_generate.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 (std::abs(base.x - iter->x) > unload_dist
+ || std::abs(base.y - iter->y) > unload_dist
+ || std::abs(base.z - iter->z) > unload_dist) {
iter = to_generate.erase(iter);
} else {
++iter;
}
void ChunkLoader::Update() {
+ bool reused = false;
if (!to_generate.empty()) {
- gen(to_generate.front());
- loaded.splice(loaded.end(), to_generate, to_generate.begin());
+ Chunk::Pos pos(to_generate.front());
+
+ for (auto iter(to_free.begin()), end(to_free.end()); iter != end; ++iter) {
+ if (iter->Position() == pos) {
+ loaded.splice(loaded.end(), to_free, iter);
+ reused = true;
+ break;
+ }
+ }
+
+ if (!reused) {
+ if (to_free.empty()) {
+ loaded.emplace_back(reg);
+ } else {
+ loaded.splice(loaded.end(), to_free, to_free.begin());
+ reused = true;
+ }
+ loaded.back().Position(pos);
+ gen(loaded.back());
+ }
+ to_generate.pop_front();
}
- if (!to_free.empty()) {
+ if (!reused && !to_free.empty()) {
to_free.pop_front();
}
}
projects / blank.git / blobdiff