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

fix missing AABB expansion for non-AO faces

Browse source
This commit is contained in:
eliotbyte 2025-11-02 17:30:30 +03:00
parent 3a78d5f334
commit 0eec97726d
2 changed files with 446 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/graphics/render/BlocksRenderer.cpp
View file

@ -245,10 +245,17 @@ void BlocksRenderer::face(
tint *= d; tint *= d;
} }
const auto nZ2 = lights ? nZ : Z; const auto nZ2 = lights ? nZ : Z;
vertex(coord + (-X - Y + Z) * s, region.u1, region.v1, tint, nZ2, lights ? 0 : 1); auto p0 = coord + (-X - Y + Z) * s;
vertex(coord + ( X - Y + Z) * s, region.u2, region.v1, tint, nZ2, lights ? 0 : 1); auto p1 = coord + ( X - Y + Z) * s;
vertex(coord + ( X + Y + Z) * s, region.u2, region.v2, tint, nZ2, lights ? 0 : 1); auto p2 = coord + ( X + Y + Z) * s;
vertex(coord + (-X + Y + Z) * s, region.u1, region.v2, tint, nZ2, lights ? 0 : 1); auto p3 = coord + (-X + Y + Z) * s;
vertex(p0, region.u1, region.v1, tint, nZ2, lights ? 0 : 1);
vertex(p1, region.u2, region.v1, tint, nZ2, lights ? 0 : 1);
vertex(p2, region.u2, region.v2, tint, nZ2, lights ? 0 : 1);
vertex(p3, region.u1, region.v2, tint, nZ2, lights ? 0 : 1);
if (!densePass) {
expand_aabb_4(localAabb, localAabbInit, p0, p1, p2, p3);
}
index(0, 1, 2, 0, 2, 3); index(0, 1, 2, 0, 2, 3);
} }

26
src/graphics/render/ChunksRenderer.cpp
View file

@ -22,6 +22,8 @@ size_t ChunksRenderer::visibleChunks = 0;
namespace { namespace {
struct CullingBounds { glm::vec3 min; glm::vec3 max; }; struct CullingBounds { glm::vec3 min; glm::vec3 max; };
static constexpr float K_CHUNK_CENTER_BIAS = 0.5f; static constexpr float K_CHUNK_CENTER_BIAS = 0.5f;
// Minimal thickness to avoid culling flicker for geometry that forms 2D sheets
static constexpr float K_AABB_MIN_EXTENT = 1e-2f;
static inline bool has_volume(const AABB& aabb) { static inline bool has_volume(const AABB& aabb) {
auto s = aabb.size(); auto s = aabb.size();
@ -42,12 +44,28 @@ static inline CullingBounds compute_chunk_culling_bounds(
if (it != meshes.end()) { if (it != meshes.end()) {
const auto& aabb = it->second.localAabb; const auto& aabb = it->second.localAabb;
if (has_volume(aabb)) { if (has_volume(aabb)) {
// Convert to world coords (same 0.5 bias as draw model matrix)
min = glm::vec3(chunk.x * CHUNK_W + aabb.min().x + K_CHUNK_CENTER_BIAS, min = glm::vec3(chunk.x * CHUNK_W + aabb.min().x + K_CHUNK_CENTER_BIAS,
(std::max)(static_cast<float>(chunk.bottom), aabb.min().y + K_CHUNK_CENTER_BIAS), aabb.min().y + K_CHUNK_CENTER_BIAS,
chunk.z * CHUNK_D + aabb.min().z + K_CHUNK_CENTER_BIAS); chunk.z * CHUNK_D + aabb.min().z + K_CHUNK_CENTER_BIAS);
max = glm::vec3(chunk.x * CHUNK_W + aabb.max().x + K_CHUNK_CENTER_BIAS, max = glm::vec3(chunk.x * CHUNK_W + aabb.max().x + K_CHUNK_CENTER_BIAS,
(std::min)(static_cast<float>(chunk.top), aabb.max().y + K_CHUNK_CENTER_BIAS), aabb.max().y + K_CHUNK_CENTER_BIAS,
chunk.z * CHUNK_D + aabb.max().z + K_CHUNK_CENTER_BIAS); chunk.z * CHUNK_D + aabb.max().z + K_CHUNK_CENTER_BIAS);
// Clamp vertically to chunk vertical span to keep bounds tight and valid
min.y = (std::max)(static_cast<float>(chunk.bottom), min.y);
max.y = (std::min)(static_cast<float>(chunk.top), max.y);
// Ensure non-degenerate extents to avoid view-dependent flicker
glm::vec3 size = max - min;
auto inflate_axis = [&](int axis) {
float c = (min[axis] + max[axis]) * 0.5f;
min[axis] = c - K_AABB_MIN_EXTENT * 0.5f;
max[axis] = c + K_AABB_MIN_EXTENT * 0.5f;
};
if (size.x < K_AABB_MIN_EXTENT) inflate_axis(0);
if (size.y < K_AABB_MIN_EXTENT) inflate_axis(1);
if (size.z < K_AABB_MIN_EXTENT) inflate_axis(2);
} }
} }
return {min, max}; return {min, max};