mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-22 18:39:46 +00:00
cleanup ChunksRenderer
This commit is contained in:
parent
562a0f9b05
commit
2274a35ac1
1 changed files with 8 additions and 22 deletions
|
|
@ -310,7 +310,7 @@ void ChunksRenderer::drawChunks(
|
||||||
auto denseDistance2 = denseDistance * denseDistance;
|
auto denseDistance2 = denseDistance * denseDistance;
|
||||||
|
|
||||||
// TODO: minimize draw calls number
|
// TODO: minimize draw calls number
|
||||||
for (int i = indices.size()-1; i >= 0; i--) {
|
for (int i = indices.size() - 1; i >= 0; i--) {
|
||||||
auto& chunk = chunks.getChunks()[indices[i].index];
|
auto& chunk = chunks.getChunks()[indices[i].index];
|
||||||
if (chunk == nullptr) {
|
if (chunk == nullptr) {
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -337,32 +337,18 @@ void ChunksRenderer::drawChunks(
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (culling) {
|
|
||||||
const auto& meshAABB = mesh.meshAABB;
|
|
||||||
auto aabbMin = meshAABB.min();
|
|
||||||
auto aabbMax = meshAABB.max();
|
|
||||||
|
|
||||||
glm::vec3 min(
|
|
||||||
cx * CHUNK_W + std::min(0.0f, aabbMin.x),
|
|
||||||
chunk->bottom,
|
|
||||||
cz * CHUNK_D + std::min(0.0f, aabbMin.z)
|
|
||||||
);
|
|
||||||
glm::vec3 max(
|
|
||||||
cx * CHUNK_W + aabbMax.x, chunk->top, cz * CHUNK_D + aabbMax.z
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!frustum.isBoxVisible(min, max)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
glm::vec3 coord(
|
glm::vec3 coord(
|
||||||
chunk->x * CHUNK_W + 0.5f, 0.5f, chunk->z * CHUNK_D + 0.5f
|
chunk->x * CHUNK_W + 0.5f, 0.5f, chunk->z * CHUNK_D + 0.5f
|
||||||
);
|
);
|
||||||
glm::mat4 model = glm::translate(glm::mat4(1.0f), coord);
|
glm::mat4 model = glm::translate(glm::mat4(1.0f), coord);
|
||||||
shader.uniformMatrix("u_model", model);
|
shader.uniformMatrix("u_model", model);
|
||||||
mesh.mesh->draw(GL_TRIANGLES, glm::distance2(camera.position * glm::vec3(1, 0, 1),
|
mesh.mesh->draw(
|
||||||
(coord + glm::vec3(CHUNK_W * 0.5f, 0.0f, CHUNK_D * 0.5f))) < denseDistance2);
|
GL_TRIANGLES,
|
||||||
|
glm::distance2(
|
||||||
|
camera.position * glm::vec3(1, 0, 1),
|
||||||
|
(coord + glm::vec3(CHUNK_W * 0.5f, 0.0f, CHUNK_D * 0.5f))
|
||||||
|
) < denseDistance2
|
||||||
|
);
|
||||||
visibleChunks++;
|
visibleChunks++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue