From cfdc8672ecb1e1bd1481b8ff1a53846892e28425 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 12 Nov 2026 22:13:38 +0300 Subject: [PATCH] add 'chunk.update-distance' setting --- src/io/settings_io.cpp | 1 + src/logic/BlocksController.cpp | 27 +++++++++++++++++++++++---- src/logic/BlocksController.hpp | 6 +++++- src/logic/LevelController.cpp | 2 +- src/settings.hpp | 2 ++ 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/io/settings_io.cpp b/src/io/settings_io.cpp index e72cb009d..301c25ec5 100644 --- a/src/io/settings_io.cpp +++ b/src/io/settings_io.cpp @@ -66,6 +66,7 @@ SettingsHandler::SettingsHandler(EngineSettings& settings) { builder.addSection("chunks"); builder.add("load-distance", &settings.chunks.loadDistance); builder.add("load-speed", &settings.chunks.loadSpeed); + builder.add("update-distance", &settings.chunks.updateDistance); builder.add("padding", &settings.chunks.padding); builder.addSection("graphics"); diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp index 73951ff4b..b5e00d4d8 100644 --- a/src/logic/BlocksController.cpp +++ b/src/logic/BlocksController.cpp @@ -4,9 +4,7 @@ #include "items/Inventories.hpp" #include "items/Inventory.hpp" #include "lighting/Lighting.hpp" -#include "maths/fastmaths.hpp" #include "scripting/scripting.hpp" -#include "util/timeutil.hpp" #include "voxels/Block.hpp" #include "voxels/Chunk.hpp" #include "voxels/Chunks.hpp" @@ -17,15 +15,19 @@ #include "objects/Player.hpp" #include "objects/Players.hpp" #include "util/random.hpp" +#include "settings.hpp" #include static inline constexpr int CHUNK_RANDOM_TICK_SEGMENTS = 4; -BlocksController::BlocksController(const Level& level, Lighting* lighting) +BlocksController::BlocksController( + const Level& level, Lighting* lighting, const EngineSettings& settings +) : level(level), chunks(*level.chunks), lighting(lighting), + settings(settings), randTickClock(20, 3), blocksTickClock(20, 3), worldTickClock(20, 1) { @@ -189,6 +191,7 @@ void BlocksController::randomTick( std::shuffle(randomPattern.begin(), randomPattern.end(), randomEngine); } + int chunkRand = (chunk.x * 73856093) ^ (chunk.z * 19349663); for (int s = 0; s < segments; s++) { int repetions = 4; for (int i = 0; i < repetions; i++) { @@ -196,7 +199,9 @@ void BlocksController::randomTick( if (segmentY > chunk.top) { break; } - size_t index = randomPattern[(s * repetions + i + randomTickId) % randomPattern.size()]; + size_t index = randomPattern + [(s * repetions + i + randomTickId + chunkRand) % + randomPattern.size()]; int bx = index % CHUNK_W; int bz = (index / CHUNK_W) % CHUNK_D; int by = (index / (CHUNK_W * CHUNK_D)) + segmentY; @@ -214,13 +219,23 @@ void BlocksController::randomTick( } } +static long long calc_chunk_distance2( + const glm::vec3& pos, const Chunk& chunk +) { + int dx = chunk.x - static_cast(std::floor(pos.x / CHUNK_W)); + int dz = chunk.z - static_cast(std::floor(pos.z / CHUNK_D)); + return dx * dx + dz * dz; +} + void BlocksController::randomTick(int tickid, int parts, uint padding) { auto indices = level.content.getIndices(); + int updateDistance = settings.chunks.updateDistance.get(); for (const auto& [pid, player] : *level.players) { const auto& chunks = *player->chunks; int width = chunks.getWidth(); int height = chunks.getHeight(); + const auto& playerPos = player->getPosition(); for (uint z = padding; z < height - padding; z++) { for (uint x = padding; x < width - padding; x++) { @@ -232,6 +247,10 @@ void BlocksController::randomTick(int tickid, int parts, uint padding) { if (chunk == nullptr || !chunk->flags.ready) { continue; } + long long distance = calc_chunk_distance2(playerPos, *chunk); + if (distance > updateDistance * updateDistance) { + continue; + } if (chunk->lastRandomTickId == randomTickId) { continue; } diff --git a/src/logic/BlocksController.hpp b/src/logic/BlocksController.hpp index afd3f59f4..7e11470e3 100644 --- a/src/logic/BlocksController.hpp +++ b/src/logic/BlocksController.hpp @@ -15,6 +15,7 @@ class Chunks; class Lighting; class GlobalChunks; class ContentIndices; +struct EngineSettings; enum class BlockInteraction { step, destruction, placing }; @@ -27,13 +28,16 @@ class BlocksController { const Level& level; GlobalChunks& chunks; Lighting* lighting; + const EngineSettings& settings; util::Clock randTickClock; util::Clock blocksTickClock; util::Clock worldTickClock; std::vector blockInteractionCallbacks; uint64_t randomTickId = 0; public: - BlocksController(const Level& level, Lighting* lighting); + BlocksController( + const Level& level, Lighting* lighting, const EngineSettings& settings + ); void updateSides(int x, int y, int z); void updateSides(int x, int y, int z, int w, int h, int d); diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp index edc57959e..1905745c7 100644 --- a/src/logic/LevelController.cpp +++ b/src/logic/LevelController.cpp @@ -46,7 +46,7 @@ LevelController::LevelController( ); } blocks = std::make_unique( - *level, chunks ? chunks->lighting.get() : nullptr + *level, chunks ? chunks->lighting.get() : nullptr, settings ); scripting::on_world_load(this); diff --git a/src/settings.hpp b/src/settings.hpp index 320d0fc8d..ad27034d2 100644 --- a/src/settings.hpp +++ b/src/settings.hpp @@ -45,6 +45,8 @@ struct ChunksSettings { IntegerSetting loadSpeed {4, 1, 32}; /// @brief Radius of chunks loading zone (chunk is unit) IntegerSetting loadDistance {22, 3, 80}; + /// @brief Radius of chunks update zone (chunk is unit) + IntegerSetting updateDistance {22, 3, 80}; /// @brief Buffer zone where chunks are not unloading (chunk is unit) IntegerSetting padding {2, 1, 8}; };