X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fclientiface.cpp;h=dceaa64f25457dfead57de719a9778c88e185f1a;hb=60544ac56f13132ef24ce38024627a127f7f15f0;hp=1402ee5c23d3bbf47c4bf708da09700eb66dc3a4;hpb=ae9b5e00989756bb676429530dfe81039009001c;p=oweals%2Fminetest.git diff --git a/src/clientiface.cpp b/src/clientiface.cpp index 1402ee5c2..dceaa64f2 100644 --- a/src/clientiface.cpp +++ b/src/clientiface.cpp @@ -52,6 +52,17 @@ std::string ClientInterface::state2Name(ClientState state) 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 @@ -60,20 +71,35 @@ void RemoteClient::ResendBlockIfOnWire(v3s16 p) } } +LuaEntitySAO *getAttachedObject(PlayerSAO *sao, ServerEnvironment *env) +{ + if (!sao->isAttached()) + return nullptr; + + int id; + std::string bone; + v3f dummy; + sao->getAttachment(&id, &bone, &dummy, &dummy); + ServerActiveObject *ao = env->getActiveObject(id); + while (id && ao) { + ao->getAttachment(&id, &bone, &dummy, &dummy); + if (id) + ao = env->getActiveObject(id); + } + return dynamic_cast(ao); +} + void RemoteClient::GetNextBlocks ( ServerEnvironment *env, EmergeManager * emerge, float dtime, std::vector &dest) { - DSTACK(FUNCTION_NAME); - - // Increment timers 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); @@ -86,20 +112,20 @@ void RemoteClient::GetNextBlocks ( 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."<getBasePosition(); - const v3f &playerspeed = player->getSpeed(); + // if the player is attached, get the velocity from the attached object + 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); @@ -108,8 +134,8 @@ void RemoteClient::GetNextBlocks ( // 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=("< 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 " // <getPlayerName(peer_id)<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; } @@ -172,36 +192,51 @@ void RemoteClient::GetNextBlocks ( */ s32 new_nearest_unsent_d = -1; - // get view range and camera fov from the client - s16 wanted_range = sao->getWantedRange(); + // Get view range and camera fov (radians) from the client + s16 wanted_range = sao->getWantedRange() + 1; float camera_fov = sao->getFov(); - // if FOV, wanted_range are not available (old client), fall back to old default - if (wanted_range <= 0) wanted_range = 1000; - if (camera_fov <= 0) camera_fov = (72.0*M_PI/180) * 4./3.; - 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 = 2; - 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 @@ -209,7 +244,7 @@ void RemoteClient::GetNextBlocks ( std::vector list = FacePositionCache::getFacePositions(d); std::vector::iterator li; - for(li = list.begin(); li != list.end(); ++li) { + for (li = list.begin(); li != list.end(); ++li) { v3s16 p = *li + center; /* @@ -224,8 +259,8 @@ void RemoteClient::GetNextBlocks ( 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) { @@ -250,22 +285,24 @@ void RemoteClient::GetNextBlocks ( Don't generate or send if not in sight FIXME This only works if the client uses a small enough FOV setting. The default of 72 degrees is fine. + Also retrieve a smaller view cone in the direction of the player's + movement. + (0.1 is about 4 degrees) */ - f32 dist; - if (!isBlockInSight(p, camera_pos, camera_dir, camera_fov, d_blocks_in_sight, &dist)) { + if (!(isBlockInSight(p, camera_pos, camera_dir, camera_fov, + d_blocks_in_sight, &dist) || + (playerspeed.getLength() > 1.0f * BS && + isBlockInSight(p, camera_pos, playerspeeddir, 0.1f, + d_blocks_in_sight)))) { continue; } /* 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 @@ -295,11 +332,11 @@ void RemoteClient::GetNextBlocks ( 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; } @@ -317,8 +354,7 @@ void RemoteClient::GetNextBlocks ( /* 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; @@ -332,7 +368,7 @@ void RemoteClient::GetNextBlocks ( continue; } - if(nearest_sent_d == -1) + if (nearest_sent_d == -1) nearest_sent_d = d; /* @@ -349,23 +385,23 @@ queue_full_break: // 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; } @@ -386,8 +422,8 @@ void RemoteClient::SentBlock(v3s16 p) 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"< &blocks) 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); } } @@ -457,8 +493,8 @@ void RemoteClient::notifyEvent(ClientStateEvent event) { case CSE_AuthAccept: m_state = CS_AwaitingInit2; - if ((chosen_mech == AUTH_MECHANISM_SRP) - || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD)) + if (chosen_mech == AUTH_MECHANISM_SRP || + chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD) srp_verifier_delete((SRPVerifier *) auth_data); chosen_mech = AUTH_MECHANISM_NONE; break; @@ -467,8 +503,8 @@ void RemoteClient::notifyEvent(ClientStateEvent event) break; case CSE_SetDenied: m_state = CS_Denied; - if ((chosen_mech == AUTH_MECHANISM_SRP) - || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD)) + if (chosen_mech == AUTH_MECHANISM_SRP || + chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD) srp_verifier_delete((SRPVerifier *) auth_data); chosen_mech = AUTH_MECHANISM_NONE; break; @@ -546,8 +582,7 @@ void RemoteClient::notifyEvent(ClientStateEvent event) break; case CSE_SudoSuccess: m_state = CS_SudoMode; - if ((chosen_mech == AUTH_MECHANISM_SRP) - || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD)) + if (chosen_mech == AUTH_MECHANISM_SRP) srp_verifier_delete((SRPVerifier *) auth_data); chosen_mech = AUTH_MECHANISM_NONE; break; @@ -587,11 +622,11 @@ u64 RemoteClient::uptime() const return porting::getTimeS() - m_connection_time; } -ClientInterface::ClientInterface(con::Connection* con) +ClientInterface::ClientInterface(const std::shared_ptr & con) : m_con(con), m_env(NULL), - m_print_info_timer(0.0) + m_print_info_timer(0.0f) { } @@ -601,7 +636,7 @@ ClientInterface::~ClientInterface() Delete clients */ { - MutexAutoLock clientslock(m_clients_mutex); + RecursiveMutexAutoLock clientslock(m_clients_mutex); for (auto &client_it : m_clients) { // Delete client @@ -610,10 +645,10 @@ ClientInterface::~ClientInterface() } } -std::vector ClientInterface::getClientIDs(ClientState min_state) +std::vector ClientInterface::getClientIDs(ClientState min_state) { - std::vector reply; - MutexAutoLock clientslock(m_clients_mutex); + std::vector reply; + RecursiveMutexAutoLock clientslock(m_clients_mutex); for (const auto &m_client : m_clients) { if (m_client.second->getState() >= min_state) @@ -623,6 +658,15 @@ std::vector ClientInterface::getClientIDs(ClientState min_state) return reply; } +void ClientInterface::markBlockposAsNotSent(const v3s16 &pos) +{ + RecursiveMutexAutoLock 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 @@ -636,9 +680,8 @@ bool ClientInterface::isUserLimitReached() 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(); } } @@ -646,14 +689,14 @@ void ClientInterface::step(float dtime) void ClientInterface::UpdatePlayerList() { if (m_env) { - std::vector clients = getClientIDs(); + std::vector clients = getClientIDs(); m_clients_names.clear(); - if(!clients.empty()) + if (!clients.empty()) infostream<<"Players:"<getPlayer(i); if (player == NULL) @@ -662,7 +705,7 @@ void ClientInterface::UpdatePlayerList() infostream << "* " << player->getName() << "\t"; { - MutexAutoLock clientslock(m_clients_mutex); + RecursiveMutexAutoLock clientslock(m_clients_mutex); RemoteClient* client = lockedGetClientNoEx(i); if (client) client->PrintInfo(infostream); @@ -673,15 +716,15 @@ void ClientInterface::UpdatePlayerList() } } -void ClientInterface::send(u16 peer_id, u8 channelnum, - NetworkPacket* pkt, bool reliable) +void ClientInterface::send(session_t peer_id, u8 channelnum, + NetworkPacket *pkt, bool reliable) { m_con->Send(peer_id, channelnum, pkt, reliable); } void ClientInterface::sendToAll(NetworkPacket *pkt) { - MutexAutoLock clientslock(m_clients_mutex); + RecursiveMutexAutoLock clientslock(m_clients_mutex); for (auto &client_it : m_clients) { RemoteClient *client = client_it.second; @@ -696,7 +739,7 @@ void ClientInterface::sendToAll(NetworkPacket *pkt) void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacypkt, u16 min_proto_ver) { - MutexAutoLock clientslock(m_clients_mutex); + RecursiveMutexAutoLock clientslock(m_clients_mutex); for (auto &client_it : m_clients) { RemoteClient *client = client_it.second; NetworkPacket *pkt_to_send = nullptr; @@ -718,9 +761,9 @@ void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacyp } } -RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min) +RemoteClient* ClientInterface::getClientNoEx(session_t peer_id, ClientState state_min) { - MutexAutoLock clientslock(m_clients_mutex); + RecursiveMutexAutoLock clientslock(m_clients_mutex); RemoteClientMap::const_iterator n = m_clients.find(peer_id); // The client may not exist; clients are immediately removed if their // access is denied, and this event occurs later then. @@ -733,7 +776,7 @@ RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min) return NULL; } -RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState state_min) +RemoteClient* ClientInterface::lockedGetClientNoEx(session_t peer_id, ClientState state_min) { RemoteClientMap::const_iterator n = m_clients.find(peer_id); // The client may not exist; clients are immediately removed if their @@ -747,9 +790,9 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState stat return NULL; } -ClientState ClientInterface::getClientState(u16 peer_id) +ClientState ClientInterface::getClientState(session_t peer_id) { - MutexAutoLock clientslock(m_clients_mutex); + RecursiveMutexAutoLock clientslock(m_clients_mutex); RemoteClientMap::const_iterator n = m_clients.find(peer_id); // The client may not exist; clients are immediately removed if their // access is denied, and this event occurs later then. @@ -759,9 +802,9 @@ ClientState ClientInterface::getClientState(u16 peer_id) return n->second->getState(); } -void ClientInterface::setPlayerName(u16 peer_id,std::string name) +void ClientInterface::setPlayerName(session_t peer_id, const std::string &name) { - MutexAutoLock clientslock(m_clients_mutex); + RecursiveMutexAutoLock clientslock(m_clients_mutex); RemoteClientMap::iterator n = m_clients.find(peer_id); // The client may not exist; clients are immediately removed if their // access is denied, and this event occurs later then. @@ -769,9 +812,9 @@ void ClientInterface::setPlayerName(u16 peer_id,std::string name) n->second->setName(name); } -void ClientInterface::DeleteClient(u16 peer_id) +void ClientInterface::DeleteClient(session_t peer_id) { - MutexAutoLock conlock(m_clients_mutex); + RecursiveMutexAutoLock conlock(m_clients_mutex); // Error check RemoteClientMap::iterator n = m_clients.find(peer_id); @@ -799,9 +842,9 @@ void ClientInterface::DeleteClient(u16 peer_id) m_clients.erase(peer_id); } -void ClientInterface::CreateClient(u16 peer_id) +void ClientInterface::CreateClient(session_t peer_id) { - MutexAutoLock conlock(m_clients_mutex); + RecursiveMutexAutoLock conlock(m_clients_mutex); // Error check RemoteClientMap::iterator n = m_clients.find(peer_id); @@ -814,10 +857,10 @@ void ClientInterface::CreateClient(u16 peer_id) m_clients[client->peer_id] = client; } -void ClientInterface::event(u16 peer_id, ClientStateEvent event) +void ClientInterface::event(session_t peer_id, ClientStateEvent event) { { - MutexAutoLock clientlock(m_clients_mutex); + RecursiveMutexAutoLock clientlock(m_clients_mutex); // Error check RemoteClientMap::iterator n = m_clients.find(peer_id); @@ -836,9 +879,9 @@ void ClientInterface::event(u16 peer_id, ClientStateEvent event) } } -u16 ClientInterface::getProtocolVersion(u16 peer_id) +u16 ClientInterface::getProtocolVersion(session_t peer_id) { - MutexAutoLock conlock(m_clients_mutex); + RecursiveMutexAutoLock conlock(m_clients_mutex); // Error check RemoteClientMap::iterator n = m_clients.find(peer_id); @@ -850,9 +893,10 @@ u16 ClientInterface::getProtocolVersion(u16 peer_id) return n->second->net_proto_version; } -void ClientInterface::setClientVersion(u16 peer_id, u8 major, u8 minor, u8 patch, std::string full) +void ClientInterface::setClientVersion(session_t peer_id, u8 major, u8 minor, u8 patch, + const std::string &full) { - MutexAutoLock conlock(m_clients_mutex); + RecursiveMutexAutoLock conlock(m_clients_mutex); // Error check RemoteClientMap::iterator n = m_clients.find(peer_id); @@ -861,5 +905,5 @@ void ClientInterface::setClientVersion(u16 peer_id, u8 major, u8 minor, u8 patch if (n == m_clients.end()) return; - n->second->setVersionInfo(major,minor,patch,full); + n->second->setVersionInfo(major, minor, patch, full); }