PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix extended block placement across chunk borders

Browse Source
This commit is contained in:
eliotbyte 2025-10-24 20:13:05 +03:00 committed by MihailRis
parent 3074836bcc
commit b85c5e367a
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/world/generator/StructurePlacement.hpp
View File

@ -31,9 +31,10 @@ struct BlockPlacement {
blockid_t block; blockid_t block;
glm::ivec3 position; glm::ivec3 position;
uint8_t rotation; uint8_t rotation;
bool mirror;
BlockPlacement(blockid_t block, glm::ivec3 position, uint8_t rotation) BlockPlacement(blockid_t block, glm::ivec3 position, uint8_t rotation, bool mirror=false)
: block(block), position(std::move(position)), rotation(rotation) { : block(block), position(std::move(position)), rotation(rotation), mirror(mirror) {
} }
}; };

35
src/world/generator/WorldGenerator.cpp
View File

@ -238,7 +238,8 @@ void WorldGenerator::placeBlock(const BlockPlacement& block, int priority) {
if (found != prototypes.end()) { if (found != prototypes.end()) {
// position becomes relative to prototype chunk // position becomes relative to prototype chunk
glm::ivec3 rel = block.position - glm::ivec3(cx * CHUNK_W, 0, cz * CHUNK_D); glm::ivec3 rel = block.position - glm::ivec3(cx * CHUNK_W, 0, cz * CHUNK_D);
found->second->placements.emplace_back(priority, BlockPlacement{block.block, rel, block.rotation}); bool owner = (cx == floordiv<CHUNK_W>(block.position.x)) && (cz == floordiv<CHUNK_D>(block.position.z));
found->second->placements.emplace_back(priority, BlockPlacement{block.block, rel, block.rotation, !owner});
} }
} }
} }
@ -643,26 +644,26 @@ void WorldGenerator::generateBlock(
const auto& indices = content.getIndices()->blocks; const auto& indices = content.getIndices()->blocks;
const auto& def = indices.require(placement.block); const auto& def = indices.require(placement.block);
int cgx = chunkX * CHUNK_W; glm::ivec3 origin = placement.position; // relative; may be outside
int cgz = chunkZ * CHUNK_D; int rotIndex = 0;
if (def.rotatable && def.rotations.variantsCount) {
glm::ivec3 origin = placement.position; // already relative to chunk in placeBlock rotIndex = placement.rotation % def.rotations.variantsCount;
if (origin.x < 0 || origin.x >= CHUNK_W ||
origin.z < 0 || origin.z >= CHUNK_D ||
origin.y < 0 || origin.y >= CHUNK_H) {
return;
} }
// write origin voxel // write origin only for owner chunk (mirror==false) and if inside bounds
auto& vox = voxels[vox_index(origin.x, origin.y, origin.z)]; if (!placement.mirror &&
vox.id = placement.block; origin.x >= 0 && origin.x < CHUNK_W &&
vox.state = {}; origin.y >= 0 && origin.y < CHUNK_H &&
vox.state.rotation = placement.rotation & 0b11; origin.z >= 0 && origin.z < CHUNK_D) {
auto& vox = voxels[vox_index(origin.x, origin.y, origin.z)];
vox.id = placement.block;
vox.state = {};
vox.state.rotation = rotIndex;
}
// expand extended blocks // expand extended blocks
if (def.rt.extended) { if (def.rt.extended) {
const auto& rot = def.rotations.variants[vox.state.rotation]; const auto& rot = def.rotations.variants[rotIndex];
const auto size = def.size; const auto size = def.size;
for (int sy = 0; sy < size.y; sy++) { for (int sy = 0; sy < size.y; sy++) {
for (int sz = 0; sz < size.z; sz++) { for (int sz = 0; sz < size.z; sz++) {
@ -680,7 +681,7 @@ void WorldGenerator::generateBlock(
struct voxel seg; struct voxel seg;
seg.id = placement.block; seg.id = placement.block;
seg.state = {}; seg.state = {};
seg.state.rotation = vox.state.rotation; seg.state.rotation = rotIndex;
seg.state.segment = ((sx > 0) | ((sy > 0) << 1) | ((sz > 0) << 2)); seg.state.segment = ((sx > 0) | ((sy > 0) << 1) | ((sz > 0) << 2));
voxels[vox_index(pos.x, pos.y, pos.z)] = seg; voxels[vox_index(pos.x, pos.y, pos.z)] = seg;
} }