From c05aac3766e88530fcf5d38a8c25c994b792b324 Mon Sep 17 00:00:00 2001 From: paramat <mat.gregory@virginmedia.com> Date: Tue, 8 Nov 2016 16:07:56 +0000 Subject: [PATCH] Occlusion culling: Add comments, minor code improvements Remove unnecessary code. Use '/ 2.0f' because endoff is a float. --- src/clientmap.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/clientmap.cpp b/src/clientmap.cpp index 1d856520b..8691cc0b2 100644 --- a/src/clientmap.cpp +++ b/src/clientmap.cpp @@ -293,14 +293,19 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver) float step = BS * 1; float stepfac = 1.1; float startoff = BS * 1; - // - Length of the diagonal of a mapblock. + // The occlusion search of 'isOccluded()' must stop short of the target + // point by distance 'endoff' (end offset) to not enter the target mapblock. + // For the 8 mapblock corners 'endoff' must therefore be the maximum diagonal + // of a mapblock, because we must consider all view angles. + // sqrt(1^2 + 1^2 + 1^2) = 1.732 float endoff = -BS * MAP_BLOCKSIZE * 1.732050807569; - v3s16 spn = cam_pos_nodes + v3s16(0, 0, 0); + v3s16 spn = cam_pos_nodes; s16 bs2 = MAP_BLOCKSIZE / 2 + 1; u32 needed_count = 1; if (occlusion_culling_enabled && - isOccluded(this, spn, cpn + v3s16(0, 0, 0), - step, stepfac, startoff, endoff / 2, needed_count, nodemgr) && + // For the central point of the mapblock 'endoff' can be halved + isOccluded(this, spn, cpn, + step, stepfac, startoff, endoff / 2.0f, needed_count, nodemgr) && isOccluded(this, spn, cpn + v3s16(bs2,bs2,bs2), step, stepfac, startoff, endoff, needed_count, nodemgr) && isOccluded(this, spn, cpn + v3s16(bs2,bs2,-bs2),