limit chunks allocated/freed per frame

diff --git a/src/app.cpp b/src/app.cpp
index 0d7e7dbb8fb511c40dbff366394699c99b1753e7..10a72b8e89e698f2abf52164df4bc91a6b164c96 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -145,7 +145,7 @@ void Application::Update(int dt) {
                        glm::vec3 next_pos = Chunk::ToCoords(blkid) + normal;
                        if (!Chunk::InBounds(next_pos)) {
                                mod_chunk = &world.Next(*chunk, normal);
-                               next_pos -= normal * Chunk::Extent();
+                               next_pos -= normal * glm::vec3(Chunk::Extent());
                        }
                        mod_chunk->BlockAt(next_pos).type = world.BlockTypes()[place_id];
                        mod_chunk->Invalidate();

diff --git a/src/chunk.cpp b/src/chunk.cpp
index 514431cbdd636209368d86127cf812d5facfcad7..483a4e5cd78ccea1f4722deb31ead2f3cfff0e4a 100644 (file)
--- a/src/chunk.cpp
+++ b/src/chunk.cpp
@@ -7,8 +7,9 @@
 namespace blank {
 
 Chunk::Chunk()
-: blocks(Size())
+: blocks()
 , model()
+, position(0, 0, 0)
 , dirty(false) {
 
 }
@@ -28,6 +29,11 @@ Chunk &Chunk::operator =(Chunk &&other) {
 }
 
 
+void Chunk::Allocate() {
+       blocks.resize(Size());
+}
+
+
 void Chunk::Draw() {
        if (dirty) {
                Update();
@@ -93,11 +99,11 @@ bool Chunk::Intersection(
        return true;
 }
 
-void Chunk::Position(const glm::vec3 &pos) {
+void Chunk::Position(const glm::tvec3<int> &pos) {
        position = pos;
 }
 
-glm::mat4 Chunk::Transform(const glm::vec3 &offset) const {
+glm::mat4 Chunk::Transform(const glm::tvec3<int> &offset) const {
        return glm::translate((position - offset) * Extent());
 }
 

diff --git a/src/chunk.hpp b/src/chunk.hpp
index b625a17f7c4518f9d57f89f4bfff818dbe3feab5..d89fefc2edb79e1e9d9dc14533a6a6afba734232 100644 (file)
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -23,10 +23,10 @@ public:
        static constexpr int Width() { return 16; }
        static constexpr int Height() { return 16; }
        static constexpr int Depth() { return 16; }
-       static glm::vec3 Extent() { return glm::vec3(Width(), Height(), Depth()); }
+       static glm::tvec3<int> Extent() { return { Width(), Height(), Depth() }; }
        static constexpr int Size() { return Width() * Height() * Depth(); }
 
-       static AABB Bounds() { return AABB{ { 0, 0, 0 }, { Width(), Height(), Depth() } }; }
+       static AABB Bounds() { return AABB{ { 0, 0, 0 }, Extent() }; }
 
        static constexpr bool InBounds(const glm::vec3 &pos) {
                return
@@ -48,6 +48,7 @@ public:
                );
        }
 
+       void Allocate();
        void Invalidate() { dirty = true; }
 
        Block &BlockAt(int index) { return blocks[index]; }
@@ -62,9 +63,9 @@ public:
                float *dist = nullptr,
                glm::vec3 *normal = nullptr) const;
 
-       void Position(const glm::vec3 &);
-       const glm::vec3 &Position() const { return position; }
-       glm::mat4 Transform(const glm::vec3 &offset) const;
+       void Position(const glm::tvec3<int> &);
+       const glm::tvec3<int> &Position() const { return position; }
+       glm::mat4 Transform(const glm::tvec3<int> &offset) const;
 
        void Draw();
 
@@ -75,7 +76,7 @@ private:
 private:
        std::vector<Block> blocks;
        Model model;
-       glm::vec3 position;
+       glm::tvec3<int> position;
        bool dirty;
 
 };

diff --git a/src/entity.cpp b/src/entity.cpp
index cd2491f1bdf441282ea666a6f15218075b9ac6b6..c572429067c6e0dd77bd4a21ac9e1dde7c864b14 100644 (file)
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -57,7 +57,7 @@ void Entity::Rotation(const glm::mat4 &rot) {
 }
 
 glm::mat4 Entity::Transform(const glm::tvec3<int> &chunk_offset) const {
-       const glm::vec3 chunk_pos = glm::vec3(chunk - chunk_offset) * Chunk::Extent();
+       const glm::vec3 chunk_pos = (chunk - chunk_offset) * Chunk::Extent();
        return glm::translate(position + chunk_pos) * rotation;
 }
 

diff --git a/src/world.cpp b/src/world.cpp
index fb1023f8c5aad75ab50d5fa630f1ca139f05d8c8..4d14dfd89855932058e52e8a00c44d8b8f0d5d30 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -16,7 +16,8 @@ World::World()
 , player()
 , player_chunk(0, 0, 0)
 , loaded()
-, to_generate() {
+, to_generate()
+, to_free() {
        blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &blockShape }); // white block
        blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &stairShape }); // white stair
        blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &slabShape }); // white slab
