X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient.cpp;h=5e8f20620f5b9b66000b552ff8541db0afdc3c45;hb=6f2d785d0ff761961912d7e79a7d16c4adf86861;hp=1936c2ce9aba6025fcd2132981fb9985f2df7335;hpb=eca1c964126cc7f6ae62ab274f7f1a83f03fedfd;p=minetest.git diff --git a/src/client.cpp b/src/client.cpp index 1936c2ce9..5c04632d1 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -17,46 +17,43 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "client.h" #include -#include "clientserver.h" -#include "jmutexautolock.h" -#include "main.h" +#include #include +#include +#include "threading/mutex_auto_lock.h" +#include "util/auth.h" +#include "util/directiontables.h" +#include "util/pointedthing.h" +#include "util/serialize.h" +#include "util/string.h" +#include "util/srp.h" +#include "client.h" +#include "network/clientopcodes.h" +#include "filesys.h" #include "porting.h" -#include "mapsector.h" #include "mapblock_mesh.h" #include "mapblock.h" +#include "minimap.h" #include "settings.h" #include "profiler.h" +#include "gettext.h" #include "log.h" #include "nodemetadata.h" -#include "nodedef.h" #include "itemdef.h" -#include -#include "sha1.h" -#include "base64.h" +#include "shader.h" #include "clientmap.h" -#include "filecache.h" +#include "clientmedia.h" #include "sound.h" -#include "util/string.h" -#include "hex.h" #include "IMeshCache.h" -#include "util/serialize.h" +#include "config.h" +#include "version.h" +#include "drawscene.h" +#include "database-sqlite3.h" +#include "serialization.h" +#include "guiscalingfilter.h" -static std::string getMediaCacheDir() -{ - return porting::path_user + DIR_DELIM + "cache" + DIR_DELIM + "media"; -} - -struct MediaRequest -{ - std::string name; - - MediaRequest(const std::string &name_=""): - name(name_) - {} -}; +extern gui::IGUIEnvironment* guienv; /* QueuedMeshUpdate @@ -78,19 +75,18 @@ QueuedMeshUpdate::~QueuedMeshUpdate() /* MeshUpdateQueue */ - + MeshUpdateQueue::MeshUpdateQueue() { - m_mutex.Init(); } MeshUpdateQueue::~MeshUpdateQueue() { - JMutexAutoLock lock(m_mutex); + MutexAutoLock lock(m_mutex); for(std::vector::iterator i = m_queue.begin(); - i != m_queue.end(); i++) + i != m_queue.end(); ++i) { QueuedMeshUpdate *q = *i; delete q; @@ -102,11 +98,11 @@ MeshUpdateQueue::~MeshUpdateQueue() */ void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent) { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); - assert(data); + assert(data); // pre-condition - JMutexAutoLock lock(m_mutex); + MutexAutoLock lock(m_mutex); if(urgent) m_urgents.insert(p); @@ -117,7 +113,7 @@ void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_se */ for(std::vector::iterator i = m_queue.begin(); - i != m_queue.end(); i++) + i != m_queue.end(); ++i) { QueuedMeshUpdate *q = *i; if(q->p == p) @@ -130,7 +126,7 @@ void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_se return; } } - + /* Add the block */ @@ -143,14 +139,14 @@ void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_se // Returned pointer must be deleted // Returns NULL if queue is empty -QueuedMeshUpdate * MeshUpdateQueue::pop() +QueuedMeshUpdate *MeshUpdateQueue::pop() { - JMutexAutoLock lock(m_mutex); + MutexAutoLock lock(m_mutex); bool must_be_urgent = !m_urgents.empty(); for(std::vector::iterator i = m_queue.begin(); - i != m_queue.end(); i++) + i != m_queue.end(); ++i) { QueuedMeshUpdate *q = *i; if(must_be_urgent && m_urgents.count(q->p) == 0) @@ -166,79 +162,62 @@ QueuedMeshUpdate * MeshUpdateQueue::pop() MeshUpdateThread */ -void * MeshUpdateThread::Thread() +void MeshUpdateThread::enqueueUpdate(v3s16 p, MeshMakeData *data, + bool ack_block_to_server, bool urgent) { - ThreadStarted(); - - log_register_thread("MeshUpdateThread"); - - DSTACK(__FUNCTION_NAME); - - BEGIN_DEBUG_EXCEPTION_HANDLER - - while(getRun()) - { - /*// Wait for output queue to flush. - // Allow 2 in queue, this makes less frametime jitter. - // Umm actually, there is no much difference - if(m_queue_out.size() >= 2) - { - sleep_ms(3); - continue; - }*/ + m_queue_in.addBlock(p, data, ack_block_to_server, urgent); + deferUpdate(); +} - QueuedMeshUpdate *q = m_queue_in.pop(); - if(q == NULL) - { - sleep_ms(3); - continue; - } +void MeshUpdateThread::doUpdate() +{ + QueuedMeshUpdate *q; + while ((q = m_queue_in.pop())) { ScopeProfiler sp(g_profiler, "Client: Mesh making"); - MapBlockMesh *mesh_new = new MapBlockMesh(q->data); - if(mesh_new->getMesh()->getMeshBufferCount() == 0) - { - delete mesh_new; - mesh_new = NULL; - } + MapBlockMesh *mesh_new = new MapBlockMesh(q->data, m_camera_offset); MeshUpdateResult r; r.p = q->p; r.mesh = mesh_new; r.ack_block_to_server = q->ack_block_to_server; - /*infostream<<"MeshUpdateThread: Processed " - <<"("<p.X<<","<p.Y<<","<p.Z<<")" - <getSceneManager()->getRootSceneNode(), @@ -246,131 +225,132 @@ Client::Client( device->getSceneManager(), tsrc, this, device ), - m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this), + m_particle_manager(&m_env), + m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this), m_device(device), + m_minimap_disabled_by_server(false), m_server_ser_ver(SER_FMT_VER_INVALID), + m_proto_ver(0), m_playeritem(0), m_inventory_updated(false), m_inventory_from_server(NULL), m_inventory_from_server_age(0.0), + m_show_highlighted(false), m_animation_time(0), m_crack_level(-1), m_crack_pos(0,0,0), + m_highlighted_pos(0,0,0), m_map_seed(0), m_password(password), + m_chosen_auth_mech(AUTH_MECHANISM_NONE), + m_auth_data(NULL), m_access_denied(false), - m_media_cache(getMediaCacheDir()), - m_media_receive_progress(0), - m_media_received(false), + m_access_denied_reconnect(false), m_itemdef_received(false), m_nodedef_received(false), + m_media_downloader(new ClientMediaDownloader()), m_time_of_day_set(false), m_last_time_of_day_f(-1), m_time_of_day_update_timer(0), - m_removed_sounds_check_timer(0) -{ - m_packetcounter_timer = 0.0; - //m_delete_unused_sectors_timer = 0.0; - m_connection_reinit_timer = 0.0; - m_avg_rtt_timer = 0.0; - m_playerpos_send_timer = 0.0; - m_ignore_damage_timer = 0.0; - - // Build main texture atlas, now that the GameDef exists (that is, us) - if(g_settings->getBool("enable_texture_atlas")) - m_tsrc->buildMainAtlas(this); - else - infostream<<"Not building texture atlas."<updateName(playername); + m_mapper = new Mapper(device, this); + m_cache_save_interval = g_settings->getU16("server_map_save_interval"); + + m_cache_smooth_lighting = g_settings->getBool("smooth_lighting"); + m_cache_enable_shaders = g_settings->getBool("enable_shaders"); +} - m_env.addPlayer(player); +void Client::Stop() +{ + //request all client managed threads to stop + m_mesh_update_thread.stop(); + // Save local server map + if (m_localdb) { + infostream << "Local map saving ended." << std::endl; + m_localdb->endSave(); } } +bool Client::isShutdown() +{ + + if (!m_mesh_update_thread.isRunning()) return true; + + return false; +} + Client::~Client() { - { - //JMutexAutoLock conlock(m_con_mutex); //bulk comment-out - m_con.Disconnect(); + m_con.Disconnect(); + + m_mesh_update_thread.stop(); + m_mesh_update_thread.wait(); + while (!m_mesh_update_thread.m_queue_out.empty()) { + MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx(); + delete r.mesh; } - m_mesh_update_thread.setRun(false); - while(m_mesh_update_thread.IsRunning()) - sleep_ms(100); delete m_inventory_from_server; // Delete detached inventories - { - for(std::map::iterator - i = m_detached_inventories.begin(); - i != m_detached_inventories.end(); i++){ - delete i->second; - } + for (std::map::iterator + i = m_detached_inventories.begin(); + i != m_detached_inventories.end(); ++i) { + delete i->second; } -} -void Client::connect(Address address) -{ - DSTACK(__FUNCTION_NAME); - //JMutexAutoLock lock(m_con_mutex); //bulk comment-out - m_con.SetTimeoutMs(0); - m_con.Connect(address); + // cleanup 3d model meshes on client shutdown + while (m_device->getSceneManager()->getMeshCache()->getMeshCount() != 0) { + scene::IAnimatedMesh *mesh = + m_device->getSceneManager()->getMeshCache()->getMeshByIndex(0); + + if (mesh != NULL) + m_device->getSceneManager()->getMeshCache()->removeMesh(mesh); + } + + delete m_mapper; } -bool Client::connectedAndInitialized() +void Client::connect(Address address, + const std::string &address_name, + bool is_local_server) { - //JMutexAutoLock lock(m_con_mutex); //bulk comment-out + DSTACK(FUNCTION_NAME); - if(m_con.Connected() == false) - return false; - - if(m_server_ser_ver == SER_FMT_VER_INVALID) - return false; - - return true; + initLocalMapSaving(address, address_name, is_local_server); + + m_con.SetTimeoutMs(0); + m_con.Connect(address); } void Client::step(float dtime) { - DSTACK(__FUNCTION_NAME); - + DSTACK(FUNCTION_NAME); + // Limit a bit if(dtime > 2.0) dtime = 2.0; - + if(m_ignore_damage_timer > dtime) m_ignore_damage_timer -= dtime; else m_ignore_damage_timer = 0.0; - + m_animation_time += dtime; if(m_animation_time > 60.0) m_animation_time -= 60.0; m_time_of_day_update_timer += dtime; - - //infostream<<"Client steps "< deleted_blocks; - - float delete_unused_sectors_timeout = - g_settings->getFloat("client_delete_unused_sectors_timeout"); - - // Delete sector blocks - /*u32 num = m_env.getMap().unloadUnusedData - (delete_unused_sectors_timeout, - true, &deleted_blocks);*/ - - // Delete whole sectors - m_env.getMap().unloadUnusedData - (delete_unused_sectors_timeout, - &deleted_blocks); - - if(deleted_blocks.size() > 0) - { - /*infostream<<"Client: Deleted blocks of "<::Iterator i = deleted_blocks.begin(); - core::list sendlist; - for(;;) - { - if(sendlist.size() == 255 || i == deleted_blocks.end()) - { - if(sendlist.size() == 0) - break; - /* - [0] u16 command - [2] u8 count - [3] v3s16 pos_0 - [3+6] v3s16 pos_1 - ... - */ - u32 replysize = 2+1+6*sendlist.size(); - SharedBuffer reply(replysize); - writeU16(&reply[0], TOSERVER_DELETEDBLOCKS); - reply[2] = sendlist.size(); - u32 k = 0; - for(core::list::Iterator - j = sendlist.begin(); - j != sendlist.end(); j++) - { - writeV3S16(&reply[2+1+6*k], *j); - k++; - } - m_con.Send(PEER_ID_SERVER, 1, reply, true); - - if(i == deleted_blocks.end()) - break; - - sendlist.clear(); - } - - sendlist.push_back(*i); - i++; - } - } - } + // UGLY hack to fix 2 second startup delay caused by non existent + // server client startup synchronization in local server or singleplayer mode + static bool initial_step = true; + if (initial_step) { + initial_step = false; } -#endif - - if(connected == false) - { + else if(m_state == LC_Created) { float &counter = m_connection_reinit_timer; counter -= dtime; - if(counter <= 0.0) - { + if(counter <= 0.0) { counter = 2.0; - //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out - Player *myplayer = m_env.getLocalPlayer(); - assert(myplayer != NULL); - - // Send TOSERVER_INIT - // [0] u16 TOSERVER_INIT - // [2] u8 SER_FMT_VER_HIGHEST + FATAL_ERROR_IF(myplayer == NULL, "Local player not found in environment."); + + // Send TOSERVER_INIT_LEGACY + // [0] u16 TOSERVER_INIT_LEGACY + // [2] u8 SER_FMT_VER_HIGHEST_READ // [3] u8[20] player_name // [23] u8[28] password (new in some version) // [51] u16 minimum supported network protocol version (added sometime) // [53] u16 maximum supported network protocol version (added later than the previous one) - SharedBuffer data(2+1+PLAYERNAME_SIZE+PASSWORD_SIZE+2+2); - writeU16(&data[0], TOSERVER_INIT); - writeU8(&data[2], SER_FMT_VER_HIGHEST); - memset((char*)&data[3], 0, PLAYERNAME_SIZE); - snprintf((char*)&data[3], PLAYERNAME_SIZE, "%s", myplayer->getName()); + char pName[PLAYERNAME_SIZE]; + char pPassword[PASSWORD_SIZE]; + memset(pName, 0, PLAYERNAME_SIZE * sizeof(char)); + memset(pPassword, 0, PASSWORD_SIZE * sizeof(char)); - /*infostream<<"Client: sending initial password hash: \""<getName(), m_password); + snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName()); + snprintf(pPassword, PASSWORD_SIZE, "%s", hashed_password.c_str()); - memset((char*)&data[23], 0, PASSWORD_SIZE); - snprintf((char*)&data[23], PASSWORD_SIZE, "%s", m_password.c_str()); - - writeU16(&data[51], CLIENT_PROTOCOL_VERSION_MIN); - writeU16(&data[53], CLIENT_PROTOCOL_VERSION_MAX); - - // Send as unreliable - Send(0, data, false); + sendLegacyInit(pName, pPassword); + if (LATEST_PROTOCOL_VERSION >= 25) + sendInit(myplayer->getName()); } // Not connected, return @@ -529,35 +413,29 @@ void Client::step(float dtime) /* Do stuff if connected */ - + /* Run Map's timers and unload unused data */ const float map_timer_and_unload_dtime = 5.25; - if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime)) - { + if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime)) { ScopeProfiler sp(g_profiler, "Client: map timer and unload"); - core::list deleted_blocks; + std::vector deleted_blocks; m_env.getMap().timerUpdate(map_timer_and_unload_dtime, - g_settings->getFloat("client_unload_unused_data_timeout"), - &deleted_blocks); - - /*if(deleted_blocks.size() > 0) - infostream<<"Client: Unloaded "<getFloat("client_unload_unused_data_timeout"), + g_settings->getS32("client_mapblock_limit"), + &deleted_blocks); + /* Send info to server NOTE: This loop is intentionally iterated the way it is. */ - core::list::Iterator i = deleted_blocks.begin(); - core::list sendlist; - for(;;) - { - if(sendlist.size() == 255 || i == deleted_blocks.end()) - { - if(sendlist.size() == 0) + std::vector::iterator i = deleted_blocks.begin(); + std::vector sendlist; + for(;;) { + if(sendlist.size() == 255 || i == deleted_blocks.end()) { + if(sendlist.empty()) break; /* [0] u16 command @@ -566,19 +444,8 @@ void Client::step(float dtime) [3+6] v3s16 pos_1 ... */ - u32 replysize = 2+1+6*sendlist.size(); - SharedBuffer reply(replysize); - writeU16(&reply[0], TOSERVER_DELETEDBLOCKS); - reply[2] = sendlist.size(); - u32 k = 0; - for(core::list::Iterator - j = sendlist.begin(); - j != sendlist.end(); j++) - { - writeV3S16(&reply[2+1+6*k], *j); - k++; - } - m_con.Send(PEER_ID_SERVER, 1, reply, true); + + sendDeletedBlocks(sendlist); if(i == deleted_blocks.end()) break; @@ -587,69 +454,59 @@ void Client::step(float dtime) } sendlist.push_back(*i); - i++; + ++i; } } /* Handle environment */ - { - // 0ms - //JMutexAutoLock lock(m_env_mutex); //bulk comment-out + // Control local player (0ms) + LocalPlayer *player = m_env.getLocalPlayer(); + assert(player != NULL); + player->applyControl(dtime); - // Control local player (0ms) - LocalPlayer *player = m_env.getLocalPlayer(); - assert(player != NULL); - player->applyControl(dtime); + // Step environment + m_env.step(dtime); - //TimeTaker envtimer("env step", m_device); - // Step environment - m_env.step(dtime); - - /* - Get events - */ - for(;;) - { - ClientEnvEvent event = m_env.getClientEvent(); - if(event.type == CEE_NONE) - { - break; - } - else if(event.type == CEE_PLAYER_DAMAGE) - { - if(m_ignore_damage_timer <= 0) - { - u8 damage = event.player_damage.amount; - - if(event.player_damage.send_to_server) - sendDamage(damage); - - // Add to ClientEvent queue - ClientEvent event; - event.type = CE_PLAYER_DAMAGE; - event.player_damage.amount = damage; - m_client_event_queue.push_back(event); - } + /* + Get events + */ + for(;;) { + ClientEnvEvent event = m_env.getClientEvent(); + if(event.type == CEE_NONE) { + break; + } + else if(event.type == CEE_PLAYER_DAMAGE) { + if(m_ignore_damage_timer <= 0) { + u8 damage = event.player_damage.amount; + + if(event.player_damage.send_to_server) + sendDamage(damage); + + // Add to ClientEvent queue + ClientEvent event; + event.type = CE_PLAYER_DAMAGE; + event.player_damage.amount = damage; + m_client_event_queue.push(event); } } + else if(event.type == CEE_PLAYER_BREATH) { + u16 breath = event.player_breath.amount; + sendBreath(breath); + } } - + /* Print some info */ - { - float &counter = m_avg_rtt_timer; - counter += dtime; - if(counter >= 10) - { - counter = 0.0; - //JMutexAutoLock lock(m_con_mutex); //bulk comment-out - // connectedAndInitialized() is true, peer exists. - float avg_rtt = m_con.GetPeerAvgRTT(PEER_ID_SERVER); - infostream<<"Client: avg_rtt="<= 10) { + counter = 0.0; + // connectedAndInitialized() is true, peer exists. + float avg_rtt = getRTT(); + infostream << "Client: avg_rtt=" << avg_rtt << std::endl; } /* @@ -658,7 +515,7 @@ void Client::step(float dtime) { float &counter = m_playerpos_send_timer; counter += dtime; - if(counter >= 0.2) + if((m_state == LC_Ready) && (counter >= m_recommended_send_interval)) { counter = 0.0; sendPlayerPos(); @@ -669,63 +526,68 @@ void Client::step(float dtime) Replace updated meshes */ { - //JMutexAutoLock lock(m_env_mutex); //bulk comment-out - - //TimeTaker timer("** Processing mesh update result queue"); - // 0ms - - /*infostream<<"Mesh update result queue size is " - < 0) + while (!m_mesh_update_thread.m_queue_out.empty()) { num_processed_meshes++; - MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_front(); - MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p); - if(block) - { - //JMutexAutoLock lock(block->mesh_mutex); + MinimapMapblock *minimap_mapblock = NULL; + bool do_mapper_update = true; + + MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx(); + MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p); + if (block) { // Delete the old mesh - if(block->mesh != NULL) - { - // TODO: Remove hardware buffers of meshbuffers of block->mesh + if (block->mesh != NULL) { delete block->mesh; block->mesh = NULL; } - // Replace with the new mesh - block->mesh = r.mesh; + if (r.mesh) { + minimap_mapblock = r.mesh->moveMinimapMapblock(); + if (minimap_mapblock == NULL) + do_mapper_update = false; + } + + if (r.mesh && r.mesh->getMesh()->getMeshBufferCount() == 0) { + delete r.mesh; + } else { + // Replace with the new mesh + block->mesh = r.mesh; + } + } else { + delete r.mesh; } - if(r.ack_block_to_server) - { - /*infostream<<"Client: ACK block ("<addBlock(r.p, minimap_mapblock); + + if (r.ack_block_to_server) { /* Acknowledge block + [0] u8 count + [1] v3s16 pos_0 */ - /* - [0] u16 command - [2] u8 count - [3] v3s16 pos_0 - [3+6] v3s16 pos_1 - ... - */ - u32 replysize = 2+1+6; - SharedBuffer reply(replysize); - writeU16(&reply[0], TOSERVER_GOTBLOCKS); - reply[2] = 1; - writeV3S16(&reply[3], r.p); - // Send as reliable - m_con.Send(PEER_ID_SERVER, 1, reply, true); + sendGotBlocks(r.p); } } - if(num_processed_meshes > 0) + + if (num_processed_meshes > 0) g_profiler->graphAdd("num_processed_meshes", num_processed_meshes); } + /* + Load fetched media + */ + if (m_media_downloader && m_media_downloader->isStarted()) { + m_media_downloader->step(this); + if (m_media_downloader->isDone()) { + received_media(); + delete m_media_downloader; + m_media_downloader = NULL; + } + } + /* If the server didn't update the inventory in a while, revert the local inventory (so the player notices the lag problem @@ -756,7 +618,7 @@ void Client::step(float dtime) { for(std::map::iterator i = m_sounds_to_objects.begin(); - i != m_sounds_to_objects.end(); i++) + i != m_sounds_to_objects.end(); ++i) { int client_id = i->first; u16 object_id = i->second; @@ -767,52 +629,48 @@ void Client::step(float dtime) m_sound->updateSoundPosition(client_id, pos); } } - + /* Handle removed remotely initiated sounds */ m_removed_sounds_check_timer += dtime; - if(m_removed_sounds_check_timer >= 2.32) - { + if(m_removed_sounds_check_timer >= 2.32) { m_removed_sounds_check_timer = 0; // Find removed sounds and clear references to them - std::set removed_server_ids; + std::vector removed_server_ids; for(std::map::iterator i = m_sounds_server_to_client.begin(); - i != m_sounds_server_to_client.end();) - { + i != m_sounds_server_to_client.end();) { s32 server_id = i->first; int client_id = i->second; - i++; - if(!m_sound->soundExists(client_id)){ + ++i; + if(!m_sound->soundExists(client_id)) { m_sounds_server_to_client.erase(server_id); m_sounds_client_to_server.erase(client_id); m_sounds_to_objects.erase(client_id); - removed_server_ids.insert(server_id); + removed_server_ids.push_back(server_id); } } + // Sync to server - if(removed_server_ids.size() != 0) - { - std::ostringstream os(std::ios_base::binary); - writeU16(os, TOSERVER_REMOVED_SOUNDS); - writeU16(os, removed_server_ids.size()); - for(std::set::iterator i = removed_server_ids.begin(); - i != removed_server_ids.end(); i++) - writeS32(os, *i); - std::string s = os.str(); - SharedBuffer data((u8*)s.c_str(), s.size()); - // Send as reliable - Send(0, data, true); + if(!removed_server_ids.empty()) { + sendRemovedSounds(removed_server_ids); } } + + // Write server map + if (m_localdb && m_localdb_save_interval.step(dtime, + m_cache_save_interval)) { + m_localdb->endSave(); + m_localdb->beginSave(); + } } bool Client::loadMedia(const std::string &data, const std::string &filename) { // Silly irrlicht's const-incorrectness Buffer data_rw(data.c_str(), data.size()); - + std::string name; const char *image_ext[] = { @@ -832,7 +690,9 @@ bool Client::loadMedia(const std::string &data, const std::string &filename) // Create an irrlicht memory file io::IReadFile *rfile = irrfs->createMemoryReadFile( *data_rw, data_rw.getSize(), "_tempreadfile"); - assert(rfile); + + FATAL_ERROR_IF(!rfile, "Could not create irrlicht memory file."); + // Read image video::IImage *img = vdrv->createImageFromFile(rfile); if(!img){ @@ -870,18 +730,12 @@ bool Client::loadMedia(const std::string &data, const std::string &filename) name = removeStringEnd(filename, model_ext); if(name != "") { - verbosestream<<"Client: Storing model into Irrlicht: " + verbosestream<<"Client: Storing model into memory: " <<"\""<getFileSystem(); - io::IReadFile *rfile = irrfs->createMemoryReadFile( - *data_rw, data_rw.getSize(), filename.c_str()); - assert(rfile); - - scene::ISceneManager *smgr = m_device->getSceneManager(); - scene::IAnimatedMesh *mesh = smgr->getMesh(rfile); - smgr->getMeshCache()->addMesh(filename.c_str(), mesh); - + if(m_mesh_data.count(filename)) + errorstream<<"Multiple models with name \""<id=" - <id<id=" + << peer->id << std::endl; } void Client::deletingPeer(con::Peer *peer, bool timeout) { - infostream<<"Client::deletingPeer(): " + infostream << "Client::deletingPeer(): " "Server Peer is getting deleted " - <<"(timeout="< &file_requests) +{ + std::ostringstream os(std::ios_base::binary); + writeU16(os, TOSERVER_REQUEST_MEDIA); + size_t file_requests_size = file_requests.size(); + + FATAL_ERROR_IF(file_requests_size > 0xFFFF, "Unsupported number of file requests"); + + // Packet dynamicly resized + NetworkPacket pkt(TOSERVER_REQUEST_MEDIA, 2 + 0); + + pkt << (u16) (file_requests_size & 0xFFFF); + + for(std::vector::const_iterator i = file_requests.begin(); + i != file_requests.end(); ++i) { + pkt << (*i); + } + + Send(&pkt); + + infostream << "Client: Sending media request list to server (" + << file_requests.size() << " files. packet size)" << std::endl; +} + +void Client::received_media() +{ + NetworkPacket pkt(TOSERVER_RECEIVED_MEDIA, 0); + Send(&pkt); + infostream << "Client: Notifying server that we received all media" + << std::endl; +} + +void Client::initLocalMapSaving(const Address &address, + const std::string &hostname, + bool is_local_server) +{ + if (!g_settings->getBool("enable_local_map_saving") || is_local_server) { + return; + } + + const std::string world_path = porting::path_user + + DIR_DELIM + "worlds" + + DIR_DELIM + "server_" + + hostname + "_" + to_string(address.getPort()); + + fs::CreateAllDirs(world_path); + + m_localdb = new Database_SQLite3(world_path); + m_localdb->beginSave(); + actionstream << "Local map saving started, map will be saved at '" << world_path << "'" << std::endl; } void Client::ReceiveAll() { - DSTACK(__FUNCTION_NAME); + DSTACK(FUNCTION_NAME); u32 start_ms = porting::getTimeMs(); for(;;) { @@ -913,17 +832,15 @@ void Client::ReceiveAll() // process if(porting::getTimeMs() > start_ms + 100) break; - - try{ + + try { Receive(); g_profiler->graphAdd("client_received_packets", 1); } - catch(con::NoIncomingDataException &e) - { + catch(con::NoIncomingDataException &e) { break; } - catch(con::InvalidIncomingDataException &e) - { + catch(con::InvalidIncomingDataException &e) { infostream<<"Client::ReceiveAll(): " "InvalidIncomingDataException: what()=" < data; - u16 sender_peer_id; - u32 datasize; - { - //TimeTaker t1("con mutex and receive", m_device); - //JMutexAutoLock lock(m_con_mutex); //bulk comment-out - datasize = m_con.Receive(sender_peer_id, data); - } - //TimeTaker t1("ProcessData", m_device); - ProcessData(*data, datasize, sender_peer_id); + DSTACK(FUNCTION_NAME); + NetworkPacket pkt; + m_con.Receive(&pkt); + ProcessData(&pkt); +} + +inline void Client::handleCommand(NetworkPacket* pkt) +{ + const ToClientCommandHandler& opHandle = toClientCommandTable[pkt->getCommand()]; + (this->*opHandle.handler)(pkt); } /* sender_peer_id given to this shall be quaranteed to be a valid peer */ -void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) +void Client::ProcessData(NetworkPacket *pkt) { - DSTACK(__FUNCTION_NAME); - - // Ignore packets that don't even fit a command - if(datasize < 2) - { - m_packetcounter.add(60000); - return; - } + DSTACK(FUNCTION_NAME); - ToClientCommand command = (ToClientCommand)readU16(&data[0]); + ToClientCommand command = (ToClientCommand) pkt->getCommand(); + u32 sender_peer_id = pkt->getPeerId(); //infostream<<"Client: received command="<= 2+1+6) - playerpos_s16 = readV3S16(&data[2+1]); - v3f playerpos_f = intToFloat(playerpos_s16, BS) - v3f(0, BS/2, 0); - - { //envlock - //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out - - // Set player position - Player *player = m_env.getLocalPlayer(); - assert(player != NULL); - player->setPosition(playerpos_f); - } - - if(datasize >= 2+1+6+8) - { - // Get map seed - m_map_seed = readU64(&data[2+1+6]); - infostream<<"Client: received map seed: "< reply(replysize); - writeU16(&reply[0], TOSERVER_INIT2); - // Send as reliable - m_con.Send(PEER_ID_SERVER, 1, reply, true); - + // Command must be handled into ToClientCommandHandler + if (command >= TOCLIENT_NUM_MSG_TYPES) { + infostream << "Client: Ignoring unknown command " + << command << std::endl; return; } - if(command == TOCLIENT_ACCESS_DENIED) - { - // The server didn't like our password. Note, this needs - // to be processed even if the serialisation format has - // not been agreed yet, the same as TOCLIENT_INIT. - m_access_denied = true; - m_access_denied_reason = L"Unknown"; - if(datasize >= 4) - { - std::string datastring((char*)&data[2], datasize-2); - std::istringstream is(datastring, std::ios_base::binary); - m_access_denied_reason = deSerializeWideString(is); - } + /* + * Those packets are handled before m_server_ser_ver is set, it's normal + * But we must use the new ToClientConnectionState in the future, + * as a byte mask + */ + if(toClientCommandTable[command].state == TOCLIENT_STATE_NOT_CONNECTED) { + handleCommand(pkt); return; } - if(ser_version == SER_FMT_VER_INVALID) - { - infostream<<"Client: Server serialization" + if(m_server_ser_ver == SER_FMT_VER_INVALID) { + infostream << "Client: Server serialization" " format invalid or not initialized." - " Skipping incoming command="<getPos() == p2d); - - //TimeTaker timer("MapBlock deSerialize"); - // 0ms - - block = sector->getBlockNoCreateNoEx(p.Y); - if(block) - { - /* - Update an existing block - */ - //infostream<<"Updating"<deSerialize(istr, ser_version, false); - } - else - { - /* - Create a new block - */ - //infostream<<"Creating new"<deSerialize(istr, ser_version, false); - sector->insertBlock(block); - } + handleCommand(pkt); +} -#if 0 - /* - Acknowledge block - */ - /* - [0] u16 command - [2] u8 count - [3] v3s16 pos_0 - [3+6] v3s16 pos_1 - ... - */ - u32 replysize = 2+1+6; - SharedBuffer reply(replysize); - writeU16(&reply[0], TOSERVER_GOTBLOCKS); - reply[2] = 1; - writeV3S16(&reply[3], p); - // Send as reliable - m_con.Send(PEER_ID_SERVER, 1, reply, true); -#endif +void Client::Send(NetworkPacket* pkt) +{ + m_con.Send(PEER_ID_SERVER, + serverCommandFactoryTable[pkt->getCommand()].channel, + pkt, + serverCommandFactoryTable[pkt->getCommand()].reliable); +} - /* - Add it to mesh update queue and set it to be acknowledged after update. - */ - //infostream<<"Adding mesh update task for received block"<inventory.deSerialize(is); - //t1.stop(); - - m_inventory_updated = true; - - delete m_inventory_from_server; - m_inventory_from_server = new Inventory(player->inventory); - m_inventory_from_server_age = 0.0; - //infostream<<"Client got player inventory:"<inventory.print(infostream); - } - } - else if(command == TOCLIENT_TIME_OF_DAY) - { - if(datasize < 4) - return; - - u16 time_of_day = readU16(&data[2]); - time_of_day = time_of_day % 24000; - //infostream<<"Client: time_of_day="<= 2 + 2 + 4){ - time_speed = readF1000(&data[4]); - } else { - // Old message; try to approximate speed of time by ourselves - float time_of_day_f = (float)time_of_day / 24000.0; - float tod_diff_f = 0; - if(time_of_day_f < 0.2 && m_last_time_of_day_f > 0.8) - tod_diff_f = time_of_day_f - m_last_time_of_day_f + 1.0; - else - tod_diff_f = time_of_day_f - m_last_time_of_day_f; - m_last_time_of_day_f = time_of_day_f; - float time_diff = m_time_of_day_update_timer; - m_time_of_day_update_timer = 0; - if(m_time_of_day_set){ - time_speed = 3600.0*24.0 * tod_diff_f / time_diff; - infostream<<"Client: Measured time_of_day speed (old format): " - <getBool("enable_experimental")) - { - /* - u16 command - u16 count of removed objects - for all removed objects { - u16 id - } - u16 count of added objects - for all added objects { - u16 id - u8 type - u32 initialization data length - string initialization data - } - */ - - char buf[6]; - // Get all data except the command number - std::string datastring((char*)&data[2], datasize-2); - // Throw them in an istringstream - std::istringstream is(datastring, std::ios_base::binary); - - // Read stuff - - // Read removed objects - is.read(buf, 2); - u16 removed_count = readU16((u8*)buf); - for(u16 i=0; igetBool("enable_experimental")) - { - /* - u16 command - for all objects - { - u16 id - u16 message length - string message - } - */ - char buf[6]; - // Get all data except the command number - std::string datastring((char*)&data[2], datasize-2); - // Throw them in an istringstream - std::istringstream is(datastring, std::ios_base::binary); - - while(is.eof() == false) - { - // Read stuff - is.read(buf, 2); - u16 id = readU16((u8*)buf); - if(is.eof()) - break; - is.read(buf, 2); - u16 message_size = readU16((u8*)buf); - std::string message; - message.reserve(message_size); - for(u16 i=0; ihp; - u8 hp = readU8(is); - player->hp = hp; + NetworkPacket pkt(TOSERVER_INTERACT, 1 + 2 + 0); - if(hp < oldhp) - { - // Add to ClientEvent queue - ClientEvent event; - event.type = CE_PLAYER_DAMAGE; - event.player_damage.amount = oldhp - hp; - m_client_event_queue.push_back(event); - } - } - else if(command == TOCLIENT_MOVE_PLAYER) - { - std::string datastring((char*)&data[2], datasize-2); - std::istringstream is(datastring, std::ios_base::binary); - Player *player = m_env.getLocalPlayer(); - assert(player != NULL); - v3f pos = readV3F1000(is); - f32 pitch = readF1000(is); - f32 yaw = readF1000(is); - player->setPosition(pos); - /*player->setPitch(pitch); - player->setYaw(yaw);*/ - - infostream<<"Client got TOCLIENT_MOVE_PLAYER" - <<" pos=("< file_requests; + if (mechs & AUTH_MECHANISM_FIRST_SRP) + return AUTH_MECHANISM_FIRST_SRP; - for(int i=0; i::Iterator i = file_requests.begin(); - i != file_requests.end(); i++) { - os<name); - } + Send(&pkt); +} - // Make data buffer - std::string s = os.str(); - SharedBuffer data((u8*)s.c_str(), s.size()); - // Send as reliable - Send(0, data, true); - infostream<<"Client: Sending media request list to server (" - <= 2) - m_media_receive_progress = (float)bunch_i / (float)(num_bunches - 1); - else - m_media_receive_progress = 1.0; - if(bunch_i == num_bunches - 1) - m_media_received = true; - int num_files = readU32(is); - infostream<<"Client: Received files: bunch "<::Node *n; - n = m_media_name_sha1_map.find(name); - if(n == NULL) - errorstream<<"The server sent a file that has not " - <<"been announced."<deSerialize(tmp_is2); - m_nodedef_received = true; - } - else if(command == TOCLIENT_CRAFTITEMDEF) - { - infostream<<"Client: WARNING: Ignoring TOCLIENT_CRAFTITEMDEF"<deSerialize(tmp_is2); - m_itemdef_received = true; - } - else if(command == TOCLIENT_PLAY_SOUND) - { - std::string datastring((char*)&data[2], datasize-2); - std::istringstream is(datastring, std::ios_base::binary); - - s32 server_id = readS32(is); - std::string name = deSerializeString(is); - float gain = readF1000(is); - int type = readU8(is); // 0=local, 1=positional, 2=object - v3f pos = readV3F1000(is); - u16 object_id = readU16(is); - bool loop = readU8(is); - // Start playing - int client_id = -1; - switch(type){ - case 0: // local - client_id = m_sound->playSound(name, loop, gain); - break; - case 1: // positional - client_id = m_sound->playSoundAt(name, loop, gain, pos); - break; - case 2: { // object - ClientActiveObject *cao = m_env.getActiveObject(object_id); - if(cao) - pos = cao->getPosition(); - client_id = m_sound->playSoundAt(name, loop, gain, pos); - // TODO: Set up sound to move with object - break; } - default: + std::string playername_u = lowercase(getPlayerName()); + m_auth_data = srp_user_new(SRP_SHA256, SRP_NG_2048, + getPlayerName().c_str(), playername_u.c_str(), + (const unsigned char *) m_password.c_str(), + m_password.length(), NULL, NULL); + char *bytes_A = 0; + size_t len_A = 0; + SRP_Result res = srp_user_start_authentication( + (struct SRPUser *) m_auth_data, NULL, NULL, 0, + (unsigned char **) &bytes_A, &len_A); + FATAL_ERROR_IF(res != SRP_OK, "Creating local SRP user failed."); + + NetworkPacket resp_pkt(TOSERVER_SRP_BYTES_A, 0); + resp_pkt << std::string(bytes_A, len_A) << based_on; + Send(&resp_pkt); break; } - if(client_id != -1){ - m_sounds_server_to_client[server_id] = client_id; - m_sounds_client_to_server[client_id] = server_id; - if(object_id != 0) - m_sounds_to_objects[client_id] = object_id; - } + case AUTH_MECHANISM_NONE: + break; // not handled in this method } - else if(command == TOCLIENT_STOP_SOUND) - { - std::string datastring((char*)&data[2], datasize-2); - std::istringstream is(datastring, std::ios_base::binary); +} - s32 server_id = readS32(is); - std::map::iterator i = - m_sounds_server_to_client.find(server_id); - if(i != m_sounds_server_to_client.end()){ - int client_id = i->second; - m_sound->stopSound(client_id); - } - } - else if(command == TOCLIENT_PRIVILEGES) - { - std::string datastring((char*)&data[2], datasize-2); - std::istringstream is(datastring, std::ios_base::binary); - - m_privileges.clear(); - infostream<<"Client: Privileges updated: "; - u16 num_privileges = readU16(is); - for(u16 i=0; i &blocks) +{ + NetworkPacket pkt(TOSERVER_DELETEDBLOCKS, 1 + sizeof(v3s16) * blocks.size()); - // Store formspec in LocalPlayer - Player *player = m_env.getLocalPlayer(); - assert(player != NULL); - player->inventory_formspec = deSerializeLongString(is); - } - else if(command == TOCLIENT_DETACHED_INVENTORY) - { - std::string datastring((char*)&data[2], datasize-2); - std::istringstream is(datastring, std::ios_base::binary); - - std::string name = deSerializeString(is); - - infostream<<"Client: Detached inventory update: \""< 0) - inv = m_detached_inventories[name]; - else{ - inv = new Inventory(m_itemdef); - m_detached_inventories[name] = inv; - } - inv->deSerialize(is); - } - else - { - infostream<<"Client: Ignoring unknown command " - <::iterator + j = blocks.begin(); + j != blocks.end(); ++j) { + pkt << *j; + k++; } + + Send(&pkt); } -void Client::Send(u16 channelnum, SharedBuffer data, bool reliable) +void Client::sendGotBlocks(v3s16 block) { - //JMutexAutoLock lock(m_con_mutex); //bulk comment-out - m_con.Send(PEER_ID_SERVER, channelnum, data, reliable); + NetworkPacket pkt(TOSERVER_GOTBLOCKS, 1 + 6); + pkt << (u8) 1 << block; + Send(&pkt); } -void Client::interact(u8 action, const PointedThing& pointed) +void Client::sendRemovedSounds(std::vector &soundList) { - if(connectedAndInitialized() == false){ - infostream<<"Client::interact() " - "cancelled (not connected)" - < data((u8*)s.c_str(), s.size()); + for(std::vector::iterator i = soundList.begin(); + i != soundList.end(); ++i) + pkt << *i; - // Send as reliable - Send(0, data, true); + Send(&pkt); } void Client::sendNodemetaFields(v3s16 p, const std::string &formname, - const std::map &fields) + const StringMap &fields) { - std::ostringstream os(std::ios_base::binary); + size_t fields_size = fields.size(); + + FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of nodemeta fields"); + + NetworkPacket pkt(TOSERVER_NODEMETA_FIELDS, 0); - writeU16(os, TOSERVER_NODEMETA_FIELDS); - writeV3S16(os, p); - os<::const_iterator - i = fields.begin(); i != fields.end(); i++){ - const std::string &name = i->first; - const std::string &value = i->second; - os<first; + const std::string &value = it->second; + pkt << name; + pkt.putLongString(value); } - // Make data buffer - std::string s = os.str(); - SharedBuffer data((u8*)s.c_str(), s.size()); - // Send as reliable - Send(0, data, true); + Send(&pkt); } - -void Client::sendInventoryFields(const std::string &formname, - const std::map &fields) + +void Client::sendInventoryFields(const std::string &formname, + const StringMap &fields) { - std::ostringstream os(std::ios_base::binary); + size_t fields_size = fields.size(); + FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of inventory fields"); - writeU16(os, TOSERVER_INVENTORY_FIELDS); - os<::const_iterator - i = fields.begin(); i != fields.end(); i++){ - const std::string &name = i->first; - const std::string &value = i->second; - os<first; + const std::string &value = it->second; + pkt << name; + pkt.putLongString(value); } - // Make data buffer - std::string s = os.str(); - SharedBuffer data((u8*)s.c_str(), s.size()); - // Send as reliable - Send(0, data, true); + Send(&pkt); } void Client::sendInventoryAction(InventoryAction *a) { std::ostringstream os(std::ios_base::binary); - u8 buf[12]; - - // Write command - writeU16(buf, TOSERVER_INVENTORY_ACTION); - os.write((char*)buf, 2); a->serialize(os); - + // Make data buffer std::string s = os.str(); - SharedBuffer data((u8*)s.c_str(), s.size()); - // Send as reliable - Send(0, data, true); + + NetworkPacket pkt(TOSERVER_INVENTORY_ACTION, s.size()); + pkt.putRawString(s.c_str(),s.size()); + + Send(&pkt); } void Client::sendChatMessage(const std::wstring &message) { - std::ostringstream os(std::ios_base::binary); - u8 buf[12]; - - // Write command - writeU16(buf, TOSERVER_CHAT_MESSAGE); - os.write((char*)buf, 2); - - // Write length - writeU16(buf, message.size()); - os.write((char*)buf, 2); - - // Write string - for(u32 i=0; i data((u8*)s.c_str(), s.size()); - // Send as reliable - Send(0, data, true); + NetworkPacket pkt(TOSERVER_CHAT_MESSAGE, 2 + message.size() * sizeof(u16)); + + pkt << message; + + Send(&pkt); } -void Client::sendChangePassword(const std::wstring oldpassword, - const std::wstring newpassword) +void Client::sendChangePassword(const std::string &oldpassword, + const std::string &newpassword) { Player *player = m_env.getLocalPlayer(); - if(player == NULL) + if (player == NULL) return; std::string playername = player->getName(); - std::string oldpwd = translatePassword(playername, oldpassword); - std::string newpwd = translatePassword(playername, newpassword); - - std::ostringstream os(std::ios_base::binary); - u8 buf[2+PASSWORD_SIZE*2]; - /* - [0] u16 TOSERVER_PASSWORD - [2] u8[28] old password - [30] u8[28] new password - */ + if (m_proto_ver >= 25) { + // get into sudo mode and then send new password to server + m_password = oldpassword; + m_new_password = newpassword; + startAuth(choseAuthMech(m_sudo_auth_methods)); + } else { + std::string oldpwd = translatePassword(playername, oldpassword); + std::string newpwd = translatePassword(playername, newpassword); + + NetworkPacket pkt(TOSERVER_PASSWORD_LEGACY, 2 * PASSWORD_SIZE); + + for (u8 i = 0; i < PASSWORD_SIZE; i++) { + pkt << (u8) (i < oldpwd.length() ? oldpwd[i] : 0); + } - writeU16(buf, TOSERVER_PASSWORD); - for(u32 i=0;i data((u8*)s.c_str(), s.size()); - // Send as reliable - Send(0, data, true); } void Client::sendDamage(u8 damage) { - DSTACK(__FUNCTION_NAME); - std::ostringstream os(std::ios_base::binary); + DSTACK(FUNCTION_NAME); - writeU16(os, TOSERVER_DAMAGE); - writeU8(os, damage); + NetworkPacket pkt(TOSERVER_DAMAGE, sizeof(u8)); + pkt << damage; + Send(&pkt); +} - // Make data buffer - std::string s = os.str(); - SharedBuffer data((u8*)s.c_str(), s.size()); - // Send as reliable - Send(0, data, true); +void Client::sendBreath(u16 breath) +{ + DSTACK(FUNCTION_NAME); + + NetworkPacket pkt(TOSERVER_BREATH, sizeof(u16)); + pkt << breath; + Send(&pkt); } void Client::sendRespawn() { - DSTACK(__FUNCTION_NAME); - std::ostringstream os(std::ios_base::binary); + DSTACK(FUNCTION_NAME); - writeU16(os, TOSERVER_RESPAWN); + NetworkPacket pkt(TOSERVER_RESPAWN, 0); + Send(&pkt); +} - // Make data buffer - std::string s = os.str(); - SharedBuffer data((u8*)s.c_str(), s.size()); - // Send as reliable - Send(0, data, true); +void Client::sendReady() +{ + DSTACK(FUNCTION_NAME); + + NetworkPacket pkt(TOSERVER_CLIENT_READY, + 1 + 1 + 1 + 1 + 2 + sizeof(char) * strlen(g_version_hash)); + + pkt << (u8) VERSION_MAJOR << (u8) VERSION_MINOR << (u8) VERSION_PATCH + << (u8) 0 << (u16) strlen(g_version_hash); + + pkt.putRawString(g_version_hash, (u16) strlen(g_version_hash)); + Send(&pkt); } void Client::sendPlayerPos() { - //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out - - Player *myplayer = m_env.getLocalPlayer(); + LocalPlayer *myplayer = m_env.getLocalPlayer(); if(myplayer == NULL) return; - + + // Save bandwidth by only updating position when something changed + if(myplayer->last_position == myplayer->getPosition() && + myplayer->last_speed == myplayer->getSpeed() && + myplayer->last_pitch == myplayer->getPitch() && + myplayer->last_yaw == myplayer->getYaw() && + myplayer->last_keyPressed == myplayer->keyPressed) + return; + + myplayer->last_position = myplayer->getPosition(); + myplayer->last_speed = myplayer->getSpeed(); + myplayer->last_pitch = myplayer->getPitch(); + myplayer->last_yaw = myplayer->getYaw(); + myplayer->last_keyPressed = myplayer->keyPressed; + u16 our_peer_id; { - //JMutexAutoLock lock(m_con_mutex); //bulk comment-out + //MutexAutoLock lock(m_con_mutex); //bulk comment-out our_peer_id = m_con.GetPeerID(); } - + // Set peer id if not set already if(myplayer->peer_id == PEER_ID_INEXISTENT) myplayer->peer_id = our_peer_id; - // Check that an existing peer_id is the same as the connection's + assert(myplayer->peer_id == our_peer_id); - - v3f pf = myplayer->getPosition(); + + v3f pf = myplayer->getPosition(); + v3f sf = myplayer->getSpeed(); + s32 pitch = myplayer->getPitch() * 100; + s32 yaw = myplayer->getYaw() * 100; + u32 keyPressed = myplayer->keyPressed; + v3s32 position(pf.X*100, pf.Y*100, pf.Z*100); - v3f sf = myplayer->getSpeed(); v3s32 speed(sf.X*100, sf.Y*100, sf.Z*100); - s32 pitch = myplayer->getPitch() * 100; - s32 yaw = myplayer->getYaw() * 100; - u32 keyPressed=myplayer->keyPressed; /* Format: - [0] u16 command - [2] v3s32 position*100 - [2+12] v3s32 speed*100 - [2+12+12] s32 pitch*100 - [2+12+12+4] s32 yaw*100 - [2+12+12+4+4] u32 keyPressed + [0] v3s32 position*100 + [12] v3s32 speed*100 + [12+12] s32 pitch*100 + [12+12+4] s32 yaw*100 + [12+12+4+4] u32 keyPressed */ - SharedBuffer data(2+12+12+4+4+4); - writeU16(&data[0], TOSERVER_PLAYERPOS); - writeV3S32(&data[2], position); - writeV3S32(&data[2+12], speed); - writeS32(&data[2+12+12], pitch); - writeS32(&data[2+12+12+4], yaw); - writeU32(&data[2+12+12+4+4], keyPressed); - // Send as unreliable - Send(0, data, false); + + NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4); + + pkt << position << speed << pitch << yaw << keyPressed; + + Send(&pkt); } void Client::sendPlayerItem(u16 item) @@ -2018,68 +1318,54 @@ void Client::sendPlayerItem(u16 item) // Set peer id if not set already if(myplayer->peer_id == PEER_ID_INEXISTENT) myplayer->peer_id = our_peer_id; - // Check that an existing peer_id is the same as the connection's assert(myplayer->peer_id == our_peer_id); - SharedBuffer data(2+2); - writeU16(&data[0], TOSERVER_PLAYERITEM); - writeU16(&data[2], item); + NetworkPacket pkt(TOSERVER_PLAYERITEM, 2); - // Send as reliable - Send(0, data, true); + pkt << item; + + Send(&pkt); } void Client::removeNode(v3s16 p) { - core::map modified_blocks; + std::map modified_blocks; - try - { - //TimeTaker t("removeNodeAndUpdate", m_device); + try { m_env.getMap().removeNodeAndUpdate(p, modified_blocks); } - catch(InvalidPositionException &e) - { + catch(InvalidPositionException &e) { } - - // add urgent task to update the modified node - addUpdateMeshTaskForNode(p, false, true); - for(core::map::Iterator - i = modified_blocks.getIterator(); - i.atEnd() == false; i++) - { - v3s16 p = i.getNode()->getKey(); - addUpdateMeshTaskWithEdge(p); + for(std::map::iterator + i = modified_blocks.begin(); + i != modified_blocks.end(); ++i) { + addUpdateMeshTaskWithEdge(i->first, false, true); } } -void Client::addNode(v3s16 p, MapNode n) +void Client::addNode(v3s16 p, MapNode n, bool remove_metadata) { - TimeTaker timer1("Client::addNode()"); + //TimeTaker timer1("Client::addNode()"); - core::map modified_blocks; + std::map modified_blocks; - try - { + try { //TimeTaker timer3("Client::addNode(): addNodeAndUpdate"); - m_env.getMap().addNodeAndUpdate(p, n, modified_blocks); + m_env.getMap().addNodeAndUpdate(p, n, modified_blocks, remove_metadata); } - catch(InvalidPositionException &e) - {} - - for(core::map::Iterator - i = modified_blocks.getIterator(); - i.atEnd() == false; i++) - { - v3s16 p = i.getNode()->getKey(); - addUpdateMeshTaskWithEdge(p); + catch(InvalidPositionException &e) { + } + + for(std::map::iterator + i = modified_blocks.begin(); + i != modified_blocks.end(); ++i) { + addUpdateMeshTaskWithEdge(i->first, false, true); } } - + void Client::setPlayerControl(PlayerControl &control) { - //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out LocalPlayer *player = m_env.getLocalPlayer(); assert(player != NULL); player->control = control; @@ -2087,7 +1373,6 @@ void Client::setPlayerControl(PlayerControl &control) void Client::selectPlayerItem(u16 item) { - //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out m_playeritem = item; m_inventory_updated = true; sendPlayerItem(item); @@ -2097,8 +1382,6 @@ void Client::selectPlayerItem(u16 item) // updated from the server. If it is true, it is set to false. bool Client::getLocalInventoryUpdated() { - // m_inventory_updated is behind envlock - //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out bool updated = m_inventory_updated; m_inventory_updated = false; return updated; @@ -2107,7 +1390,6 @@ bool Client::getLocalInventoryUpdated() // Copies the inventory of the local player to parameter void Client::getLocalInventory(Inventory &dst) { - //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out Player *player = m_env.getLocalPlayer(); assert(player != NULL); dst = player->inventory; @@ -2150,10 +1432,12 @@ Inventory* Client::getInventory(const InventoryLocation &loc) } break; default: - assert(0); + FATAL_ERROR("Invalid inventory location type."); + break; } return NULL; } + void Client::inventoryAction(InventoryAction *a) { /* @@ -2165,6 +1449,9 @@ void Client::inventoryAction(InventoryAction *a) Predict some local inventory changes */ a->clientApply(this, this); + + // Remove it + delete a; } ClientActiveObject * Client::getSelectedActiveObject( @@ -2173,20 +1460,18 @@ ClientActiveObject * Client::getSelectedActiveObject( core::line3d shootline_on_map ) { - core::array objects; + std::vector objects; m_env.getActiveObjects(from_pos_f_on_map, max_d, objects); - //infostream<<"Collected "< *selection_box = obj->getSelectionBox(); if(selection_box == NULL) continue; @@ -2200,38 +1485,16 @@ ClientActiveObject * Client::getSelectedActiveObject( if(offsetted_box.intersectsWithLine(shootline_on_map)) { - //infostream<<"Returning selected object"<getName()); - m_chat_queue.push_back( - (std::wstring)L"<"+name+L"> "+message); + m_chat_queue.push((std::wstring)L"<" + name + L"> " + message); } } void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent) { - /*infostream<<"Client::addUpdateMeshTask(): " - <<"("<fill(b); data->setCrack(m_crack_level, m_crack_pos); - data->setSmoothLighting(g_settings->getBool("smooth_lighting")); + data->setHighlighted(m_highlighted_pos, m_show_highlighted); + data->setSmoothLighting(m_cache_smooth_lighting); } - // Debug wait - //while(m_mesh_update_thread.m_queue_in.size() > 0) sleep_ms(10); - // Add task to queue - m_mesh_update_thread.m_queue_in.addBlock(p, data, ack_to_server, urgent); - - /*infostream<<"Mesh update input queue size is " - <getProgress(); + else + return 1.0; // downloader only exists when not yet done +} + +typedef struct TextureUpdateArgs { + IrrlichtDevice *device; + gui::IGUIEnvironment *guienv; + u32 last_time_ms; + u16 last_percent; + const wchar_t* text_base; +} TextureUpdateArgs; + +void texture_update_progress(void *args, u32 progress, u32 max_progress) +{ + TextureUpdateArgs* targs = (TextureUpdateArgs*) args; + u16 cur_percent = ceil(progress / (double) max_progress * 100.); + + // update the loading menu -- if neccessary + bool do_draw = false; + u32 time_ms = targs->last_time_ms; + if (cur_percent != targs->last_percent) { + targs->last_percent = cur_percent; + time_ms = getTimeMs(); + // only draw when the user will notice something: + do_draw = (time_ms - targs->last_time_ms > 100); + } + + if (do_draw) { + targs->last_time_ms = time_ms; + std::basic_stringstream strm; + strm << targs->text_base << " " << targs->last_percent << "%..."; + draw_load_screen(strm.str(), targs->device, targs->guienv, 0, + 72 + (u16) ((18. / 100.) * (double) targs->last_percent)); + } } -void Client::afterContentReceived() +void Client::afterContentReceived(IrrlichtDevice *device) { - verbosestream<<"Client::afterContentReceived() started"<getVideoDriver()); // Rebuild inherited images and recreate textures - verbosestream<<"Rebuilding images and textures"<rebuildImagesAndTextures(); + delete[] text; - // Update texture atlas - verbosestream<<"Updating texture atlas"<getBool("enable_texture_atlas")) - m_tsrc->buildMainAtlas(this); + // Rebuild shaders + infostream<<"- Rebuilding shaders"<rebuildShaders(); + delete[] text; // Update node aliases - verbosestream<<"Updating node aliases"<updateAliases(m_itemdef); - - // Update node textures - verbosestream<<"Updating node textures"<updateTextures(m_tsrc); - - // Update item textures and meshes - verbosestream<<"Updating item textures and meshes"<updateTexturesAndMeshes(this); + std::string texture_path = g_settings->get("texture_path"); + if (texture_path != "" && fs::IsDir(texture_path)) + m_nodedef->applyTextureOverrides(texture_path + DIR_DELIM + "override.txt"); + m_nodedef->setNodeRegistrationStatus(true); + m_nodedef->runNodeResolveCallbacks(); + delete[] text; + + // Update node textures and assign shaders to each tile + infostream<<"- Updating node textures"<updateTextures(this, texture_update_progress, &tu_args); + delete[] tu_args.text_base; + + // Preload item textures and meshes if configured to + if(g_settings->getBool("preload_item_visuals")) + { + verbosestream<<"Updating item textures and meshes"< names = m_itemdef->getAll(); + size_t size = names.size(); + size_t count = 0; + int percent = 0; + for(std::set::const_iterator + i = names.begin(); i != names.end(); ++i) + { + // Asking for these caches the result + m_itemdef->getInventoryTexture(*i, this); + m_itemdef->getWieldMesh(*i, this); + count++; + percent = (count * 100 / size * 0.2) + 80; + draw_load_screen(text, device, guienv, 0, percent); + } + delete[] text; + } // Start mesh update thread after setting up content definitions - verbosestream<<"Starting mesh update thread"<getVideoDriver(); + irr::video::IImage* const raw_image = driver->createScreenShot(); + + if (!raw_image) + return; + + time_t t = time(NULL); + struct tm *tm = localtime(&t); + + char timetstamp_c[64]; + strftime(timetstamp_c, sizeof(timetstamp_c), "%Y%m%d_%H%M%S", tm); + + std::string filename_base = g_settings->get("screenshot_path") + + DIR_DELIM + + std::string("screenshot_") + + std::string(timetstamp_c); + std::string filename_ext = ".png"; + std::string filename; + + // Try to find a unique filename + unsigned serial = 0; + + while (serial < SCREENSHOT_MAX_SERIAL_TRIES) { + filename = filename_base + (serial > 0 ? ("_" + itos(serial)) : "") + filename_ext; + std::ifstream tmp(filename.c_str()); + if (!tmp.good()) + break; // File did not apparently exist, we'll go with it + serial++; + } + + if (serial == SCREENSHOT_MAX_SERIAL_TRIES) { + infostream << "Could not find suitable filename for screenshot" << std::endl; + } else { + irr::video::IImage* const image = + driver->createImage(video::ECF_R8G8B8, raw_image->getDimension()); + + if (image) { + raw_image->copyTo(image); + + std::ostringstream sstr; + if (driver->writeImageToFile(image, filename.c_str())) { + sstr << "Saved screenshot to '" << filename << "'"; + } else { + sstr << "Failed to save screenshot '" << filename << "'"; + } + m_chat_queue.push(narrow_to_wide(sstr.str())); + infostream << sstr.str() << std::endl; + image->drop(); + } } + + raw_image->drop(); } // IGameDef interface @@ -2494,11 +1899,20 @@ ITextureSource* Client::getTextureSource() { return m_tsrc; } +IShaderSource* Client::getShaderSource() +{ + return m_shsrc; +} +scene::ISceneManager* Client::getSceneManager() +{ + return m_device->getSceneManager(); +} u16 Client::allocateUnknownNodeId(const std::string &name) { - errorstream<<"Client::allocateUnknownNodeId(): " - <<"Client cannot allocate node IDs"<second; + scene::ISceneManager *smgr = m_device->getSceneManager(); + + // Create the mesh, remove it from cache and return it + // This allows unique vertex colors and other properties for each instance + Buffer data_rw(data.c_str(), data.size()); // Const-incorrect Irrlicht + io::IFileSystem *irrfs = m_device->getFileSystem(); + io::IReadFile *rfile = irrfs->createMemoryReadFile( + *data_rw, data_rw.getSize(), filename.c_str()); + FATAL_ERROR_IF(!rfile, "Could not create/open RAM file"); + + scene::IAnimatedMesh *mesh = smgr->getMesh(rfile); + rfile->drop(); + // NOTE: By playing with Irrlicht refcounts, maybe we could cache a bunch + // of uniquely named instances and re-use them + mesh->grab(); + smgr->getMeshCache()->removeMesh(mesh); + return mesh; +}