From ae9b5e00989756bb676429530dfe81039009001c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Sun, 20 Aug 2017 19:37:29 +0200 Subject: Modernize code: very last fixes (#6290) Last modernization fixes --- src/map.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/map.cpp') diff --git a/src/map.cpp b/src/map.cpp index a12bbe54c..08e5c3990 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1109,7 +1109,6 @@ bool Map::isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes) { // 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; s16 bs2 = MAP_BLOCKSIZE / 2 + 1; // to reduce the likelihood of falsely occluded blocks // require at least two solid blocks @@ -1118,23 +1117,23 @@ bool Map::isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes) { return ( // For the central point of the mapblock 'endoff' can be halved - isOccluded(spn, cpn, + isOccluded(cam_pos_nodes, cpn, step, stepfac, startoff, endoff / 2.0f, needed_count) && - isOccluded(spn, cpn + v3s16(bs2,bs2,bs2), + isOccluded(cam_pos_nodes, cpn + v3s16(bs2,bs2,bs2), step, stepfac, startoff, endoff, needed_count) && - isOccluded(spn, cpn + v3s16(bs2,bs2,-bs2), + isOccluded(cam_pos_nodes, cpn + v3s16(bs2,bs2,-bs2), step, stepfac, startoff, endoff, needed_count) && - isOccluded(spn, cpn + v3s16(bs2,-bs2,bs2), + isOccluded(cam_pos_nodes, cpn + v3s16(bs2,-bs2,bs2), step, stepfac, startoff, endoff, needed_count) && - isOccluded(spn, cpn + v3s16(bs2,-bs2,-bs2), + isOccluded(cam_pos_nodes, cpn + v3s16(bs2,-bs2,-bs2), step, stepfac, startoff, endoff, needed_count) && - isOccluded(spn, cpn + v3s16(-bs2,bs2,bs2), + isOccluded(cam_pos_nodes, cpn + v3s16(-bs2,bs2,bs2), step, stepfac, startoff, endoff, needed_count) && - isOccluded(spn, cpn + v3s16(-bs2,bs2,-bs2), + isOccluded(cam_pos_nodes, cpn + v3s16(-bs2,bs2,-bs2), step, stepfac, startoff, endoff, needed_count) && - isOccluded(spn, cpn + v3s16(-bs2,-bs2,bs2), + isOccluded(cam_pos_nodes, cpn + v3s16(-bs2,-bs2,bs2), step, stepfac, startoff, endoff, needed_count) && - isOccluded(spn, cpn + v3s16(-bs2,-bs2,-bs2), + isOccluded(cam_pos_nodes, cpn + v3s16(-bs2,-bs2,-bs2), step, stepfac, startoff, endoff, needed_count)); } -- cgit v1.2.3