@@ -37,7 +38,13 @@ World::World()
 namespace {
 
 bool ChunkLess(const Chunk &a, const Chunk &b) {
-       return dot(a.Position(), a.Position()) < dot(b.Position(), b.Position());
+       return
+               a.Position().x * a.Position().x +
+               a.Position().y * a.Position().y +
+               a.Position().z * a.Position().z <
+               b.Position().x * b.Position().x +
+               b.Position().y * b.Position().y +
+               b.Position().z * b.Position().z;
 }
 
 }
@@ -64,6 +71,7 @@ void World::Generate(const glm::tvec3<int> &from, const glm::tvec3<int> &to) {
 }
 
 void World::Generate(Chunk &chunk) {
+       chunk.Allocate();
        glm::vec3 pos(chunk.Position());
        if (pos.x == 0 && pos.y == 0 && pos.z == 0) {
                for (size_t i = 1; i < blockType.Size(); ++i) {
@@ -76,7 +84,7 @@ void World::Generate(Chunk &chunk) {
                        for (int y = 0; y < Chunk::Height(); ++y) {
                                for (int x = 0; x < Chunk::Width(); ++x) {
                                        glm::vec3 block_pos{float(x), float(y), float(z)};
-                                       glm::vec3 gen_pos = (pos * Chunk::Extent() + block_pos) / 64.0f;
+                                       glm::vec3 gen_pos = (pos * glm::vec3(Chunk::Extent()) + block_pos) / 64.0f;
                                        float val = blockNoise(gen_pos);
                                        if (val > 0.8f) {
                                                int col_val = int((colorNoise(gen_pos) + 1.0f) * 2.0f) % 4;
@@ -156,8 +164,8 @@ Chunk *World::ChunkAvailable(const glm::tvec3<int> &pos) {
        return ChunkQueued(pos);
 }
 
-Chunk &World::Next(const Chunk &to, const glm::vec3 &dir) {
-       const glm::vec3 tgt_pos = to.Position() + dir;
+Chunk &World::Next(const Chunk &to, const glm::tvec3<int> &dir) {
+       const glm::tvec3<int> tgt_pos = to.Position() + dir;
 
        Chunk *chunk = ChunkLoaded(tgt_pos);
        if (chunk) {
@@ -193,7 +201,9 @@ void World::CheckChunkGeneration() {
                        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);
+                               auto saved = iter;
+                               ++iter;
+                               to_free.splice(to_free.end(), loaded, saved);
                        } else {
                                ++iter;
                        }
@@ -217,6 +227,10 @@ void World::CheckChunkGeneration() {
                Generate(to_generate.front());
                loaded.splice(loaded.end(), to_generate, to_generate.begin());
        }
+
+       if (!to_free.empty()) {
+               to_free.pop_front();
+       }
 }
 
 

diff --git a/src/world.hpp b/src/world.hpp
index 6b6aaf09c9d260492a3125313a0f32eac2112314..4c7a59f4f607fae03c9ef297f5a4657466199d55 100644 (file)
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -37,7 +37,7 @@ public:
        Chunk *ChunkLoaded(const glm::tvec3<int> &);
        Chunk *ChunkQueued(const glm::tvec3<int> &);
        Chunk *ChunkAvailable(const glm::tvec3<int> &);
-       Chunk &Next(const Chunk &, const glm::vec3 &dir);
+       Chunk &Next(const Chunk &, const glm::tvec3<int> &dir);
 
        void Update(int dt);
        void CheckChunkGeneration();
@@ -61,6 +61,7 @@ private:
 
        std::list<Chunk> loaded;
        std::list<Chunk> to_generate;
+       std::list<Chunk> to_free;
 
 };