Fix alpha for liquid nodes (#5494)

[oweals/minetest.git] / src / clientiface.cpp

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 0390cf0ffc55e821a9dbf45f5dfe79f8f45ff4a7..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",
@@ -198,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++) {
                /*
@@ -236,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
@@ -250,8 +253,8 @@ void RemoteClient::GetNextBlocks (
                                FOV setting. The default of 72 degrees is fine.
                        */
 
-                       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;
                        }
 
@@ -284,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;
 
@@ -305,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;
+                               }
                        }
 
                        /*
@@ -341,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);
 
@@ -590,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)
@@ -677,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);
                }
        }
 }