minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize usage of TOSERVER_GOTBLOCKS packet

master
sfan5 2019-08-07 10:31:12 +02:00
parent 4d7f296717
commit 19426387d4
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/client/client.cpp
View File

@ -475,6 +475,7 @@ void Client::step(float dtime)
*/
{
int num_processed_meshes = 0;
std::vector<v3s16> blocks_to_ack;
while (!m_mesh_update_thread.m_queue_out.empty())
{
num_processed_meshes++;
@ -513,14 +514,18 @@ void Client::step(float dtime)
m_minimap->addBlock(r.p, minimap_mapblock);
if (r.ack_block_to_server) {
/*
Acknowledge block
[0] u8 count
[1] v3s16 pos_0
*/
sendGotBlocks(r.p);
if (blocks_to_ack.size() == 255) {
sendGotBlocks(blocks_to_ack);
blocks_to_ack.clear();
}
blocks_to_ack.emplace_back(r.p);
}
}
if (blocks_to_ack.size() > 0) {
// Acknowledge block(s)
sendGotBlocks(blocks_to_ack);
}
if (num_processed_meshes > 0)
g_profiler->graphAdd("num_processed_meshes", num_processed_meshes);
@ -1069,10 +1074,13 @@ void Client::sendDeletedBlocks(std::vector<v3s16> &blocks)
Send(&pkt);
}
void Client::sendGotBlocks(v3s16 block)
void Client::sendGotBlocks(const std::vector<v3s16> &blocks)
{
NetworkPacket pkt(TOSERVER_GOTBLOCKS, 1 + 6);
pkt << (u8) 1 << block;
NetworkPacket pkt(TOSERVER_GOTBLOCKS, 1 + 6 * blocks.size());
pkt << (u8) blocks.size();
for (const v3s16 &block : blocks)
pkt << block;
Send(&pkt);
}

2
src/client/client.h
View File

@ -465,7 +465,7 @@ private:
void promptConfirmRegistration(AuthMechanism chosen_auth_mechanism);
void startAuth(AuthMechanism chosen_auth_mechanism);
void sendDeletedBlocks(std::vector<v3s16> &blocks);
void sendGotBlocks(v3s16 block);
void sendGotBlocks(const std::vector<v3s16> &blocks);
void sendRemovedSounds(std::vector<s32> &soundList);
// Helper function