X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient.cpp;h=c6319d5846e8ca1eb536620b87641d9c6eefa280;hb=43bf4324d5f639f338f88a599fe862630f85f787;hp=f6e97c52ec32c8879b3ee912405da035761a4d26;hpb=197542c7ec19b41e865be1e84c6c6898de8514d1;p=dragonfireclient.git diff --git a/src/client.cpp b/src/client.cpp index f6e97c52e..c6319d584 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,45 +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 +#include +#include +#include "jthread/jmutexautolock.h" +#include "util/directiontables.h" +#include "util/pointedthing.h" +#include "util/serialize.h" +#include "util/string.h" +#include "strfnd.h" +#include "client.h" #include "clientserver.h" -#include "jmutexautolock.h" #include "main.h" -#include +#include "filesys.h" #include "porting.h" #include "mapsector.h" #include "mapblock_mesh.h" #include "mapblock.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 "shader.h" #include "base64.h" #include "clientmap.h" -#include "filecache.h" +#include "clientmedia.h" #include "sound.h" -#include "util/string.h" -#include "hex.h" #include "IMeshCache.h" +#include "serialization.h" +#include "config.h" +#include "version.h" +#include "drawscene.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 @@ -80,7 +78,6 @@ QueuedMeshUpdate::~QueuedMeshUpdate() MeshUpdateQueue::MeshUpdateQueue() { - m_mutex.Init(); } MeshUpdateQueue::~MeshUpdateQueue() @@ -175,17 +172,10 @@ void * MeshUpdateThread::Thread() 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; - }*/ + porting::setThreadName("MeshUpdateThread"); + while(!StopRequested()) + { QueuedMeshUpdate *q = m_queue_in.pop(); if(q == NULL) { @@ -195,7 +185,7 @@ void * MeshUpdateThread::Thread() ScopeProfiler sp(g_profiler, "Client: Mesh making"); - MapBlockMesh *mesh_new = new MapBlockMesh(q->data); + MapBlockMesh *mesh_new = new MapBlockMesh(q->data, m_camera_offset); if(mesh_new->getMesh()->getMeshBufferCount() == 0) { delete mesh_new; @@ -207,10 +197,6 @@ void * MeshUpdateThread::Thread() r.mesh = mesh_new; r.ack_block_to_server = q->ack_block_to_server; - /*infostream<<"MeshUpdateThread: Processed " - <<"("<p.X<<","<p.Y<<","<p.Z<<")" - <getSceneManager(), tsrc, this, device ), - m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this), + m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this), m_device(device), m_server_ser_ver(SER_FMT_VER_INVALID), m_playeritem(0), m_inventory_updated(false), m_inventory_from_server(NULL), m_inventory_from_server_age(0.0), + m_show_hud(true), m_animation_time(0), m_crack_level(-1), m_crack_pos(0,0,0), m_map_seed(0), m_password(password), m_access_denied(false), - m_media_cache(getMediaCacheDir()), - m_media_receive_progress(0), - m_media_received(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); + Player *player = new LocalPlayer(this, playername); m_env.addPlayer(player); } } +void Client::Stop() +{ + //request all client managed threads to stop + m_mesh_update_thread.Stop(); +} + +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; + } + + // 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); } } void Client::connect(Address address) { DSTACK(__FUNCTION_NAME); - //JMutexAutoLock lock(m_con_mutex); //bulk comment-out m_con.SetTimeoutMs(0); m_con.Connect(address); } -bool Client::connectedAndInitialized() -{ - //JMutexAutoLock lock(m_con_mutex); //bulk comment-out - - if(m_con.Connected() == false) - return false; - - if(m_server_ser_ver == SER_FMT_VER_INVALID) - return false; - - return true; -} - void Client::step(float dtime) { 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 @@ -355,21 +347,8 @@ void Client::step(float dtime) m_animation_time -= 60.0; m_time_of_day_update_timer += dtime; - - //infostream<<"Client steps "< deleted_blocks; - float delete_unused_sectors_timeout = + float delete_unused_sectors_timeout = g_settings->getFloat("client_delete_unused_sectors_timeout"); // Delete sector blocks @@ -480,8 +457,13 @@ void Client::step(float dtime) } } #endif - - if(connected == false) + // 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; + } + else if(m_state == LC_Created) { float &counter = m_connection_reinit_timer; counter -= dtime; @@ -493,17 +475,16 @@ void Client::step(float dtime) Player *myplayer = m_env.getLocalPlayer(); assert(myplayer != NULL); - // Send TOSERVER_INIT // [0] u16 TOSERVER_INIT - // [2] u8 SER_FMT_VER_HIGHEST + // [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); + writeU8(&data[2], SER_FMT_VER_HIGHEST_READ); memset((char*)&data[3], 0, PLAYERNAME_SIZE); snprintf((char*)&data[3], PLAYERNAME_SIZE, "%s", myplayer->getName()); @@ -518,7 +499,7 @@ void Client::step(float dtime) writeU16(&data[53], CLIENT_PROTOCOL_VERSION_MAX); // Send as unreliable - Send(0, data, false); + Send(1, data, false); } // Not connected, return @@ -536,7 +517,7 @@ void Client::step(float 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::list deleted_blocks; m_env.getMap().timerUpdate(map_timer_and_unload_dtime, g_settings->getFloat("client_unload_unused_data_timeout"), &deleted_blocks); @@ -550,8 +531,8 @@ void Client::step(float dtime) NOTE: This loop is intentionally iterated the way it is. */ - core::list::Iterator i = deleted_blocks.begin(); - core::list sendlist; + std::list::iterator i = deleted_blocks.begin(); + std::list sendlist; for(;;) { if(sendlist.size() == 255 || i == deleted_blocks.end()) @@ -570,14 +551,14 @@ void Client::step(float dtime) writeU16(&reply[0], TOSERVER_DELETEDBLOCKS); reply[2] = sendlist.size(); u32 k = 0; - for(core::list::Iterator + for(std::list::iterator j = sendlist.begin(); - j != sendlist.end(); j++) + j != sendlist.end(); ++j) { writeV3S16(&reply[2+1+6*k], *j); k++; } - m_con.Send(PEER_ID_SERVER, 1, reply, true); + m_con.Send(PEER_ID_SERVER, 2, reply, true); if(i == deleted_blocks.end()) break; @@ -586,7 +567,7 @@ void Client::step(float dtime) } sendlist.push_back(*i); - i++; + ++i; } } @@ -594,15 +575,11 @@ void Client::step(float dtime) 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); - //TimeTaker envtimer("env step", m_device); // Step environment m_env.step(dtime); @@ -632,9 +609,14 @@ void Client::step(float dtime) m_client_event_queue.push_back(event); } } + else if(event.type == CEE_PLAYER_BREATH) + { + u16 breath = event.player_breath.amount; + sendBreath(breath); + } } } - + /* Print some info */ @@ -644,9 +626,8 @@ void Client::step(float 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); + float avg_rtt = getRTT(); infostream<<"Client: avg_rtt="<= 0.2) + if((m_state == LC_Ready) && (counter >= m_recommended_send_interval)) { counter = 0.0; sendPlayerPos(); @@ -668,25 +649,14 @@ 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(); + MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx(); MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p); if(block) { - //JMutexAutoLock lock(block->mesh_mutex); - // Delete the old mesh if(block->mesh != NULL) { @@ -697,11 +667,11 @@ void Client::step(float dtime) // Replace with the new mesh block->mesh = r.mesh; + } else { + delete r.mesh; } if(r.ack_block_to_server) { - /*infostream<<"Client: ACK block ("< 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 @@ -795,14 +777,16 @@ void Client::step(float dtime) { std::ostringstream os(std::ios_base::binary); writeU16(os, TOSERVER_REMOVED_SOUNDS); - writeU16(os, removed_server_ids.size()); + size_t server_ids = removed_server_ids.size(); + assert(server_ids <= 0xFFFF); + writeU16(os, (u16) (server_ids & 0xFFFF)); 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); + Send(1, data, true); } } } @@ -869,18 +853,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 \""< &file_requests) +{ + std::ostringstream os(std::ios_base::binary); + writeU16(os, TOSERVER_REQUEST_MEDIA); + size_t file_requests_size = file_requests.size(); + assert(file_requests_size <= 0xFFFF); + writeU16(os, (u16) (file_requests_size & 0xFFFF)); + + for(std::list::const_iterator i = file_requests.begin(); + i != file_requests.end(); ++i) { + os< data((u8*)s.c_str(), s.size()); + // Send as reliable + Send(1, data, true); + infostream<<"Client: Sending media request list to server (" + < data((u8*)s.c_str(), s.size()); + // Send as reliable + Send(1, data, true); + infostream<<"Client: Notifying server that we received all media" + < 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); + u32 datasize = m_con.Receive(sender_peer_id, data); ProcessData(*data, datasize, sender_peer_id); } @@ -978,8 +993,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) u8 ser_version = m_server_ser_ver; - //infostream<<"Client received command="<<(int)command<setPosition(playerpos_f); - } + // Set player position + Player *player = m_env.getLocalPlayer(); + assert(player != NULL); + player->setPosition(playerpos_f); if(datasize >= 2+1+6+8) { @@ -1021,6 +1030,14 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) m_map_seed = readU64(&data[2+1+6]); infostream<<"Client: received map seed: "<= 2+1+6+8+4) + { + // Get map seed + m_recommended_send_interval = readF1000(&data[2+1+6+8]); + infostream<<"Client: received recommended send interval " + <= index+1) && data[index]){ + remove_metadata = false; + } + + addNode(p, n, remove_metadata); } else if(command == TOCLIENT_BLOCKDATA) { @@ -1101,11 +1125,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) p.Y = readS16(&data[4]); p.Z = readS16(&data[6]); - /*infostream<<"Client: Thread: BLOCKDATA for (" - <getPos() == p2d); - - //TimeTaker timer("MapBlock deSerialize"); - // 0ms block = sector->getBlockNoCreateNoEx(p.Y); if(block) @@ -1126,44 +1142,23 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) /* Update an existing block */ - //infostream<<"Updating"<deSerialize(istr, ser_version, false); + block->deSerializeNetworkSpecific(istr); } else { /* Create a new block */ - //infostream<<"Creating new"<deSerialize(istr, ser_version, false); + block->deSerializeNetworkSpecific(istr); sector->insertBlock(block); } -#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 - /* 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(); + player->inventory.deSerialize(is); - m_inventory_updated = true; + m_inventory_updated = true; - delete m_inventory_from_server; - m_inventory_from_server = new Inventory(player->inventory); - m_inventory_from_server_age = 0.0; + 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){ + + if(datasize >= 2 + 2 + 4) + { time_speed = readF1000(&data[4]); - } else { + } + 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_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; + 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 - } - */ + /* + 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); + 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 + // Read removed objects + is.read(buf, 2); + u16 removed_count = readU16((u8*)buf); + for(unsigned int 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) { - /* - 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) + is.read(buf, 2); + u16 id = readU16((u8*)buf); + if(is.eof()) + break; + is.read(buf, 2); + size_t message_size = readU16((u8*)buf); + std::string message; + message.reserve(message_size); + for(unsigned int i=0; imovement_acceleration_default = readF1000(is) * BS; + player->movement_acceleration_air = readF1000(is) * BS; + player->movement_acceleration_fast = readF1000(is) * BS; + player->movement_speed_walk = readF1000(is) * BS; + player->movement_speed_crouch = readF1000(is) * BS; + player->movement_speed_fast = readF1000(is) * BS; + player->movement_speed_climb = readF1000(is) * BS; + player->movement_speed_jump = readF1000(is) * BS; + player->movement_liquid_fluidity = readF1000(is) * BS; + player->movement_liquid_fluidity_smooth = readF1000(is) * BS; + player->movement_liquid_sink = readF1000(is) * BS; + player->movement_gravity = readF1000(is) * BS; + } else if(command == TOCLIENT_HP) { std::string datastring((char*)&data[2], datasize-2); std::istringstream is(datastring, std::ios_base::binary); - Player *player = m_env.getLocalPlayer(); - assert(player != NULL); - u8 oldhp = player->hp; - u8 hp = readU8(is); + + u8 oldhp = player->hp; + u8 hp = readU8(is); player->hp = hp; if(hp < oldhp) @@ -1392,18 +1366,22 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) m_client_event_queue.push_back(event); } } + else if(command == TOCLIENT_BREATH) + { + std::string datastring((char*)&data[2], datasize-2); + std::istringstream is(datastring, std::ios_base::binary); + + player->setBreath(readU16(is)); + } 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=("<isStarted()) { + const char *problem = m_media_downloader ? + "we already saw another announcement" : + "all media has been received already"; + errorstream<<"Client: Received media announcement but " + <addFile(name, sha1_raw); } - ClientEvent event; - event.type = CE_TEXTURES_UPDATED; - m_client_event_queue.push_back(event); - - /* - u16 command - u16 number of files requested - for each file { - u16 length of name - string name + std::vector remote_media; + try { + Strfnd sf(deSerializeString(is)); + while(!sf.atend()) { + std::string baseurl = trim(sf.next(",")); + if(baseurl != "") + m_media_downloader->addRemoteServer(baseurl); } - */ - std::ostringstream os(std::ios_base::binary); - writeU16(os, TOSERVER_REQUEST_MEDIA); - writeU16(os, file_requests.size()); - - for(core::list::Iterator i = file_requests.begin(); - i != file_requests.end(); i++) { - os<name); + } + catch(SerializationError& e) { + // not supported by server or turned off } - // 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 (" - <step(this); } else if(command == TOCLIENT_MEDIA) { std::string datastring((char*)&data[2], datasize-2); std::istringstream is(datastring, std::ios_base::binary); - // Mesh update thread must be stopped while - // updating content definitions - assert(!m_mesh_update_thread.IsRunning()); - /* u16 command u16 total number of file bunches @@ -1553,57 +1493,37 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) */ int num_bunches = readU16(is); int bunch_i = readU16(is); - if(num_bunches >= 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); + u32 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."<isStarted()) { + const char *problem = m_media_downloader ? + "media has not been requested" : + "all media has been received already"; + errorstream<<"Client: Received media but " + <inventory_formspec = deSerializeLongString(is); } else if(command == TOCLIENT_DETACHED_INVENTORY) @@ -1749,6 +1667,292 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) } inv->deSerialize(is); } + else if(command == TOCLIENT_SHOW_FORMSPEC) + { + std::string datastring((char*)&data[2], datasize-2); + std::istringstream is(datastring, std::ios_base::binary); + + std::string formspec = deSerializeLongString(is); + std::string formname = deSerializeString(is); + + ClientEvent event; + event.type = CE_SHOW_FORMSPEC; + // pointer is required as event is a struct only! + // adding a std:string to a struct isn't possible + event.show_formspec.formspec = new std::string(formspec); + event.show_formspec.formname = new std::string(formname); + m_client_event_queue.push_back(event); + } + else if(command == TOCLIENT_SPAWN_PARTICLE) + { + std::string datastring((char*)&data[2], datasize-2); + std::istringstream is(datastring, std::ios_base::binary); + + v3f pos = readV3F1000(is); + v3f vel = readV3F1000(is); + v3f acc = readV3F1000(is); + float expirationtime = readF1000(is); + float size = readF1000(is); + bool collisiondetection = readU8(is); + std::string texture = deSerializeLongString(is); + bool vertical = false; + try { + vertical = readU8(is); + } catch (...) {} + + ClientEvent event; + event.type = CE_SPAWN_PARTICLE; + event.spawn_particle.pos = new v3f (pos); + event.spawn_particle.vel = new v3f (vel); + event.spawn_particle.acc = new v3f (acc); + event.spawn_particle.expirationtime = expirationtime; + event.spawn_particle.size = size; + event.spawn_particle.collisiondetection = collisiondetection; + event.spawn_particle.vertical = vertical; + event.spawn_particle.texture = new std::string(texture); + + m_client_event_queue.push_back(event); + } + else if(command == TOCLIENT_ADD_PARTICLESPAWNER) + { + std::string datastring((char*)&data[2], datasize-2); + std::istringstream is(datastring, std::ios_base::binary); + + u16 amount = readU16(is); + float spawntime = readF1000(is); + v3f minpos = readV3F1000(is); + v3f maxpos = readV3F1000(is); + v3f minvel = readV3F1000(is); + v3f maxvel = readV3F1000(is); + v3f minacc = readV3F1000(is); + v3f maxacc = readV3F1000(is); + float minexptime = readF1000(is); + float maxexptime = readF1000(is); + float minsize = readF1000(is); + float maxsize = readF1000(is); + bool collisiondetection = readU8(is); + std::string texture = deSerializeLongString(is); + u32 id = readU32(is); + bool vertical = false; + try { + vertical = readU8(is); + } catch (...) {} + + ClientEvent event; + event.type = CE_ADD_PARTICLESPAWNER; + event.add_particlespawner.amount = amount; + event.add_particlespawner.spawntime = spawntime; + event.add_particlespawner.minpos = new v3f (minpos); + event.add_particlespawner.maxpos = new v3f (maxpos); + event.add_particlespawner.minvel = new v3f (minvel); + event.add_particlespawner.maxvel = new v3f (maxvel); + event.add_particlespawner.minacc = new v3f (minacc); + event.add_particlespawner.maxacc = new v3f (maxacc); + event.add_particlespawner.minexptime = minexptime; + event.add_particlespawner.maxexptime = maxexptime; + event.add_particlespawner.minsize = minsize; + event.add_particlespawner.maxsize = maxsize; + event.add_particlespawner.collisiondetection = collisiondetection; + event.add_particlespawner.vertical = vertical; + event.add_particlespawner.texture = new std::string(texture); + event.add_particlespawner.id = id; + + m_client_event_queue.push_back(event); + } + else if(command == TOCLIENT_DELETE_PARTICLESPAWNER) + { + std::string datastring((char*)&data[2], datasize-2); + std::istringstream is(datastring, std::ios_base::binary); + + u32 id = readU16(is); + + ClientEvent event; + event.type = CE_DELETE_PARTICLESPAWNER; + event.delete_particlespawner.id = id; + + m_client_event_queue.push_back(event); + } + else if(command == TOCLIENT_HUDADD) + { + std::string datastring((char *)&data[2], datasize - 2); + std::istringstream is(datastring, std::ios_base::binary); + + u32 id = readU32(is); + u8 type = readU8(is); + v2f pos = readV2F1000(is); + std::string name = deSerializeString(is); + v2f scale = readV2F1000(is); + std::string text = deSerializeString(is); + u32 number = readU32(is); + u32 item = readU32(is); + u32 dir = readU32(is); + v2f align = readV2F1000(is); + v2f offset = readV2F1000(is); + v3f world_pos; + v2s32 size; + try{ + world_pos = readV3F1000(is); + }catch(SerializationError &e) {}; + try{ + size = readV2S32(is); + } catch(SerializationError &e) {}; + + ClientEvent event; + event.type = CE_HUDADD; + event.hudadd.id = id; + event.hudadd.type = type; + event.hudadd.pos = new v2f(pos); + event.hudadd.name = new std::string(name); + event.hudadd.scale = new v2f(scale); + event.hudadd.text = new std::string(text); + event.hudadd.number = number; + event.hudadd.item = item; + event.hudadd.dir = dir; + event.hudadd.align = new v2f(align); + event.hudadd.offset = new v2f(offset); + event.hudadd.world_pos = new v3f(world_pos); + event.hudadd.size = new v2s32(size); + m_client_event_queue.push_back(event); + } + else if(command == TOCLIENT_HUDRM) + { + std::string datastring((char *)&data[2], datasize - 2); + std::istringstream is(datastring, std::ios_base::binary); + + u32 id = readU32(is); + + ClientEvent event; + event.type = CE_HUDRM; + event.hudrm.id = id; + m_client_event_queue.push_back(event); + } + else if(command == TOCLIENT_HUDCHANGE) + { + std::string sdata; + v2f v2fdata; + v3f v3fdata; + u32 intdata = 0; + v2s32 v2s32data; + + std::string datastring((char *)&data[2], datasize - 2); + std::istringstream is(datastring, std::ios_base::binary); + + u32 id = readU32(is); + u8 stat = (HudElementStat)readU8(is); + + if (stat == HUD_STAT_POS || stat == HUD_STAT_SCALE || + stat == HUD_STAT_ALIGN || stat == HUD_STAT_OFFSET) + v2fdata = readV2F1000(is); + else if (stat == HUD_STAT_NAME || stat == HUD_STAT_TEXT) + sdata = deSerializeString(is); + else if (stat == HUD_STAT_WORLD_POS) + v3fdata = readV3F1000(is); + else if (stat == HUD_STAT_SIZE ) + v2s32data = readV2S32(is); + else + intdata = readU32(is); + + ClientEvent event; + event.type = CE_HUDCHANGE; + event.hudchange.id = id; + event.hudchange.stat = (HudElementStat)stat; + event.hudchange.v2fdata = new v2f(v2fdata); + event.hudchange.v3fdata = new v3f(v3fdata); + event.hudchange.sdata = new std::string(sdata); + event.hudchange.data = intdata; + event.hudchange.v2s32data = new v2s32(v2s32data); + m_client_event_queue.push_back(event); + } + else if(command == TOCLIENT_HUD_SET_FLAGS) + { + std::string datastring((char *)&data[2], datasize - 2); + std::istringstream is(datastring, std::ios_base::binary); + + u32 flags = readU32(is); + u32 mask = readU32(is); + + player->hud_flags &= ~mask; + player->hud_flags |= flags; + } + else if(command == TOCLIENT_HUD_SET_PARAM) + { + std::string datastring((char *)&data[2], datasize - 2); + std::istringstream is(datastring, std::ios_base::binary); + + u16 param = readU16(is); + std::string value = deSerializeString(is); + + if(param == HUD_PARAM_HOTBAR_ITEMCOUNT && value.size() == 4) { + s32 hotbar_itemcount = readS32((u8*) value.c_str()); + if(hotbar_itemcount > 0 && hotbar_itemcount <= HUD_HOTBAR_ITEMCOUNT_MAX) + player->hud_hotbar_itemcount = hotbar_itemcount; + } + else if (param == HUD_PARAM_HOTBAR_IMAGE) { + ((LocalPlayer *) player)->hotbar_image = value; + } + else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) { + ((LocalPlayer *) player)->hotbar_selected_image = value; + } + } + else if(command == TOCLIENT_SET_SKY) + { + std::string datastring((char *)&data[2], datasize - 2); + std::istringstream is(datastring, std::ios_base::binary); + + video::SColor *bgcolor = new video::SColor(readARGB8(is)); + std::string *type = new std::string(deSerializeString(is)); + u16 count = readU16(is); + std::vector *params = new std::vector; + + for(size_t i=0; ipush_back(deSerializeString(is)); + + ClientEvent event; + event.type = CE_SET_SKY; + event.set_sky.bgcolor = bgcolor; + event.set_sky.type = type; + event.set_sky.params = params; + m_client_event_queue.push_back(event); + } + else if(command == TOCLIENT_OVERRIDE_DAY_NIGHT_RATIO) + { + std::string datastring((char *)&data[2], datasize - 2); + std::istringstream is(datastring, std::ios_base::binary); + + bool do_override = readU8(is); + float day_night_ratio_f = (float)readU16(is) / 65536; + + ClientEvent event; + event.type = CE_OVERRIDE_DAY_NIGHT_RATIO; + event.override_day_night_ratio.do_override = do_override; + event.override_day_night_ratio.ratio_f = day_night_ratio_f; + m_client_event_queue.push_back(event); + } + else if(command == TOCLIENT_LOCAL_PLAYER_ANIMATIONS) + { + std::string datastring((char *)&data[2], datasize - 2); + std::istringstream is(datastring, std::ios_base::binary); + + LocalPlayer *player = m_env.getLocalPlayer(); + assert(player != NULL); + + player->local_animations[0] = readV2S32(is); + player->local_animations[1] = readV2S32(is); + player->local_animations[2] = readV2S32(is); + player->local_animations[3] = readV2S32(is); + player->local_animation_speed = readF1000(is); + } + else if(command == TOCLIENT_EYE_OFFSET) + { + std::string datastring((char *)&data[2], datasize - 2); + std::istringstream is(datastring, std::ios_base::binary); + + LocalPlayer *player = m_env.getLocalPlayer(); + assert(player != NULL); + + player->eye_offset_first = readV3F1000(is); + player->eye_offset_third = readV3F1000(is); + } else { infostream<<"Client: Ignoring unknown command " @@ -1764,7 +1968,7 @@ void Client::Send(u16 channelnum, SharedBuffer data, bool reliable) void Client::interact(u8 action, const PointedThing& pointed) { - if(connectedAndInitialized() == false){ + if(m_state != LC_Ready){ infostream<<"Client::interact() " "cancelled (not connected)" <::const_iterator i = fields.begin(); i != fields.end(); i++){ const std::string &name = i->first; @@ -1824,17 +2030,19 @@ void Client::sendNodemetaFields(v3s16 p, const std::string &formname, Send(0, data, true); } -void Client::sendInventoryFields(const std::string &formname, +void Client::sendInventoryFields(const std::string &formname, const std::map &fields) { std::ostringstream os(std::ios_base::binary); writeU16(os, TOSERVER_INVENTORY_FIELDS); os<::const_iterator i = fields.begin(); i != fields.end(); i++){ - const std::string &name = i->first; + const std::string &name = i->first; const std::string &value = i->second; os< 0xFFFF) { + messagesize = 0xFFFF; + } + writeU16(buf, (u16) messagesize); 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); +} + void Client::sendRespawn() { DSTACK(__FUNCTION_NAME); @@ -1959,14 +2185,47 @@ void Client::sendRespawn() Send(0, data, true); } +void Client::sendReady() +{ + DSTACK(__FUNCTION_NAME); + std::ostringstream os(std::ios_base::binary); + + writeU16(os, TOSERVER_CLIENT_READY); + writeU8(os,VERSION_MAJOR); + writeU8(os,VERSION_MINOR); + writeU8(os,VERSION_PATCH_ORIG); + writeU8(os,0); + + writeU16(os,strlen(minetest_version_hash)); + os.write(minetest_version_hash,strlen(minetest_version_hash)); + + // 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::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 @@ -1979,13 +2238,14 @@ void Client::sendPlayerPos() // 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 @@ -2000,7 +2260,7 @@ void Client::sendPlayerPos() writeV3S32(&data[2], position); writeV3S32(&data[2+12], speed); writeS32(&data[2+12+12], pitch); - writeS32(&data[2+12+12+4], yaw); + writeS32(&data[2+12+12+4], yaw); writeU32(&data[2+12+12+4+4], keyPressed); // Send as unreliable Send(0, data, false); @@ -2030,11 +2290,10 @@ void Client::sendPlayerItem(u16 item) void Client::removeNode(v3s16 p) { - core::map modified_blocks; + std::map modified_blocks; try { - //TimeTaker t("removeNodeAndUpdate", m_device); m_env.getMap().removeNodeAndUpdate(p, modified_blocks); } catch(InvalidPositionException &e) @@ -2044,41 +2303,38 @@ void Client::removeNode(v3s16 p) // add urgent task to update the modified node addUpdateMeshTaskForNode(p, false, true); - for(core::map::Iterator - i = modified_blocks.getIterator(); - i.atEnd() == false; i++) + for(std::map::iterator + i = modified_blocks.begin(); + i != modified_blocks.end(); ++i) { - v3s16 p = i.getNode()->getKey(); - addUpdateMeshTaskWithEdge(p); + addUpdateMeshTaskWithEdge(i->first); } } -void Client::addNode(v3s16 p, MapNode n) +void Client::addNode(v3s16 p, MapNode n, bool remove_metadata) { TimeTaker timer1("Client::addNode()"); - core::map modified_blocks; + std::map modified_blocks; 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++) + for(std::map::iterator + i = modified_blocks.begin(); + i != modified_blocks.end(); ++i) { - v3s16 p = i.getNode()->getKey(); - addUpdateMeshTaskWithEdge(p); + addUpdateMeshTaskWithEdge(i->first); } } void Client::setPlayerControl(PlayerControl &control) { - //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out LocalPlayer *player = m_env.getLocalPlayer(); assert(player != NULL); player->control = control; @@ -2086,7 +2342,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); @@ -2096,8 +2351,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; @@ -2106,7 +2359,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; @@ -2153,6 +2405,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc) } return NULL; } + void Client::inventoryAction(InventoryAction *a) { /* @@ -2164,6 +2417,9 @@ void Client::inventoryAction(InventoryAction *a) Predict some local inventory changes */ a->clientApply(this, this); + + // Remove it + delete a; } ClientActiveObject * Client::getSelectedActiveObject( @@ -2172,17 +2428,15 @@ 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 "<getName()); - m_chat_queue.push_back( - (std::wstring)L"<"+name+L"> "+message); + m_chat_queue.push_back((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->setHighlighted(m_highlighted_pos, m_show_hud); data->setSmoothLighting(g_settings->getBool("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 +} + +void Client::afterContentReceived(IrrlichtDevice *device, gui::IGUIFont* font) { - verbosestream<<"Client::afterContentReceived() started"<rebuildImagesAndTextures(); - // Update texture atlas - verbosestream<<"Updating texture atlas"<getBool("enable_texture_atlas")) - m_tsrc->buildMainAtlas(this); + // Rebuild shaders + infostream<<"- Rebuilding shaders"<rebuildShaders(); // 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); + // Update node textures and assign shaders to each tile + infostream<<"- Updating node textures"<updateTextures(this); + + // 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; + if (count%50 == 0) // only update every 50 item + draw_load_screen(text, device, guienv, font, 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) { + irr::video::IImage* const image = driver->createImage(video::ECF_R8G8B8, + raw_image->getDimension()); + + if (image) { + raw_image->copyTo(image); + irr::c8 filename[256]; + snprintf(filename, sizeof(filename), "%s" DIR_DELIM "screenshot_%u.png", + g_settings->get("screenshot_path").c_str(), + device->getTimer()->getRealTime()); + std::stringstream sstr; + if (driver->writeImageToFile(image, filename)) { + sstr << "Saved screenshot to '" << filename << "'"; + } else { + sstr << "Failed to save screenshot '" << filename << "'"; + } + m_chat_queue.push_back(narrow_to_wide(sstr.str())); + infostream << sstr << std::endl; + image->drop(); + } + raw_image->drop(); } } @@ -2493,6 +2777,14 @@ 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(): " @@ -2509,3 +2801,32 @@ MtEventManager* Client::getEventManager() return m_event; } +scene::IAnimatedMesh* Client::getMesh(const std::string &filename) +{ + std::map::const_iterator i = + m_mesh_data.find(filename); + if(i == m_mesh_data.end()){ + errorstream<<"Client::getMesh(): Mesh not found: \""<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()); + assert(rfile); + + 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; +} +