Retrieve mapblocks from the server in a sphere, not a cube

lhofhansl · paramat · commit e7c62edec90c · 2016-11-08T15:15:27.000Z
Use unused range argument in 'isBlockInSight()' to limit mapblock sends
to a sphere of radius 'max block send distance'.
diff --git a/src/clientiface.cpp b/src/clientiface.cpp
@@ -175,6 +175,7 @@ void RemoteClient::GetNextBlocks (
 
 	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_blocks_in_sight = (full_d_max + 1) * BS * MAP_BLOCKSIZE;
 
 	s16 d_max = full_d_max;
 	s16 d_max_gen = g_settings->getS16("max_block_generate_distance");
@@ -242,7 +243,7 @@ void RemoteClient::GetNextBlocks (
 			*/
 
 			float camera_fov = (72.0*M_PI/180) * 4./3.;
-			if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, 10000*BS) == false)
+			if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, d_blocks_in_sight) == false)
 			{
 				continue;
 			}

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,7 @@ void RemoteClient::GetNextBlocks (`
`175`	`175`
`176`	`176`	`const s16 full_d_max = g_settings->getS16("max_block_send_distance");`
`177`	`177`	`const s16 d_opt = g_settings->getS16("block_send_optimize_distance");`
	`178`	`+ const s16 d_blocks_in_sight = (full_d_max + 1) * BS * MAP_BLOCKSIZE;`
`178`	`179`
`179`	`180`	`s16 d_max = full_d_max;`
`180`	`181`	`s16 d_max_gen = g_settings->getS16("max_block_generate_distance");`
`@@ -242,7 +243,7 @@ void RemoteClient::GetNextBlocks (`
`242`	`243`	`*/`
`243`	`244`
`244`	`245`	`float camera_fov = (72.0M_PI/180) 4./3.;`
`245`		`- if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, 10000*BS) == false)`
	`246`	`+ if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, d_blocks_in_sight) == false)`
`246`	`247`	`{`
`247`	`248`	`continue;`
`248`	`249`	`}`