X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fclient.cpp;h=216d86cd412c6d0ffa0e9ae3cd1d8593614887e5;hb=69bd803a3221bf02672431390e672b0510695254;hp=29872fb6ef08de374e93476399de17d1286952b2;hpb=98c40f5ee61f482766a9e6eefbda011293124c4e;p=oweals%2Fminetest.git diff --git a/src/client.cpp b/src/client.cpp index 29872fb6e..216d86cd4 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -3,22 +3,21 @@ Minetest-c55 Copyright (C) 2010 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along 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 "utility.h" #include #include "clientserver.h" #include "jmutexautolock.h" @@ -34,29 +33,28 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "nodemetadata.h" #include "nodedef.h" #include "itemdef.h" +#include "shader.h" #include #include "sha1.h" #include "base64.h" #include "clientmap.h" #include "filecache.h" #include "sound.h" -#include "utility_string.h" +#include "util/string.h" #include "hex.h" +#include "IMeshCache.h" +#include "util/serialize.h" +#include "config.h" + +#if USE_CURL +#include +#endif 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_) - {} -}; - /* QueuedMeshUpdate */ @@ -221,18 +219,60 @@ void * MeshUpdateThread::Thread() return NULL; } +void * MediaFetchThread::Thread() +{ + ThreadStarted(); + + log_register_thread("MediaFetchThread"); + + DSTACK(__FUNCTION_NAME); + + BEGIN_DEBUG_EXCEPTION_HANDLER + + #if USE_CURL + CURL *curl; + CURLcode res; + for (core::list::Iterator i = m_file_requests.begin(); + i != m_file_requests.end(); i++) { + curl = curl_easy_init(); + assert(curl); + curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt(curl, CURLOPT_URL, (m_remote_url + i->name).c_str()); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); + std::ostringstream stream; + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream); + res = curl_easy_perform(curl); + if (res == CURLE_OK) { + std::string data = stream.str(); + m_file_data.push_back(make_pair(i->name, data)); + } else { + m_failed.push_back(*i); + infostream << "cURL request failed for " << i->name << std::endl; + } + curl_easy_cleanup(curl); + } + #endif + + END_DEBUG_EXCEPTION_HANDLER(errorstream) + + return NULL; +} + Client::Client( IrrlichtDevice *device, const char *playername, std::string password, MapDrawControl &control, IWritableTextureSource *tsrc, + IWritableShaderSource *shsrc, IWritableItemDefManager *itemdef, IWritableNodeDefManager *nodedef, ISoundManager *sound, MtEventManager *event ): m_tsrc(tsrc), + m_shsrc(shsrc), m_itemdef(itemdef), m_nodedef(nodedef), m_sound(sound), @@ -259,13 +299,15 @@ Client::Client( m_password(password), m_access_denied(false), m_media_cache(getMediaCacheDir()), - m_media_receive_progress(0), - m_media_received(false), + m_media_receive_started(false), + m_media_count(0), + m_media_received_count(0), m_itemdef_received(false), m_nodedef_received(false), m_time_of_day_set(false), m_last_time_of_day_f(-1), m_time_of_day_update_timer(0), + m_recommended_send_interval(0.1), m_removed_sounds_check_timer(0) { m_packetcounter_timer = 0.0; @@ -291,6 +333,9 @@ Client::Client( m_env.addPlayer(player); } + + for (size_t i = 0; i < g_settings->getU16("media_fetch_threads"); ++i) + m_media_fetch_threads.push_back(new MediaFetchThread(this)); } Client::~Client() @@ -305,6 +350,19 @@ Client::~Client() 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 (core::list::Iterator i = m_media_fetch_threads.begin(); + i != m_media_fetch_threads.end(); i++) + delete *i; } void Client::connect(Address address) @@ -490,8 +548,9 @@ void Client::step(float dtime) // [2] u8 SER_FMT_VER_HIGHEST // [3] u8[20] player_name // [23] u8[28] password (new in some version) - // [51] u16 client network protocol version (new in some version) - SharedBuffer data(2+1+PLAYERNAME_SIZE+PASSWORD_SIZE+2); + // [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); @@ -504,8 +563,8 @@ void Client::step(float dtime) memset((char*)&data[23], 0, PASSWORD_SIZE); snprintf((char*)&data[23], PASSWORD_SIZE, "%s", m_password.c_str()); - // This should be incremented in each version - writeU16(&data[51], PROTOCOL_VERSION); + writeU16(&data[51], CLIENT_PROTOCOL_VERSION_MIN); + writeU16(&data[53], CLIENT_PROTOCOL_VERSION_MAX); // Send as unreliable Send(0, data, false); @@ -647,7 +706,7 @@ void Client::step(float dtime) { float &counter = m_playerpos_send_timer; counter += dtime; - if(counter >= 0.2) + if(counter >= m_recommended_send_interval) { counter = 0.0; sendPlayerPos(); @@ -715,6 +774,62 @@ void Client::step(float dtime) g_profiler->graphAdd("num_processed_meshes", num_processed_meshes); } + /* + Load fetched media + */ + if (m_media_receive_started) { + bool all_stopped = true; + for (core::list::Iterator thread = m_media_fetch_threads.begin(); + thread != m_media_fetch_threads.end(); thread++) { + all_stopped &= !(*thread)->IsRunning(); + while ((*thread)->m_file_data.size() > 0) { + std::pair out = (*thread)->m_file_data.pop_front(); + ++m_media_received_count; + + bool success = loadMedia(out.second, out.first); + if(success){ + verbosestream<<"Client: Loaded received media: " + <<"\""<::Node *n; + n = m_media_name_sha1_map.find(out.first); + if(n == NULL) + errorstream<<"The server sent a file that has not " + <<"been announced."< fetch_failed; + for (core::list::Iterator thread = m_media_fetch_threads.begin(); + thread != m_media_fetch_threads.end(); thread++) { + for (core::list::Iterator request = (*thread)->m_failed.begin(); + request != (*thread)->m_failed.end(); request++) + fetch_failed.push_back(*request); + (*thread)->m_failed.clear(); + } + if (fetch_failed.size() > 0) { + infostream << "Failed to remote-fetch " << fetch_failed.size() << " files. " + << "Requesting them the usual way." << std::endl; + request_media(fetch_failed); + } + } + } + /* If the server didn't update the inventory in a while, revert the local inventory (so the player notices the lag problem @@ -813,7 +928,7 @@ bool Client::loadMedia(const std::string &data, const std::string &filename) if(name != "") { verbosestream<<"Client: Attempting to load image " - <<"file \""<getFileSystem(); video::IVideoDriver *vdrv = m_device->getVideoDriver(); @@ -847,11 +962,33 @@ bool Client::loadMedia(const std::string &data, const std::string &filename) if(name != "") { verbosestream<<"Client: Attempting to load sound " - <<"file \""<loadSoundData(name, data); return true; } + const char *model_ext[] = { + ".x", ".b3d", ".md2", ".obj", + NULL + }; + name = removeStringEnd(filename, model_ext); + if(name != "") + { + verbosestream<<"Client: Storing model into Irrlicht: " + <<"\""<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); + + return true; + } + errorstream<<"Client: Don't know how to load file \"" < &file_requests) +{ + std::ostringstream os(std::ios_base::binary); + writeU16(os, TOSERVER_REQUEST_MEDIA); + writeU16(os, file_requests.size()); + + for(core::list::ConstIterator i = file_requests.begin(); + i != file_requests.end(); i++) { + os<name); + } + + // 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+1+6+8+4) + { + // Get map seed + m_recommended_send_interval = readF1000(&data[2+1+6+8]); + infostream<<"Client: received recommended send interval " + <isLocal()) { - infostream<<"Client: ignoring player item " - << deSerializeString(is) - << " for local player" << std::endl; - continue; - } else { - InventoryList *inv = player->inventory.getList("main"); - std::string itemstring(deSerializeString(is)); - ItemStack item; - item.deSerialize(itemstring, m_itemdef); - inv->changeItem(0, item); - if(itemstring.empty()) - { - infostream<<"Client: empty player item for peer " - < file_requests; @@ -1507,37 +1642,52 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) file_requests.push_back(MediaRequest(name)); } - ClientEvent event; - event.type = CE_TEXTURES_UPDATED; - m_client_event_queue.push_back(event); + std::string remote_media = ""; + try { + remote_media = deSerializeString(is); + } + catch(SerializationError) { + // not supported by server or turned off + } - /* - u16 command - u16 number of files requested - for each file { - u16 length of name - string name + m_media_count = file_requests.size(); + m_media_receive_started = true; + + if (remote_media == "" || !USE_CURL) { + request_media(file_requests); + } else { + #if USE_CURL + core::list::Iterator cur = m_media_fetch_threads.begin(); + for(core::list::Iterator i = file_requests.begin(); + i != file_requests.end(); i++) { + (*cur)->m_file_requests.push_back(*i); + cur++; + if (cur == m_media_fetch_threads.end()) + cur = m_media_fetch_threads.begin(); } - */ - std::ostringstream os(std::ios_base::binary); - writeU16(os, TOSERVER_REQUEST_MEDIA); - writeU16(os, file_requests.size()); + for (core::list::Iterator i = m_media_fetch_threads.begin(); + i != m_media_fetch_threads.end(); i++) { + (*i)->m_remote_url = remote_media; + (*i)->Start(); + } + #endif - for(core::list::Iterator i = file_requests.begin(); - i != file_requests.end(); i++) { - os<name); + // notify server we received everything + std::ostringstream os(std::ios_base::binary); + writeU16(os, TOSERVER_RECEIVED_MEDIA); + std::string s = os.str(); + SharedBuffer data((u8*)s.c_str(), s.size()); + // Send as reliable + Send(0, data, true); } - - // 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 "<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 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); + + 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); + m_client_event_queue.push_back(event); + } else { infostream<<"Client: Ignoring unknown command " @@ -1763,33 +1965,23 @@ void Client::interact(u8 action, const PointedThing& pointed) Send(0, data, true); } -void Client::sendSignNodeText(v3s16 p, std::string text) +void Client::sendNodemetaFields(v3s16 p, const std::string &formname, + const std::map &fields) { - /* - u16 command - v3s16 p - u16 textlen - textdata - */ std::ostringstream os(std::ios_base::binary); - u8 buf[12]; - - // Write command - writeU16(buf, TOSERVER_SIGNNODETEXT); - os.write((char*)buf, 2); - - // Write p - writeV3S16(buf, p); - os.write((char*)buf, 6); - u16 textlen = text.size(); - // Write text length - writeS16(buf, textlen); - os.write((char*)buf, 2); + 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< data((u8*)s.c_str(), s.size()); @@ -1797,6 +1989,29 @@ void Client::sendSignNodeText(v3s16 p, std::string text) Send(0, data, true); } +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 &value = i->second; + os< data((u8*)s.c_str(), s.size()); + // Send as reliable + Send(0, data, true); +} + void Client::sendInventoryAction(InventoryAction *a) { std::ostringstream os(std::ios_base::binary); @@ -1913,10 +2128,24 @@ 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 @@ -1935,7 +2164,7 @@ void Client::sendPlayerPos() 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 @@ -1943,15 +2172,15 @@ void Client::sendPlayerPos() [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 */ - - SharedBuffer data(2+12+12+4+4); + 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); - + writeS32(&data[2+12+12+4], yaw); + writeU32(&data[2+12+12+4+4], keyPressed); // Send as unreliable Send(0, data, false); } @@ -2091,6 +2320,13 @@ Inventory* Client::getInventory(const InventoryLocation &loc) return meta->getInventory(); } break; + case InventoryLocation::DETACHED: + { + if(m_detached_inventories.count(loc.name) == 0) + return NULL; + return m_detached_inventories[loc.name]; + } + break; default: assert(0); } @@ -2371,32 +2607,53 @@ ClientEvent Client::getClientEvent() void Client::afterContentReceived() { + infostream<<"Client::afterContentReceived() started"<rebuildImagesAndTextures(); // Update texture atlas + infostream<<"- Updating texture atlas"<getBool("enable_texture_atlas")) m_tsrc->buildMainAtlas(this); + // Rebuild shaders + m_shsrc->rebuildShaders(); + // Update node aliases + infostream<<"- Updating node aliases"<updateAliases(m_itemdef); // Update node textures + infostream<<"- Updating node textures"<updateTextures(m_tsrc); - // Update item textures and meshes - m_itemdef->updateTexturesAndMeshes(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(); + 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); + } + } // Start mesh update thread after setting up content definitions + infostream<<"- Starting mesh update thread"<