store block type as ID rather than pointer

[blank.git] / src / chunk.cpp

diff --git a/src/chunk.cpp b/src/chunk.cpp
index a485bfbb7d37c61eab4f80c091f1b78659c29b01..e52a19f81d2c4898681f2213adfa4dc0e2b6fde2 100644 (file)
--- a/src/chunk.cpp
+++ b/src/chunk.cpp
@@ -6,21 +6,25 @@
 
 namespace blank {
 
-Chunk::Chunk()
-: blocks(Size())
+Chunk::Chunk(const BlockTypeRegistry &types)
+: types(&types)
+, blocks()
 , model()
+, position(0, 0, 0)
 , dirty(false) {
 
 }
 
 Chunk::Chunk(Chunk &&other)
-: blocks(std::move(other.blocks))
+: types(other.types)
+, blocks(std::move(other.blocks))
 , model(std::move(other.model))
 , dirty(other.dirty) {
 
 }
 
 Chunk &Chunk::operator =(Chunk &&other) {
+       types = other.types;
        blocks = std::move(other.blocks);
        model = std::move(other.model);
        dirty = other.dirty;
@@ -28,6 +32,11 @@ Chunk &Chunk::operator =(Chunk &&other) {
 }
 
 
+void Chunk::Allocate() {
+       blocks.resize(Size());
+}
+
+
 void Chunk::Draw() {
        if (dirty) {
                Update();
@@ -43,8 +52,7 @@ bool Chunk::Intersection(
        float *dist,
        glm::vec3 *normal) const {
        { // rough check
-               const AABB bb{{0, 0, 0}, {Width(), Height(), Depth()}};
-               if (!blank::Intersection(ray, bb, M)) {
+               if (!blank::Intersection(ray, Bounds(), M)) {
                        return false;
                }
        }
@@ -61,13 +69,13 @@ bool Chunk::Intersection(
        for (int z = 0; z < Depth(); ++z) {
                for (int y = 0; y < Height(); ++y) {
                        for (int x = 0; x < Width(); ++x, ++id) {
-                               if (!blocks[id].type->visible) {
+                               if (!Type(blocks[id]).visible) {
                                        continue;
                                }
                                float cur_dist;
                                glm::vec3 cur_norm;
-                               glm::vec3 pos(float(x) + 0.5f, float(y) + 0.5f, float(z) + 0.5f);
-                               if (blocks[id].type->shape->Intersects(ray, glm::translate(M, pos), cur_dist, 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 (cur_dist < closest_dist) {
                                                closest_id = id;
                                                closest_dist = cur_dist;
@@ -94,11 +102,11 @@ bool Chunk::Intersection(
        return true;
 }
 
-void Chunk::Position(const glm::vec3 &pos) {
+void Chunk::Position(const Pos &pos) {
        position = pos;
 }
 
-glm::mat4 Chunk::Transform(const glm::vec3 &offset) const {
+glm::mat4 Chunk::Transform(const Pos &offset) const {
        return glm::translate((position - offset) * Extent());
 }
 
@@ -106,7 +114,7 @@ glm::mat4 Chunk::Transform(const glm::vec3 &offset) const {
 int Chunk::VertexCount() const {
        int count = 0;
        for (const auto &block : blocks) {
-               count += block.type->shape->VertexCount();
+               count += Type(block).shape->VertexCount();
        }
        return count;
 }
@@ -116,7 +124,7 @@ void Chunk::Update() {
        model.Reserve(VertexCount());
 
        for (size_t i = 0; i < Size(); ++i) {
-               blocks[i].type->FillModel(ToCoords(i), model);
+               Type(blocks[i]).FillModel(ToCoords(i), model);
        }
 
        model.Invalidate();