Rework escape/pause menu (#5719)

[minetest.git] / src / clientiface.cpp

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 7e75c69a48656fbe87f27f016041eaa5b0f70ec2..78339055feafa38d01ea465d15862e13f2243df9 100644 (file)
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -20,18 +20,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <sstream>
 
 #include "clientiface.h"
-#include "util/numeric.h"
-#include "util/mathconstants.h"
 #include "remoteplayer.h"
 #include "settings.h"
 #include "mapblock.h"
 #include "network/connection.h"
-#include "environment.h"
+#include "serverenvironment.h"
 #include "map.h"
 #include "emerge.h"
 #include "content_sao.h"              // TODO this is used for cleanup of only
 #include "log.h"
+#include "network/serveropcodes.h"
 #include "util/srp.h"
+#include "face_position_cache.h"
 
 const char *ClientInterface::statenames[] = {
        "Invalid",
@@ -173,12 +173,20 @@ void RemoteClient::GetNextBlocks (
        */
        s32 new_nearest_unsent_d = -1;
 
-       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;
+       // get view range and camera fov from the client
+       s16 wanted_range = sao->getWantedRange();
+       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 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 = g_settings->getS16("max_block_generate_distance");
+       s16 d_max_gen = MYMIN(g_settings->getS16("max_block_generate_distance"), wanted_range);
 
        // Don't loop very much at a time
        s16 max_d_increment_at_time = 2;
@@ -190,6 +198,9 @@ void RemoteClient::GetNextBlocks (
        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++) {
                /*
@@ -228,9 +239,9 @@ void RemoteClient::GetNextBlocks (
                                continue;
 
                        /*
-                               Do not go over-limit
+                               Do not go over max mapgen limit
                        */
-                       if (blockpos_over_limit(p))
+                       if (blockpos_over_max_limit(p))
                                continue;
 
                        // If this is true, inexistent block will be made from scratch
@@ -242,9 +253,8 @@ void RemoteClient::GetNextBlocks (
                                FOV setting. The default of 72 degrees is fine.
                        */
 
-                       float camera_fov = (72.0*M_PI/180) * 4./3.;
-                       if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, d_blocks_in_sight) == false)
-                       {
+                       f32 dist;
+                       if (!isBlockInSight(p, camera_pos, camera_dir, camera_fov, d_blocks_in_sight, &dist)) {
                                continue;
                        }
 
@@ -277,12 +287,6 @@ void RemoteClient::GetNextBlocks (
                                        surely_not_found_on_disk = true;
                                }
 
-                               // Block is valid if lighting is up-to-date and data exists
-                               if(block->isValid() == false)
-                               {
-                                       block_is_invalid = true;
-                               }
-
                                if(block->isGenerated() == false)
                                        block_is_invalid = true;
 
@@ -298,6 +302,11 @@ void RemoteClient::GetNextBlocks (
                                        if(block->getDayNightDiff() == false)
                                                continue;
                                }
+
+                               if (occ_cull && !block_is_invalid &&
+                                               env->getMap().isBlockOccluded(block, cam_pos_nodes)) {
+                                       continue;
+                               }
                        }
 
                        /*
@@ -334,7 +343,7 @@ void RemoteClient::GetNextBlocks (
                        /*
                                Add block to send queue
                        */
-                       PrioritySortedBlockTransfer q((float)d, p, peer_id);
+                       PrioritySortedBlockTransfer q((float)dist, p, peer_id);
 
                        dest.push_back(q);
 
@@ -350,7 +359,7 @@ void RemoteClient::GetNextBlocks (
        } else if(nearest_emergefull_d != -1){
                new_nearest_unsent_d = nearest_emergefull_d;
        } else {
-               if(d > g_settings->getS16("max_block_send_distance")){
+               if(d > full_d_max){
                        new_nearest_unsent_d = 0;
                        m_nothing_to_send_pause_timer = 2.0;
                } else {
@@ -583,7 +592,7 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
 
 u32 RemoteClient::uptime()
 {
-       return getTime(PRECISION_SECONDS) - m_connection_time;
+       return porting::getTime(PRECISION_SECONDS) - m_connection_time;
 }
 
 ClientInterface::ClientInterface(con::Connection* con)
@@ -670,16 +679,17 @@ void ClientInterface::send(u16 peer_id, u8 channelnum,
        m_con->Send(peer_id, channelnum, pkt, reliable);
 }
 
-void ClientInterface::sendToAll(u16 channelnum,
-               NetworkPacket* pkt, bool reliable)
+void ClientInterface::sendToAll(NetworkPacket *pkt)
 {
        MutexAutoLock clientslock(m_clients_mutex);
-       for(UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
-               i != m_clients.end(); ++i) {
+       for (UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
+                       i != m_clients.end(); ++i) {
                RemoteClient *client = i->second;
 
                if (client->net_proto_version != 0) {
-                       m_con->Send(client->peer_id, channelnum, pkt, reliable);
+                       m_con->Send(client->peer_id,
+                                       clientCommandFactoryTable[pkt->getCommand()].channel, pkt,
+                                       clientCommandFactoryTable[pkt->getCommand()].reliable);
                }
        }
 }