voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-11 22:11:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix blocks random tick pattern

Browse source
This commit is contained in:
MihailRis 2026-02-27 22:36:22 +03:00
parent a32845d083
commit d7316f27f0
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/logic/BlocksController.cpp
View file

@ -16,6 +16,11 @@
#include "world/World.hpp" #include "world/World.hpp"
#include "objects/Player.hpp" #include "objects/Player.hpp"
#include "objects/Players.hpp" #include "objects/Players.hpp"
#include "util/random.hpp"
#include <random>
static inline constexpr int CHUNK_RANDOM_TICK_SEGMENTS = 4;
BlocksController::BlocksController(const Level& level, Lighting* lighting) BlocksController::BlocksController(const Level& level, Lighting* lighting)
: level(level), : level(level),
@ -143,20 +148,36 @@ void BlocksController::onBlocksTick(int tickid, int parts) {
} }
void BlocksController::randomTick( void BlocksController::randomTick(
const Chunk& chunk, int segments, const ContentIndices* indices const Chunk& chunk, const ContentIndices* indices
) { ) {
const int segments = CHUNK_RANDOM_TICK_SEGMENTS;
const int segheight = CHUNK_H / segments; const int segheight = CHUNK_H / segments;
static std::array<int, CHUNK_VOL / segments> randomPattern;
static bool randomPatternInitialized = false;
if (!randomPatternInitialized) {
randomPatternInitialized = true;
for (int i = 0; i < randomPattern.size(); i++) {
randomPattern[i] = i;
}
auto randomDevice = std::random_device{};
auto randomEngine =
util::seeded_random_engine<std::mt19937_64>(randomDevice);
std::shuffle(randomPattern.begin(), randomPattern.end(), randomEngine);
}
for (int s = 0; s < segments; s++) { for (int s = 0; s < segments; s++) {
for (int i = 0; i < 4; i++) { int repetions = 4;
for (int i = 0; i < repetions; i++) {
int segmentY = s * segheight; int segmentY = s * segheight;
if (segmentY > chunk.top) { if (segmentY > chunk.top) {
break; break;
} }
int bx = random.rand() % CHUNK_W; size_t index = randomPattern[(s * repetions + i + randomTickId) % randomPattern.size()];
int by = random.rand() % segheight + segmentY; int bx = index % CHUNK_W;
int bz = random.rand() % CHUNK_D; int bz = (index / CHUNK_W) % CHUNK_D;
const voxel& vox = chunk.voxels[vox_index(bx, by, bz)]; int by = (index / (CHUNK_W * CHUNK_D)) + segmentY;
const voxel& vox = chunk.voxels[index + segmentY * CHUNK_W * CHUNK_D];
auto& block = indices->blocks.require(vox.id); auto& block = indices->blocks.require(vox.id);
if (block.rt.funcsset.randupdate) { if (block.rt.funcsset.randupdate) {
scripting::random_update_block( scripting::random_update_block(
@ -177,7 +198,6 @@ void BlocksController::randomTick(int tickid, int parts, uint padding) {
const auto& chunks = *player->chunks; const auto& chunks = *player->chunks;
int width = chunks.getWidth(); int width = chunks.getWidth();
int height = chunks.getHeight(); int height = chunks.getHeight();
int segments = 4;
for (uint z = padding; z < height - padding; z++) { for (uint z = padding; z < height - padding; z++) {
for (uint x = padding; x < width - padding; x++) { for (uint x = padding; x < width - padding; x++) {
@ -193,7 +213,7 @@ void BlocksController::randomTick(int tickid, int parts, uint padding) {
continue; continue;
} }
chunk->lastRandomTickId = randomTickId; chunk->lastRandomTickId = randomTickId;
randomTick(*chunk, segments, indices); randomTick(*chunk, indices);
} }
} }
} }

4
src/logic/BlocksController.hpp
View file

@ -47,9 +47,7 @@ public:
); );
void update(float delta, uint padding); void update(float delta, uint padding);
void randomTick( void randomTick(const Chunk& chunk, const ContentIndices* indices);
const Chunk& chunk, int segments, const ContentIndices* indices
);
void randomTick(int tickid, int parts, uint padding); void randomTick(int tickid, int parts, uint padding);
void onBlocksTick(int tickid, int parts); void onBlocksTick(int tickid, int parts);
int64_t createBlockInventory(int x, int y, int z); int64_t createBlockInventory(int x, int y, int z);