utility.h: Change Buffer's interface to be more compatible with SharedBuffer's interf...

[oweals/minetest.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index e2ac5a2315a9990a748cfe3e7df3cce2db4afae9..d4eefc737ffbc2bdc35c96ea1428d57342a868cd 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -3613,7 +3613,7 @@ void ClientMap::OnRegisterSceneNode()
        ISceneNode::OnRegisterSceneNode();
 }
 
-static bool isOccluded(Map *map, v3s16 p0, v3s16 p1, float step,
+static bool isOccluded(Map *map, v3s16 p0, v3s16 p1, float step, float stepfac,
                float start_off, float end_off, u32 needed_count)
 {
        float d0 = (float)BS * p0.getDistanceFrom(p1);
@@ -3637,6 +3637,7 @@ static bool isOccluded(Map *map, v3s16 p0, v3s16 p1, float step,
                        if(count >= needed_count)
                                return true;
                }
+               step *= stepfac;
        }
        return false;
 }
@@ -3843,33 +3844,34 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
                                Occlusion culling
                        */
 
-                       v3s16 cpn = v3s16(block->getPos() * MAP_BLOCKSIZE)
-                                       + v3s16(MAP_BLOCKSIZE)/2;
-                       float step = BS*2;
-                       float startoff = BS*3;
+                       v3s16 cpn = block->getPos() * MAP_BLOCKSIZE;
+                       cpn += v3s16(MAP_BLOCKSIZE/2, MAP_BLOCKSIZE/2, MAP_BLOCKSIZE/2);
+                       float step = BS*1;
+                       float stepfac = 1.1;
+                       float startoff = BS*1;
                        float endoff = -BS*MAP_BLOCKSIZE*1.42*1.42;
                        v3s16 spn = cam_pos_nodes + v3s16(0,0,0);
                        s16 bs2 = MAP_BLOCKSIZE/2 + 1;
                        u32 needed_count = 1;
                        if(
                                isOccluded(this, spn, cpn + v3s16(0,0,0),
-                                               step, startoff, endoff, needed_count) &&
+                                               step, stepfac, startoff, endoff, needed_count) &&
                                isOccluded(this, spn, cpn + v3s16(bs2,bs2,bs2),
-                                               step, startoff, endoff, needed_count) &&
+                                               step, stepfac, startoff, endoff, needed_count) &&
                                isOccluded(this, spn, cpn + v3s16(bs2,bs2,-bs2),
-                                               step, startoff, endoff, needed_count) &&
+                                               step, stepfac, startoff, endoff, needed_count) &&
                                isOccluded(this, spn, cpn + v3s16(bs2,-bs2,bs2),
-                                               step, startoff, endoff, needed_count) &&
+                                               step, stepfac, startoff, endoff, needed_count) &&
                                isOccluded(this, spn, cpn + v3s16(bs2,-bs2,-bs2),
-                                               step, startoff, endoff, needed_count) &&
+                                               step, stepfac, startoff, endoff, needed_count) &&
                                isOccluded(this, spn, cpn + v3s16(-bs2,bs2,bs2),
-                                               step, startoff, endoff, needed_count) &&
+                                               step, stepfac, startoff, endoff, needed_count) &&
                                isOccluded(this, spn, cpn + v3s16(-bs2,bs2,-bs2),
-                                               step, startoff, endoff, needed_count) &&
+                                               step, stepfac, startoff, endoff, needed_count) &&
                                isOccluded(this, spn, cpn + v3s16(-bs2,-bs2,bs2),
-                                               step, startoff, endoff, needed_count) &&
+                                               step, stepfac, startoff, endoff, needed_count) &&
                                isOccluded(this, spn, cpn + v3s16(-bs2,-bs2,-bs2),
-                                               step, startoff, endoff, needed_count)
+                                               step, stepfac, startoff, endoff, needed_count)
                        )
                        {
                                blocks_occlusion_culled++;