X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclientiface.cpp;h=a3c44fb9e17468532e545dd5e3792b76f4925ae9;hb=617d94c8038e3ff035eaeef7ccdfa4f442feb873;hp=852211037a605e189bd660992cbccd036d90a6c4;hpb=27eeb3581f5ee7183f326807c36afbe272b0d985;p=dragonfireclient.git diff --git a/src/clientiface.cpp b/src/clientiface.cpp index 852211037..a3c44fb9e 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,6 +71,24 @@ 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, @@ -70,7 +99,7 @@ void RemoteClient::GetNextBlocks ( 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); @@ -83,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); @@ -115,8 +144,7 @@ void RemoteClient::GetNextBlocks ( 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; } @@ -125,9 +153,8 @@ void RemoteClient::GetNextBlocks ( < 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; } @@ -170,35 +193,40 @@ void RemoteClient::GetNextBlocks ( s32 new_nearest_unsent_d = -1; // get view range and camera fov from the client - s16 wanted_range = sao->getWantedRange(); + 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); + const s16 full_d_max = std::min(adjustDist(m_max_send_distance, camera_fov), wanted_range); + const s16 d_opt = std::min(adjustDist(m_block_optimize_distance, camera_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, camera_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 @@ -206,7 +234,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; /* @@ -221,8 +249,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) { @@ -247,22 +275,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 @@ -296,7 +326,7 @@ void RemoteClient::GetNextBlocks ( continue; } - if (occ_cull && !block_is_invalid && + if (m_occ_cull && !block_is_invalid && env->getMap().isBlockOccluded(block, cam_pos_nodes)) { continue; } @@ -314,8 +344,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; @@ -329,7 +358,7 @@ void RemoteClient::GetNextBlocks ( continue; } - if(nearest_sent_d == -1) + if (nearest_sent_d == -1) nearest_sent_d = d; /* @@ -346,23 +375,23 @@ void RemoteClient::GetNextBlocks ( // 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; } @@ -383,8 +412,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); } } @@ -587,7 +616,7 @@ 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) { } @@ -632,9 +661,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(); } }