return statenames[state];
}
+RemoteClient::RemoteClient() :
+ m_max_simul_sends(g_settings->getU16("max_simultaneous_block_sends_per_client")),
+ m_min_time_from_building(
+ g_settings->getFloat("full_block_send_enable_min_time_from_building")),
+ m_max_send_distance(g_settings->getS16("max_block_send_distance")),
+ m_block_optimize_distance(g_settings->getS16("block_send_optimize_distance")),
+ m_max_gen_distance(g_settings->getS16("max_block_generate_distance")),
+ m_occ_cull(g_settings->getBool("server_side_occlusion_culling"))
+{
+}
+
void RemoteClient::ResendBlockIfOnWire(v3s16 p)
{
// if this block is on wire, mark it for sending again as soon as possible
m_nothing_to_send_pause_timer -= dtime;
m_nearest_unsent_reset_timer += dtime;
- if(m_nothing_to_send_pause_timer >= 0)
+ if (m_nothing_to_send_pause_timer >= 0)
return;
RemotePlayer *player = env->getPlayer(peer_id);
return;
// Won't send anything if already sending
- if(m_blocks_sending.size() >= g_settings->getU16
- ("max_simultaneous_block_sends_per_client"))
- {
+ if (m_blocks_sending.size() >= m_max_simul_sends) {
//infostream<<"Not sending any blocks, Queue full."<<std::endl;
return;
}
LuaEntitySAO *lsao = getAttachedObject(sao, env);
const v3f &playerspeed = lsao? lsao->getVelocity() : player->getSpeed();
v3f playerspeeddir(0,0,0);
- if(playerspeed.getLength() > 1.0*BS)
+ if (playerspeed.getLength() > 1.0f * BS)
playerspeeddir = playerspeed / playerspeed.getLength();
// Predict to next block
- v3f playerpos_predicted = playerpos + playerspeeddir*MAP_BLOCKSIZE*BS;
+ v3f playerpos_predicted = playerpos + playerspeeddir * (MAP_BLOCKSIZE * BS);
v3s16 center_nodepos = floatToInt(playerpos_predicted, BS);
// Camera position and direction
v3f camera_pos = sao->getEyePosition();
v3f camera_dir = v3f(0,0,1);
- camera_dir.rotateYZBy(sao->getPitch());
- camera_dir.rotateXZBy(sao->getYaw());
+ camera_dir.rotateYZBy(sao->getLookPitch());
+ camera_dir.rotateXZBy(sao->getRotation().Y);
/*infostream<<"camera_dir=("<<camera_dir.X<<","<<camera_dir.Y<<","
<<camera_dir.Z<<")"<<std::endl;*/
Get the starting value of the block finder radius.
*/
- if(m_last_center != center)
- {
+ if (m_last_center != center) {
m_nearest_unsent_d = 0;
m_last_center = center;
}
<<m_nearest_unsent_reset_timer<<std::endl;*/
// Reset periodically to workaround for some bugs or stuff
- if(m_nearest_unsent_reset_timer > 20.0)
- {
- m_nearest_unsent_reset_timer = 0;
+ if (m_nearest_unsent_reset_timer > 20.0f) {
+ m_nearest_unsent_reset_timer = 0.0f;
m_nearest_unsent_d = 0;
//infostream<<"Resetting m_nearest_unsent_d for "
// <<server->getPlayerName(peer_id)<<std::endl;
//infostream<<"d_start="<<d_start<<std::endl;
- u16 max_simul_sends_setting = g_settings->getU16
- ("max_simultaneous_block_sends_per_client");
- u16 max_simul_sends_usually = max_simul_sends_setting;
+ u16 max_simul_sends_usually = m_max_simul_sends;
/*
Check the time from last addNode/removeNode.
Decrease send rate if player is building stuff.
*/
m_time_from_building += dtime;
- if(m_time_from_building < g_settings->getFloat(
- "full_block_send_enable_min_time_from_building"))
- {
+ if (m_time_from_building < m_min_time_from_building) {
max_simul_sends_usually
= LIMITED_MAX_SIMULTANEOUS_BLOCK_SENDS;
}
*/
s32 new_nearest_unsent_d = -1;
- // get view range and camera fov from the client
+ // Get view range and camera fov (radians) from the client
s16 wanted_range = sao->getWantedRange() + 1;
float camera_fov = sao->getFov();
- const s16 full_d_max = MYMIN(g_settings->getS16("max_block_send_distance"), wanted_range);
- const s16 d_opt = MYMIN(g_settings->getS16("block_send_optimize_distance"), wanted_range);
+ // Distrust client-sent FOV and get server-set player object property
+ // zoom FOV (degrees) as a check to avoid hacked clients using FOV to load
+ // distant world.
+ // (zoom is disabled by value 0)
+ float prop_zoom_fov = sao->getZoomFOV() < 0.001f ?
+ 0.0f :
+ std::max(camera_fov, sao->getZoomFOV() * core::DEGTORAD);
+
+ const s16 full_d_max = std::min(adjustDist(m_max_send_distance, prop_zoom_fov),
+ wanted_range);
+ const s16 d_opt = std::min(adjustDist(m_block_optimize_distance, prop_zoom_fov),
+ wanted_range);
const s16 d_blocks_in_sight = full_d_max * BS * MAP_BLOCKSIZE;
- //infostream << "Fov from client " << camera_fov << " full_d_max " << full_d_max << std::endl;
s16 d_max = full_d_max;
- s16 d_max_gen = MYMIN(g_settings->getS16("max_block_generate_distance"), wanted_range);
+ s16 d_max_gen = std::min(adjustDist(m_max_gen_distance, prop_zoom_fov),
+ wanted_range);
- // Don't loop very much at a time
- s16 max_d_increment_at_time = 1;
- if(d_max > d_start + max_d_increment_at_time)
+ // Don't loop very much at a time, adjust with distance,
+ // do more work per RTT with greater distances.
+ s16 max_d_increment_at_time = full_d_max / 9 + 1;
+ if (d_max > d_start + max_d_increment_at_time)
d_max = d_start + max_d_increment_at_time;
+ // cos(angle between velocity and camera) * |velocity|
+ // Limit to 0.0f in case player moves backwards.
+ f32 dot = rangelim(camera_dir.dotProduct(playerspeed), 0.0f, 300.0f);
+
+ // Reduce the field of view when a player moves and looks forward.
+ // limit max fov effect to 50%, 60% at 20n/s fly speed
+ camera_fov = camera_fov / (1 + dot / 300.0f);
+
s32 nearest_emerged_d = -1;
s32 nearest_emergefull_d = -1;
s32 nearest_sent_d = -1;
//bool queue_is_full = false;
const v3s16 cam_pos_nodes = floatToInt(camera_pos, BS);
- const bool occ_cull = g_settings->getBool("server_side_occlusion_culling");
s16 d;
- for(d = d_start; d <= d_max; d++) {
+ for (d = d_start; d <= d_max; d++) {
/*
Get the border/face dot coordinates of a "d-radiused"
box
std::vector<v3s16> list = FacePositionCache::getFacePositions(d);
std::vector<v3s16>::iterator li;
- for(li = list.begin(); li != list.end(); ++li) {
+ for (li = list.begin(); li != list.end(); ++li) {
v3s16 p = *li + center;
/*
u16 max_simul_dynamic = max_simul_sends_usually;
// If block is very close, allow full maximum
- if(d <= BLOCK_SEND_DISABLE_LIMITS_MAX_D)
- max_simul_dynamic = max_simul_sends_setting;
+ if (d <= BLOCK_SEND_DISABLE_LIMITS_MAX_D)
+ max_simul_dynamic = m_max_simul_sends;
// Don't select too many blocks for sending
if (num_blocks_selected >= max_simul_dynamic) {
/*
Don't send already sent blocks
*/
- {
- if(m_blocks_sent.find(p) != m_blocks_sent.end())
- {
- continue;
- }
- }
+ if (m_blocks_sent.find(p) != m_blocks_sent.end())
+ continue;
/*
Check if map has this block
differs from day-time mesh.
*/
if (d >= d_opt) {
- if (!block->getDayNightDiff())
+ if (!block->getIsUnderground() && !block->getDayNightDiff())
continue;
}
- if (occ_cull && !block_is_invalid &&
+ if (m_occ_cull && !block_is_invalid &&
env->getMap().isBlockOccluded(block, cam_pos_nodes)) {
continue;
}
/*
Add inexistent block to emerge queue.
*/
- if(block == NULL || surely_not_found_on_disk || block_is_invalid)
- {
+ if (block == NULL || surely_not_found_on_disk || block_is_invalid) {
if (emerge->enqueueBlockEmerge(peer_id, p, generate)) {
if (nearest_emerged_d == -1)
nearest_emerged_d = d;
continue;
}
- if(nearest_sent_d == -1)
+ if (nearest_sent_d == -1)
nearest_sent_d = d;
/*
// If nothing was found for sending and nothing was queued for
// emerging, continue next time browsing from here
- if(nearest_emerged_d != -1){
+ if (nearest_emerged_d != -1) {
new_nearest_unsent_d = nearest_emerged_d;
- } else if(nearest_emergefull_d != -1){
+ } else if (nearest_emergefull_d != -1) {
new_nearest_unsent_d = nearest_emergefull_d;
} else {
- if(d > full_d_max){
+ if (d > full_d_max) {
new_nearest_unsent_d = 0;
- m_nothing_to_send_pause_timer = 2.0;
+ m_nothing_to_send_pause_timer = 2.0f;
} else {
- if(nearest_sent_d != -1)
+ if (nearest_sent_d != -1)
new_nearest_unsent_d = nearest_sent_d;
else
new_nearest_unsent_d = d;
}
}
- if(new_nearest_unsent_d != -1)
+ if (new_nearest_unsent_d != -1)
m_nearest_unsent_d = new_nearest_unsent_d;
}
if (m_blocks_modified.find(p) != m_blocks_modified.end())
m_blocks_modified.erase(p);
- if(m_blocks_sending.find(p) == m_blocks_sending.end())
- m_blocks_sending[p] = 0.0;
+ if (m_blocks_sending.find(p) == m_blocks_sending.end())
+ m_blocks_sending[p] = 0.0f;
else
infostream<<"RemoteClient::SentBlock(): Sent block"
" already in m_blocks_sending"<<std::endl;
m_nearest_unsent_d = 0;
m_nothing_to_send_pause_timer = 0;
- if(m_blocks_sending.find(p) != m_blocks_sending.end())
+ if (m_blocks_sending.find(p) != m_blocks_sending.end())
m_blocks_sending.erase(p);
- if(m_blocks_sent.find(p) != m_blocks_sent.end())
+ if (m_blocks_sent.find(p) != m_blocks_sent.end())
m_blocks_sent.erase(p);
m_blocks_modified.insert(p);
}
v3s16 p = block.first;
m_blocks_modified.insert(p);
- if(m_blocks_sending.find(p) != m_blocks_sending.end())
+ if (m_blocks_sending.find(p) != m_blocks_sending.end())
m_blocks_sending.erase(p);
- if(m_blocks_sent.find(p) != m_blocks_sent.end())
+ if (m_blocks_sent.find(p) != m_blocks_sent.end())
m_blocks_sent.erase(p);
}
}
:
m_con(con),
m_env(NULL),
- m_print_info_timer(0.0)
+ m_print_info_timer(0.0f)
{
}
return reply;
}
+void ClientInterface::markBlockposAsNotSent(const v3s16 &pos)
+{
+ MutexAutoLock clientslock(m_clients_mutex);
+ for (const auto &client : m_clients) {
+ if (client.second->getState() >= CS_Active)
+ client.second->SetBlockNotSent(pos);
+ }
+}
+
/**
* Verify if user limit was reached.
* User limit count all clients from HelloSent state (MT protocol user) to Active state
void ClientInterface::step(float dtime)
{
m_print_info_timer += dtime;
- if(m_print_info_timer >= 30.0)
- {
- m_print_info_timer = 0.0;
+ if (m_print_info_timer >= 30.0f) {
+ m_print_info_timer = 0.0f;
UpdatePlayerList();
}
}
projects / dragonfireclient.git / blobdiff