adrido
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect distance computation for visible blocks (#4765) 

The client would not compute the distance from the camera to
to a mapblock correctly. The result was that blocks that were in
view (i.e. not beyond the fog limit) would not be rendered.

With the improved distance computation, a range adjustment that
existed in clientiface.cpp is no longer required.
master
Rogier-5 2016-11-11 09:30:37 +01:00 committed by Zeno-
parent 7e17eaedb2
commit b98f98b367
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clientiface.cpp
View File

@ -175,7 +175,7 @@ void RemoteClient::GetNextBlocks (
const s16 full_d_max = g_settings->getS16("max_block_send_distance"); const s16 full_d_max = g_settings->getS16("max_block_send_distance");
const s16 d_opt = g_settings->getS16("block_send_optimize_distance"); const s16 d_opt = g_settings->getS16("block_send_optimize_distance");
const s16 d_blocks_in_sight = (full_d_max + 1) * BS * MAP_BLOCKSIZE; const s16 d_blocks_in_sight = full_d_max * BS * MAP_BLOCKSIZE;
s16 d_max = full_d_max; s16 d_max = full_d_max;
s16 d_max_gen = g_settings->getS16("max_block_generate_distance"); s16 d_max_gen = g_settings->getS16("max_block_generate_distance");

15
src/util/numeric.cpp
View File

@ -188,14 +188,19 @@ u64 murmur_hash_64_ua(const void *key, int len, unsigned int seed)
} }
/* /*
blockpos: position of block in block coordinates blockpos_b: position of block in block coordinates
camera_pos: position of camera in nodes camera_pos: position of camera in nodes
camera_dir: an unit vector pointing to camera direction camera_dir: an unit vector pointing to camera direction
range: viewing range range: viewing range
distance_ptr: return location for distance from the camera
*/ */
bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir, bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
f32 camera_fov, f32 range, f32 *distance_ptr) f32 camera_fov, f32 range, f32 *distance_ptr)
{ {
// Maximum radius of a block. The magic number is
// sqrt(3.0) / 2.0 in literal form.
const f32 block_max_radius = 0.866025403784 * MAP_BLOCKSIZE * BS;
v3s16 blockpos_nodes = blockpos_b * MAP_BLOCKSIZE; v3s16 blockpos_nodes = blockpos_b * MAP_BLOCKSIZE;
// Block center position // Block center position
@ -209,7 +214,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
v3f blockpos_relative = blockpos - camera_pos; v3f blockpos_relative = blockpos - camera_pos;
// Total distance // Total distance
f32 d = blockpos_relative.getLength(); f32 d = MYMAX(0, blockpos_relative.getLength() - block_max_radius);
if(distance_ptr) if(distance_ptr)
*distance_ptr = d; *distance_ptr = d;
@ -218,13 +223,9 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
if(d > range) if(d > range)
return false; return false;
// Maximum radius of a block. The magic number is
// sqrt(3.0) / 2.0 in literal form.
f32 block_max_radius = 0.866025403784 * MAP_BLOCKSIZE * BS;
// If block is (nearly) touching the camera, don't // If block is (nearly) touching the camera, don't
// bother validating further (that is, render it anyway) // bother validating further (that is, render it anyway)
if(d < block_max_radius) if(d == 0)
return true; return true;
// Adjust camera position, for purposes of computing the angle, // Adjust camera position, for purposes of computing the angle,