feat: add cave (#8)

* feat: add cave generate

* fix: incorrect blocks on cave surface

* fix: non-deterministic cave generator

* refactor: move all chunk generation to dedicated generation thread

* refactor: remove inital cave

* feat: add cave parameter adjustment

* refactor: adjust cave probability

src/gameplay/cave_carver.cpp

@@ -0,0 +1,52 @@
+#include "Cubed/gameplay/cave_carver.hpp"
+
+#include "Cubed/constants.hpp"
+
+namespace Cubed {
+CaveCarver::CaveCarver() {}
+
+std::unordered_map<int, CavePath>& CaveCarver::paths() { return m_paths; }
+
+void CaveCarver::init(unsigned world_seed) {
+    m_seed = world_seed;
+    m_sum = 0;
+    m_random.init(m_seed);
+}
+
+void CaveCarver::reload(unsigned world_seed) {
+    m_seed = world_seed;
+    m_paths.clear();
+    init(world_seed);
+}
+
+void CaveCarver::add_path(const glm::vec3& pos) {
+    m_paths.emplace(m_sum, CavePath{m_seed, m_sum, pos});
+    m_sum++;
+}
+
+void CaveCarver::try_to_add_path(const ChunkPos& chunk_pos,
+                                 unsigned chunk_seed) {
+    Random random{chunk_seed};
+    if (random.random_bool(static_cast<double>(m_cave_probability))) {
+        const int CHUNK_MIN_X = chunk_pos.x * CHUNK_SIZE;
+        const int CHUNK_MIN_Z = chunk_pos.z * CHUNK_SIZE;
+        const int CHUNK_MAX_X = CHUNK_MIN_X + SIZE_X - 1;
+        const int CHUNK_MAX_Z = CHUNK_MIN_Z + SIZE_Z - 1;
+        const int CHUNK_MIN_Y = 0;
+        const int CHUNK_MAX_Y = SIZE_Y - 1;
+        int max_y = std::min(CHUNK_MAX_Y, 40);
+        int x = random.random_int(CHUNK_MIN_X, CHUNK_MAX_X);
+        int y = random.random_int(CHUNK_MIN_Y + 1, max_y);
+        int z = random.random_int(CHUNK_MIN_Z, CHUNK_MAX_Z);
+        add_path(glm::vec3{x, y, z});
+    }
+}
+
+void CaveCarver::cleanup_finished_caves() {
+    std::erase_if(m_paths,
+                  [](const auto& kv) { return kv.second.is_finished(); });
+}
+
+int CaveCarver::cave_sum() const { return m_sum; }
+float& CaveCarver::cave_probability() { return m_cave_probability; }
+} // namespace Cubed

src/gameplay/cave_path.cpp

@@ -0,0 +1,95 @@
+#include "Cubed/gameplay/cave_path.hpp"
+
+#include "Cubed/constants.hpp"
+#include "Cubed/tools/cubed_hash.hpp"
+#include "Cubed/tools/math_tools.hpp"
+
+#include <algorithm>
+namespace Cubed {
+CavePath::CavePath(unsigned int world_seed, int path_id,
+                   const glm::vec3& start_pos) {
+    m_path_id = path_id;
+    m_seed = HASH::combine_32(world_seed, path_id);
+    m_random.init(m_seed);
+    m_yaw = m_random.random_float(0.0f, 360.0f);
+    m_pitch = m_random.random_float(-10.0f, 10.0f);
+    m_start_path_point.pos = start_pos;
+    m_start_path_point.rad_xz =
+        m_random.random_float(m_radius_xz_min, m_radius_xz_max);
+    m_start_path_point.rad_y =
+        m_random.random_float(m_radius_y_min, m_radius_y_max);
+    m_step = m_random.random_int(m_step_min, m_step_max);
+    m_points.reserve(m_step + 1);
+    m_points.push_back(m_start_path_point);
+    collect_path_points();
+    precompute_chunk_coverage();
+}
+
+void CavePath::collect_path_points() {
+    for (int i = 0; i < m_step; i++) {
+
+        m_yaw = std::fmod(m_yaw, 360.0f);
+        if (m_yaw < 0.0f)
+            m_yaw += 360.0f;
+        m_pitch = std::clamp(m_pitch, -90.0f, 90.0f);
+
+        float dx = std::cos(glm::radians(m_pitch)) *
+                   std::sin(glm::radians(m_yaw)) * m_step_len;
+        float dy = std::sin(glm::radians(m_pitch)) * m_step_len;
+        float dz = std::cos(glm::radians(m_pitch)) *
+                   std::cos(glm::radians(m_yaw)) * m_step_len;
+
+        m_points[i].tangent = glm::normalize(glm::vec3{dx, dy, dz});
+
+        float t = Math::smootherstep(0, m_step - 1, i);
+
+        float drad_xz = m_start_path_point.rad_xz * (1.0f - t);
+        float drad_y = m_start_path_point.rad_y * (1.0f - t);
+        drad_xz = std::max(drad_xz, 4.0f);
+        drad_y = std::max(drad_y, 4.0f);
+        m_points.emplace_back(m_points[i].pos + glm::vec3{dx, dy, dz}, drad_xz,
+                              drad_y);
+
+        m_yaw += m_random.random_float(m_delta_angle_min, m_delta_angle_max);
+        m_pitch += m_random.random_float(m_delta_angle_min, m_delta_angle_max);
+    }
+    auto n = m_points.size();
+    if (n >= 2) {
+        m_points[n - 1].tangent = m_points[n - 2].tangent;
+    }
+}
+
+void CavePath::precompute_chunk_coverage() {
+    for (const auto& point : m_points) {
+        float rad = point.rad_xz;
+        const glm::vec3& center = point.pos;
+
+        int min_cx =
+            static_cast<int>(std::floor((center.x - rad) / CHUNK_SIZE));
+        int max_cx =
+            static_cast<int>(std::floor((center.x + rad) / CHUNK_SIZE));
+        int min_cz =
+            static_cast<int>(std::floor((center.z - rad) / CHUNK_SIZE));
+        int max_cz =
+            static_cast<int>(std::floor((center.z + rad) / CHUNK_SIZE));
+
+        for (int cx = min_cx; cx <= max_cx; ++cx)
+            for (int cz = min_cz; cz <= max_cz; ++cz)
+                m_pending_chunks.insert({cx, cz});
+    }
+}
+
+void CavePath::clear_chunk(const ChunkPos& pos) { m_pending_chunks.erase(pos); }
+const std::vector<PathPoint>& CavePath::points() const { return m_points; }
+bool CavePath::is_finished() const { return m_pending_chunks.empty(); }
+
+float& CavePath::radius_xz_min() { return m_radius_xz_min; }
+float& CavePath::radius_xz_max() { return m_radius_xz_max; }
+float& CavePath::radius_y_min() { return m_radius_y_min; }
+float& CavePath::radius_y_max() { return m_radius_y_max; }
+float& CavePath::delta_angle_min() { return m_delta_angle_min; }
+float& CavePath::delta_angle_max() { return m_delta_angle_max; }
+int& CavePath::step_min() { return m_step_min; }
+int& CavePath::step_max() { return m_step_max; }
+
+} // namespace Cubed

src/gameplay/chunk.cpp

@@ -24,7 +24,7 @@ Chunk::Chunk(Chunk&& other) noexcept
       m_chunk_pos(std::move(other.m_chunk_pos)), m_world(other.m_world),
       m_heightmap(std::move(other.m_heightmap)),
       m_blocks(std::move(other.m_blocks)), m_vbo(other.m_vbo),
-      m_vertexs_data(std::move(other.m_vertexs_data)) {
+      m_vertexs_data(std::move(other.m_vertexs_data)), m_seed(other.m_seed) {
     other.m_vbo = 0;
 }
 
@@ -43,6 +43,7 @@ Chunk& Chunk::operator=(Chunk&& other) noexcept {
     m_is_on_gen_vertex_data = other.m_is_on_gen_vertex_data.load();
     m_need_upload = other.m_need_upload.load();
     m_vertex_sum = other.m_vertex_sum.load();
+    m_seed = other.m_seed;
     return *this;
 }
 
@@ -213,6 +214,7 @@ void Chunk::gen_phase_one() {
         return;
     }
     m_generator->assign_chunk_biome();
+    m_seed = m_generator->chunk_seed();
 }
 
 void Chunk::gen_phase_two(const std::array<const Chunk*, 8>& adj_chunks) {
@@ -255,7 +257,7 @@ void Chunk::gen_phase_six(
         Logger::error("ChunkGenerator is Nullptr");
         return;
     }
-    m_generator->blend_surface_blocks_borders(neighbor_block);
+    // m_generator->blend_surface_blocks_borders(neighbor_block);
 }
 
 void Chunk::gen_phase_seven() {
@@ -307,4 +309,11 @@ void Chunk::biome(BiomeType b) { m_biome = b; }
 
 HeightMapArray& Chunk::heightmap() { return m_heightmap; }
 std::vector<uint8_t>& Chunk::blocks() { return m_blocks; }
+World& Chunk::world() { return m_world; }
+unsigned Chunk::seed() const {
+    if (m_seed == 0) {
+        Logger::warn("Seed Not Generator");
+    }
+    return m_seed;
+}
 } // namespace Cubed

src/gameplay/chunk_generator.cpp

@@ -7,9 +7,9 @@
 #include "Cubed/gameplay/builders/river_builder.hpp"
 #include "Cubed/gameplay/chunk.hpp"
 #include "Cubed/gameplay/tree.hpp"
+#include "Cubed/gameplay/world.hpp"
 #include "Cubed/tools/cubed_hash.hpp"
 #include "Cubed/tools/perlin_noise.hpp"
-
 namespace Cubed {
 
 using enum BiomeType;
@@ -20,6 +20,7 @@ ChunkGenerator::ChunkGenerator(Chunk& chunk) : m_chunk(chunk) {
     ChunkPos pos = m_chunk.get_chunk_pos();
     unsigned seed = HASH::mix_hash(pos.x, pos.z, m_generator_seed);
     m_random.init(seed);
+    m_chunk_seed = seed;
 }
 
 void ChunkGenerator::init() {
@@ -43,7 +44,12 @@ void ChunkGenerator::seed(unsigned s) {
     is_seed_change = true;
     m_generator_seed = s;
 }
-
+unsigned ChunkGenerator::chunk_seed() const {
+    if (m_chunk_seed == 0) {
+        Logger::warn("Chunk Seed Generator Fail");
+    }
+    return m_chunk_seed;
+}
 void ChunkGenerator::assign_chunk_biome() {
     auto m_chunk_pos = m_chunk.chunk_pos();
     float x = static_cast<float>(m_chunk_pos.x);
@@ -356,6 +362,7 @@ void ChunkGenerator::generate_terrain_blocks() {
     }
     m_chunk.blocks().assign(CHUNK_SIZE * CHUNK_SIZE * WORLD_SIZE_Y, 0);
     m_biome_builder->build_biome();
+    generate_cave();
 }
 
 void ChunkGenerator::blend_surface_blocks_borders(
@@ -511,6 +518,61 @@ void ChunkGenerator::make_biome_builder() {
     }
 }
 
+void ChunkGenerator::generate_cave() {
+    auto& cave_carver = m_chunk.world().cave_carcer();
+    auto& paths = cave_carver.paths();
+    const auto& chunk_pos = m_chunk.chunk_pos();
+    auto& blocks = m_chunk.blocks();
+    const int CHUNK_MIN_X = chunk_pos.x * CHUNK_SIZE;
+    const int CHUNK_MIN_Z = chunk_pos.z * CHUNK_SIZE;
+    const int CHUNK_MAX_X = CHUNK_MIN_X + SIZE_X - 1;
+    const int CHUNK_MAX_Z = CHUNK_MIN_Z + SIZE_Z - 1;
+    const int CHUNK_MIN_Y = 0;
+    const int CHUNK_MAX_Y = SIZE_Y - 1;
+    for (auto& [id, path] : paths) {
+        for (const auto& point : path.points()) {
+
+            const glm::vec3& center = point.pos;
+            float rad_xz = point.rad_xz;
+            float rad_y = point.rad_y;
+
+            int min_x = static_cast<int>(std::floor(center.x - rad_xz));
+            int max_x = static_cast<int>(std::floor(center.x + rad_xz));
+            int min_z = static_cast<int>(std::floor(center.z - rad_xz));
+            int max_z = static_cast<int>(std::floor(center.z + rad_xz));
+            int min_y = static_cast<int>(std::floor(center.y - rad_y));
+            int max_y = static_cast<int>(std::floor(center.y + rad_y));
+
+            min_x = std::max(min_x, CHUNK_MIN_X);
+            max_x = std::min(max_x, CHUNK_MAX_X);
+            min_z = std::max(min_z, CHUNK_MIN_Z);
+            max_z = std::min(max_z, CHUNK_MAX_Z);
+            min_y = std::max(min_y, CHUNK_MIN_Y);
+            max_y = std::min(max_y, CHUNK_MAX_Y);
+
+            for (int wx = min_x; wx <= max_x; ++wx) {
+                int x = wx - CHUNK_MIN_X;
+                for (int wz = min_z; wz <= max_z; ++wz) {
+                    int z = wz - CHUNK_MIN_Z;
+                    for (int wy = min_y; wy <= max_y; ++wy) {
+                        int y = wy;
+                        glm::vec3 pos(static_cast<float>(wx),
+                                      static_cast<float>(wy),
+                                      static_cast<float>(wz));
+                        if (point.contains(pos)) {
+                            if (y == 0) {
+                                continue;
+                            }
+                            blocks[Chunk::get_index(x, y, z)] = 0;
+                        }
+                    }
+                }
+            }
+        }
+        path.clear_chunk(chunk_pos);
+    }
+}
+
 Chunk& ChunkGenerator::chunk() { return m_chunk; }
 
 Random& ChunkGenerator::random() { return m_random; }

src/gameplay/player.cpp

@@ -237,10 +237,7 @@ void Player::update_front_vec(float offset_x, float offset_y) {
 
     m_yaw = std::fmod(m_yaw, 360.0);
 
-    if (m_pitch > 89.0f)
-        m_pitch = 89.0f;
-    if (m_pitch < -89.0f)
-        m_pitch = -89.0f;
+    m_pitch = std::clamp(m_pitch, -89.0f, 89.0f);
 
     m_front.x = sin(glm::radians(m_yaw)) * cos(glm::radians(m_pitch));
     m_front.y = sin(glm::radians(m_pitch));

src/gameplay/world.cpp

@@ -7,8 +7,6 @@
 #include "Cubed/tools/cubed_hash.hpp"
 #include "Cubed/tools/math_tools.hpp"
 
-#include <execution>
-
 namespace Cubed {
 
 struct ChunkRenderData {
@@ -65,23 +63,30 @@ Player& World::get_player(const std::string& name) {
 }
 
 void World::init_world() {
+    m_cave_carcer.init(ChunkGenerator::seed());
     m_chunks.reserve(MAX_DISTANCE * MAX_DISTANCE * 4);
     auto t1 = std::chrono::system_clock::now();
 
     Logger::info("Max Support Thread is {}",
                  std::thread::hardware_concurrency());
+    // init players
+    m_players.emplace(HASH::str("TestPlayer"), Player(*this, "TestPlayer"));
+
+    start_gen_thread();
     init_chunks();
     auto t2 = std::chrono::system_clock::now();
     auto d = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1);
     Logger::info("Chunk Block Init Finish, Time Consuming: {}", d);
-    // init players
-    m_players.emplace(HASH::str("TestPlayer"), Player(*this, "TestPlayer"));
+
     Logger::info("TestPlayer Create Finish");
-
-    start_gen_thread();
-    hot_reload();
 }
-
+void World::init_chunks() {
+    hot_reload();
+    while (!m_chunk_gen_finished) {
+        std::this_thread::sleep_for(std::chrono::microseconds(200));
+    }
+}
+/*
 void World::init_chunks() {
 
     int dis_x = PRE_LOAD_DISTANCE;
@@ -112,11 +117,13 @@ void World::init_chunks() {
             }
         }
     }
-    for (auto& [pos, chunks] : m_chunks) {
-        chunks.gen_phase_one();
+    for (auto& [pos, chunk] : m_chunks) {
+        chunk.gen_phase_one();
+        m_cave_carcer.try_to_add_path(pos, chunk.seed());
     }
-    for (auto& [pos, chunks] : temp_neighbor) {
-        chunks.gen_phase_one();
+    for (auto& [pos, chunk] : temp_neighbor) {
+        chunk.gen_phase_one();
+        m_cave_carcer.try_to_add_path(pos, chunk.seed());
     }
 
     std::array<const Chunk*, 8> neighbor_chunks;
@@ -251,6 +258,8 @@ void World::init_chunks() {
     sync.store(1, std::memory_order_release);
     sync.load(std::memory_order_acquire);
 
+    m_cave_carcer.cleanup_finished_caves();
+
     std::vector<ChunkRenderData> pending_gen_data;
     pending_gen_data.reserve(m_chunks.size());
     for (auto& [pos, chunk] : m_chunks) {
@@ -278,7 +287,7 @@ void World::init_chunks() {
         chunk.upload_to_gpu();
     }
 }
-
+*/
 void World::render(const glm::mat4& mvp_matrix) {
     Math::extract_frustum_planes(mvp_matrix, m_planes);
     int rendered_sum = 0;
@@ -325,6 +334,7 @@ ChunkPos World::chunk_pos(int world_x, int world_z) {
 
 void World::gen_chunks_internal() {
     m_chunk_gen_fraction = 0.0f;
+    m_chunk_gen_finished = false;
     ChunkPosSet required_chunks;
     compute_required_chunks(required_chunks);
 
@@ -356,9 +366,11 @@ void World::gen_chunks_internal() {
 
     for (auto& [pos, chunk] : new_chunks) {
         chunk.gen_phase_one();
+        m_cave_carcer.try_to_add_path(pos, chunk.seed());
     }
     for (auto& [pos, chunk] : temp_neighbor) {
         chunk.gen_phase_one();
+        m_cave_carcer.try_to_add_path(pos, chunk.seed());
     }
     m_chunk_gen_fraction = 0.2f;
     std::array<const Chunk*, 8> neighbor_chunks;
@@ -500,7 +512,9 @@ void World::gen_chunks_internal() {
             m_new_chunk_queue.emplace_back(std::move(x));
         }
     }
+    m_cave_carcer.cleanup_finished_caves();
     m_chunk_gen_fraction = 1.0f;
+    m_chunk_gen_finished = true;
 }
 
 void World::sync_player_pos(glm::vec3& player_pos) {
@@ -819,7 +833,7 @@ void World::rebuild_world() {
     }
     m_is_rebuilding = true;
     stop_gen_thread();
-
+    m_cave_carcer.reload(ChunkGenerator::seed());
     {
         std::scoped_lock lk(m_chunks_mutex, m_new_chunk_queue_mutex);
         m_chunks.clear();
@@ -841,4 +855,6 @@ void World::rendering_distance(int rendering_distance) {
     m_rendering_distance = rendering_distance;
 }
 
+CaveCarver& World::cave_carcer() { return m_cave_carcer; }
+
 } // namespace Cubed