BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix incorrect culling introduced by ##12710 (#12887)

Browse Source
This commit is contained in:
lhofhansl 2022-10-28 09:52:54 -07:00 committed by GitHub
parent 9aaed75eea
commit b829231992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/client/clientmap.cpp
View File

@ -259,11 +259,13 @@ void ClientMap::updateDrawList()
} }
v3s16 block_coord = block->getPos(); v3s16 block_coord = block->getPos();
v3s16 block_position = block->getPosRelative() + MAP_BLOCKSIZE / 2; v3f mesh_sphere_center = intToFloat(block->getPosRelative(), BS)
+ block->mesh->getBoundingSphereCenter();
// First, perform a simple distance check, with a padding of one extra block. f32 mesh_sphere_radius = block->mesh->getBoundingRadius();
// First, perform a simple distance check.
if (!m_control.range_all && if (!m_control.range_all &&
block_position.getDistanceFrom(cam_pos_nodes) > m_control.wanted_range) mesh_sphere_center.getDistanceFrom(intToFloat(cam_pos_nodes, BS)) >
m_control.wanted_range * BS + mesh_sphere_radius)
continue; // Out of range, skip. continue; // Out of range, skip.
// Keep the block alive as long as it is in range. // Keep the block alive as long as it is in range.
@ -274,9 +276,6 @@ void ClientMap::updateDrawList()
// Only do coarse culling here, to account for fast camera movement. // Only do coarse culling here, to account for fast camera movement.
// This is needed because this function is not called every frame. // This is needed because this function is not called every frame.
constexpr float frustum_cull_extra_radius = 300.0f; constexpr float frustum_cull_extra_radius = 300.0f;
v3f mesh_sphere_center = intToFloat(block->getPosRelative(), BS)
+ block->mesh->getBoundingSphereCenter();
f32 mesh_sphere_radius = block->mesh->getBoundingRadius();
if (is_frustum_culled(mesh_sphere_center, if (is_frustum_culled(mesh_sphere_center,
mesh_sphere_radius + frustum_cull_extra_radius)) mesh_sphere_radius + frustum_cull_extra_radius))
continue; continue;