fix custom models shading flag & add more properties to vcm

2025-07-13 18:51:53 +03:00
parent 57a9a26c23
commit 3e59b186d3
6 changed files with 40 additions and 16 deletions
@@ -341,7 +341,7 @@ void BlocksRenderer::blockCustomModel(
                const auto& vcoord = vertex.coord - 0.5f;

                glm::vec4 aoColor {1.0f, 1.0f, 1.0f, 1.0f};
-                if (ao) {
+                if (mesh.shading && ao) {
                    auto p = coord + vcoord.x * X + vcoord.y * Y +
                             vcoord.z * Z + r * 0.5f + t * 0.5f + n * 0.5f;
                    aoColor = pickSoftLight(p.x, p.y, p.z, glm::ivec3(r), glm::ivec3(t));
@@ -350,9 +350,9 @@ void BlocksRenderer::blockCustomModel(
                    coord + vcoord.x * X + vcoord.y * Y + vcoord.z * Z,
                    vertex.uv.x,
                    vertex.uv.y,
-                    glm::vec4(d, d, d, d) * aoColor,
+                    mesh.shading ? (glm::vec4(d, d, d, d) * aoColor) : glm::vec4(1, 1, 1, d),
                    n,
-                    0.0f
+                    mesh.shading ? 0.0f : 1.0
                );
                indexBuffer[indexCount++] = vertexOffset++;
            }