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

Merge pull request #980 from MihailRis/fix-custom-model-blocks-no-ao-shading

Browse source 
fix custom model blocks with disabled ambient-occlusion
This commit is contained in:
MihailRis 2026-09-19 21:30:05 +03:00 • committed by GitHub
commit 7bbdf67bce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -357,20 +357,30 @@ void BlocksRenderer::blockCustomModel(
const auto& vcoord = vertex.coord - 0.5f; const auto& vcoord = vertex.coord - 0.5f;
glm::vec4 aoColor {1.0f, 1.0f, 1.0f, 1.0f}; glm::vec4 aoColor {1.0f, 1.0f, 1.0f, 1.0f};
if (shading && ao) { if (shading) {
const float eps = 0.05f; const float eps = 0.05f;
auto p = coord + vcoord.x * X + vcoord.y * Y + vcoord.z * Z + auto p = coord + vcoord.x * X + vcoord.y * Y + vcoord.z * Z +
r * 0.5f + t * 0.5f + n * eps; r * 0.5f + t * 0.5f + n * eps;
auto p1 = p + n * eps; if (ao) {
auto p2 = p + n * 0.5f; auto p1 = p + n * eps;
aoColor = pickSoftLight(p1.x, p1.y, p1.z, glm::ivec3(r), glm::ivec3(t)); auto p2 = p + n * 0.5f;
if (!block.lightPassing) { aoColor = pickSoftLight(p1.x, p1.y, p1.z, glm::ivec3(r), glm::ivec3(t));
aoColor = glm::max( if (!block.lightPassing) {
aoColor, aoColor = glm::max(
pickSoftLight( aoColor,
p2.x, p2.y, p2.z, glm::ivec3(r), glm::ivec3(t) pickSoftLight(
) p2.x, p2.y, p2.z, glm::ivec3(r), glm::ivec3(t)
); )
);
}
} else {
aoColor = pickLight(glm::floor(p + 0.5f) + 0.5f);
if (!block.lightPassing) {
aoColor = glm::max(
aoColor,
pickLight(glm::floor(p + n + 0.5f) + 0.5f)
);
}
} }
} }
this->vertex( this->vertex(