Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
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 <iostream>
#include "clientserver.h"
#include "jmutexautolock.h"
#include "log.h"
#include "nodemetadata.h"
#include "nodedef.h"
-#include "tooldef.h"
+#include "itemdef.h"
#include <IFileSystem.h>
+#include "sha1.h"
+#include "base64.h"
+#include "clientmap.h"
+#include "filecache.h"
+#include "sound.h"
+#include "util/string.h"
+#include "hex.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_)
+ {}
+};
/*
QueuedMeshUpdate
{
JMutexAutoLock lock(m_mutex);
- core::list<QueuedMeshUpdate*>::Iterator i;
- for(i=m_queue.begin(); i!=m_queue.end(); i++)
+ for(std::vector<QueuedMeshUpdate*>::iterator
+ i = m_queue.begin();
+ i != m_queue.end(); i++)
{
QueuedMeshUpdate *q = *i;
delete q;
/*
peer_id=0 adds with nobody to send to
*/
-void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server)
+void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent)
{
DSTACK(__FUNCTION_NAME);
JMutexAutoLock lock(m_mutex);
+ if(urgent)
+ m_urgents.insert(p);
+
/*
Find if block is already in queue.
If it is, update the data and quit.
*/
- core::list<QueuedMeshUpdate*>::Iterator i;
- for(i=m_queue.begin(); i!=m_queue.end(); i++)
+ for(std::vector<QueuedMeshUpdate*>::iterator
+ i = m_queue.begin();
+ i != m_queue.end(); i++)
{
QueuedMeshUpdate *q = *i;
if(q->p == p)
{
JMutexAutoLock lock(m_mutex);
- core::list<QueuedMeshUpdate*>::Iterator i = m_queue.begin();
- if(i == m_queue.end())
- return NULL;
- QueuedMeshUpdate *q = *i;
- m_queue.erase(i);
- return q;
+ bool must_be_urgent = !m_urgents.empty();
+ for(std::vector<QueuedMeshUpdate*>::iterator
+ i = m_queue.begin();
+ i != m_queue.end(); i++)
+ {
+ QueuedMeshUpdate *q = *i;
+ if(must_be_urgent && m_urgents.count(q->p) == 0)
+ continue;
+ m_queue.erase(i);
+ m_urgents.erase(q->p);
+ return q;
+ }
+ return NULL;
}
/*
ScopeProfiler sp(g_profiler, "Client: Mesh making");
- scene::SMesh *mesh_new = NULL;
- mesh_new = makeMapBlockMesh(q->data, m_gamedef);
+ MapBlockMesh *mesh_new = new MapBlockMesh(q->data);
+ if(mesh_new->getMesh()->getMeshBufferCount() == 0)
+ {
+ delete mesh_new;
+ mesh_new = NULL;
+ }
MeshUpdateResult r;
r.p = q->p;
std::string password,
MapDrawControl &control,
IWritableTextureSource *tsrc,
- IWritableToolDefManager *tooldef,
- IWritableNodeDefManager *nodedef
+ IWritableItemDefManager *itemdef,
+ IWritableNodeDefManager *nodedef,
+ ISoundManager *sound,
+ MtEventManager *event
):
m_tsrc(tsrc),
- m_tooldef(tooldef),
+ m_itemdef(itemdef),
m_nodedef(nodedef),
+ m_sound(sound),
+ m_event(event),
m_mesh_update_thread(this),
m_env(
new ClientMap(this, this, control,
device->getSceneManager()->getRootSceneNode(),
device->getSceneManager(), 666),
device->getSceneManager(),
- tsrc, this
+ tsrc, this, device
),
m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this),
m_device(device),
m_server_ser_ver(SER_FMT_VER_INVALID),
+ m_playeritem(0),
m_inventory_updated(false),
- m_time_of_day(0),
+ m_inventory_from_server(NULL),
+ m_inventory_from_server_age(0.0),
+ 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_texture_receive_progress(0),
- m_textures_received(false),
- m_tooldef_received(false),
- m_nodedef_received(false)
+ m_media_cache(getMediaCacheDir()),
+ m_media_receive_progress(0),
+ m_media_received(false),
+ 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_removed_sounds_check_timer(0)
{
m_packetcounter_timer = 0.0;
//m_delete_unused_sectors_timer = 0.0;
else
infostream<<"Not building texture atlas."<<std::endl;
- // Update node textures
- m_nodedef->updateTextures(m_tsrc);
-
- // Start threads after setting up content definitions
- m_mesh_update_thread.Start();
-
/*
Add local player
*/
player->updateName(playername);
m_env.addPlayer(player);
-
- // Initialize player in the inventory context
- m_inventory_context.current_player = player;
}
}
m_mesh_update_thread.setRun(false);
while(m_mesh_update_thread.IsRunning())
sleep_ms(100);
+
+ delete m_inventory_from_server;
}
void Client::connect(Address address)
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 "<<dtime<<std::endl;
{
if(m_ignore_damage_timer <= 0)
{
u8 damage = event.player_damage.amount;
- sendDamage(damage);
+
+ if(event.player_damage.send_to_server)
+ sendDamage(damage);
// Add to ClientEvent queue
ClientEvent event;
/*infostream<<"Mesh update result queue size is "
<<m_mesh_update_thread.m_queue_out.size()
<<std::endl;*/
-
+
+ int num_processed_meshes = 0;
while(m_mesh_update_thread.m_queue_out.size() > 0)
{
+ num_processed_meshes++;
MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_front();
MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p);
if(block)
{
- block->replaceMesh(r.mesh);
+ //JMutexAutoLock lock(block->mesh_mutex);
+
+ // Delete the old mesh
+ if(block->mesh != NULL)
+ {
+ // TODO: Remove hardware buffers of meshbuffers of block->mesh
+ delete block->mesh;
+ block->mesh = NULL;
+ }
+
+ // Replace with the new mesh
+ block->mesh = r.mesh;
}
if(r.ack_block_to_server)
{
m_con.Send(PEER_ID_SERVER, 1, reply, true);
}
}
+ if(num_processed_meshes > 0)
+ g_profiler->graphAdd("num_processed_meshes", num_processed_meshes);
+ }
+
+ /*
+ If the server didn't update the inventory in a while, revert
+ the local inventory (so the player notices the lag problem
+ and knows something is wrong).
+ */
+ if(m_inventory_from_server)
+ {
+ float interval = 10.0;
+ float count_before = floor(m_inventory_from_server_age / interval);
+
+ m_inventory_from_server_age += dtime;
+
+ float count_after = floor(m_inventory_from_server_age / interval);
+
+ if(count_after != count_before)
+ {
+ // Do this every <interval> seconds after TOCLIENT_INVENTORY
+ // Reset the locally changed inventory to the authoritative inventory
+ Player *player = m_env.getLocalPlayer();
+ player->inventory = *m_inventory_from_server;
+ m_inventory_updated = true;
+ }
+ }
+
+ /*
+ Update positions of sounds attached to objects
+ */
+ {
+ for(std::map<int, u16>::iterator
+ i = m_sounds_to_objects.begin();
+ i != m_sounds_to_objects.end(); i++)
+ {
+ int client_id = i->first;
+ u16 object_id = i->second;
+ ClientActiveObject *cao = m_env.getActiveObject(object_id);
+ if(!cao)
+ continue;
+ v3f pos = cao->getPosition();
+ 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)
+ {
+ m_removed_sounds_check_timer = 0;
+ // Find removed sounds and clear references to them
+ std::set<s32> removed_server_ids;
+ for(std::map<s32, int>::iterator
+ i = m_sounds_server_to_client.begin();
+ i != m_sounds_server_to_client.end();)
+ {
+ s32 server_id = i->first;
+ int client_id = i->second;
+ 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);
+ }
+ }
+ // 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<s32>::iterator i = removed_server_ids.begin();
+ i != removed_server_ids.end(); i++)
+ writeS32(os, *i);
+ std::string s = os.str();
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+ // Send as reliable
+ Send(0, data, true);
+ }
+ }
+}
+
+bool Client::loadMedia(const std::string &data, const std::string &filename)
+{
+ // Silly irrlicht's const-incorrectness
+ Buffer<char> data_rw(data.c_str(), data.size());
+
+ std::string name;
+
+ const char *image_ext[] = {
+ ".png", ".jpg", ".bmp", ".tga",
+ ".pcx", ".ppm", ".psd", ".wal", ".rgb",
+ NULL
+ };
+ name = removeStringEnd(filename, image_ext);
+ if(name != "")
+ {
+ verbosestream<<"Client: Attempting to load image "
+ <<"file \""<<filename<<"\""<<std::endl;
+
+ io::IFileSystem *irrfs = m_device->getFileSystem();
+ video::IVideoDriver *vdrv = m_device->getVideoDriver();
+
+ // Create an irrlicht memory file
+ io::IReadFile *rfile = irrfs->createMemoryReadFile(
+ *data_rw, data_rw.getSize(), "_tempreadfile");
+ assert(rfile);
+ // Read image
+ video::IImage *img = vdrv->createImageFromFile(rfile);
+ if(!img){
+ errorstream<<"Client: Cannot create image from data of "
+ <<"file \""<<filename<<"\""<<std::endl;
+ rfile->drop();
+ return false;
+ }
+ else {
+ m_tsrc->insertSourceImage(filename, img);
+ img->drop();
+ rfile->drop();
+ return true;
+ }
}
+
+ const char *sound_ext[] = {
+ ".0.ogg", ".1.ogg", ".2.ogg", ".3.ogg", ".4.ogg",
+ ".5.ogg", ".6.ogg", ".7.ogg", ".8.ogg", ".9.ogg",
+ ".ogg", NULL
+ };
+ name = removeStringEnd(filename, sound_ext);
+ if(name != "")
+ {
+ verbosestream<<"Client: Attempting to load sound "
+ <<"file \""<<filename<<"\""<<std::endl;
+ m_sound->loadSoundData(name, data);
+ return true;
+ }
+
+ errorstream<<"Client: Don't know how to load file \""
+ <<filename<<"\""<<std::endl;
+ return false;
}
// Virtual methods from con::PeerHandler
try{
Receive();
+ g_profiler->graphAdd("client_received_packets", 1);
}
catch(con::NoIncomingDataException &e)
{
//TimeTaker t1("TOCLIENT_REMOVENODE");
- // This will clear the cracking animation after digging
- ((ClientMap&)m_env.getMap()).clearTempMod(p);
-
removeNode(p);
}
else if(command == TOCLIENT_ADDNODE)
Update an existing block
*/
//infostream<<"Updating"<<std::endl;
- block->deSerialize(istr, ser_version);
+ block->deSerialize(istr, ser_version, false);
}
else
{
*/
//infostream<<"Creating new"<<std::endl;
block = new MapBlock(&m_env.getMap(), p, this);
- block->deSerialize(istr, ser_version);
+ block->deSerialize(istr, ser_version, false);
sector->insertBlock(block);
-
- //DEBUG
- /*NodeMod mod;
- mod.type = NODEMOD_CHANGECONTENT;
- mod.param = CONTENT_MESE;
- block->setTempMod(v3s16(8,10,8), mod);
- block->setTempMod(v3s16(8,9,8), mod);
- block->setTempMod(v3s16(8,8,8), mod);
- block->setTempMod(v3s16(8,7,8), mod);
- block->setTempMod(v3s16(8,6,8), mod);*/
}
#if 0
m_con.Send(PEER_ID_SERVER, 1, reply, true);
#endif
- /*
- Update Mesh of this block and blocks at x-, y- and z-.
- Environment should not be locked as it interlocks with the
- main thread, from which is will want to retrieve textures.
- */
-
- //m_env.getClientMap().updateMeshes(block->getPos(), getDayNightRatio());
/*
Add it to mesh update queue and set it to be acknowledged after update.
*/
//infostream<<"Adding mesh update task for received block"<<std::endl;
addUpdateMeshTaskWithEdge(p, true);
}
- else if(command == TOCLIENT_PLAYERPOS)
- {
- infostream<<"Received deprecated TOCLIENT_PLAYERPOS"
- <<std::endl;
- /*u16 our_peer_id;
- {
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
- our_peer_id = m_con.GetPeerID();
- }
- // Cancel if we don't have a peer id
- if(our_peer_id == PEER_ID_INEXISTENT){
- infostream<<"TOCLIENT_PLAYERPOS cancelled: "
- "we have no peer id"
- <<std::endl;
- return;
- }*/
-
- { //envlock
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
- u32 player_size = 2+12+12+4+4;
-
- u32 player_count = (datasize-2) / player_size;
- u32 start = 2;
- for(u32 i=0; i<player_count; i++)
- {
- u16 peer_id = readU16(&data[start]);
-
- Player *player = m_env.getPlayer(peer_id);
-
- // Skip if player doesn't exist
- if(player == NULL)
- {
- start += player_size;
- continue;
- }
-
- // Skip if player is local player
- if(player->isLocal())
- {
- start += player_size;
- continue;
- }
-
- v3s32 ps = readV3S32(&data[start+2]);
- v3s32 ss = readV3S32(&data[start+2+12]);
- s32 pitch_i = readS32(&data[start+2+12+12]);
- s32 yaw_i = readS32(&data[start+2+12+12+4]);
- /*infostream<<"Client: got "
- <<"pitch_i="<<pitch_i
- <<" yaw_i="<<yaw_i<<std::endl;*/
- f32 pitch = (f32)pitch_i / 100.0;
- f32 yaw = (f32)yaw_i / 100.0;
- v3f position((f32)ps.X/100., (f32)ps.Y/100., (f32)ps.Z/100.);
- v3f speed((f32)ss.X/100., (f32)ss.Y/100., (f32)ss.Z/100.);
- player->setPosition(position);
- player->setSpeed(speed);
- player->setPitch(pitch);
- player->setYaw(yaw);
-
- /*infostream<<"Client: player "<<peer_id
- <<" pitch="<<pitch
- <<" yaw="<<yaw<<std::endl;*/
-
- start += player_size;
- }
- } //envlock
- }
- else if(command == TOCLIENT_PLAYERINFO)
- {
- u16 our_peer_id;
- {
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
- our_peer_id = m_con.GetPeerID();
- }
- // Cancel if we don't have a peer id
- if(our_peer_id == PEER_ID_INEXISTENT){
- infostream<<"TOCLIENT_PLAYERINFO cancelled: "
- "we have no peer id"
- <<std::endl;
- return;
- }
-
- //infostream<<"Client: Server reports players:"<<std::endl;
-
- { //envlock
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
- u32 item_size = 2+PLAYERNAME_SIZE;
- u32 player_count = (datasize-2) / item_size;
- u32 start = 2;
- // peer_ids
- core::list<u16> players_alive;
- for(u32 i=0; i<player_count; i++)
- {
- // Make sure the name ends in '\0'
- data[start+2+20-1] = 0;
-
- u16 peer_id = readU16(&data[start]);
-
- players_alive.push_back(peer_id);
-
- /*infostream<<"peer_id="<<peer_id
- <<" name="<<((char*)&data[start+2])<<std::endl;*/
-
- // Don't update the info of the local player
- if(peer_id == our_peer_id)
- {
- start += item_size;
- continue;
- }
-
- Player *player = m_env.getPlayer(peer_id);
-
- // Create a player if it doesn't exist
- if(player == NULL)
- {
- player = new RemotePlayer(this,
- m_device->getSceneManager()->getRootSceneNode(),
- m_device,
- -1);
- player->peer_id = peer_id;
- m_env.addPlayer(player);
- infostream<<"Client: Adding new player "
- <<peer_id<<std::endl;
- }
-
- player->updateName((char*)&data[start+2]);
-
- start += item_size;
- }
-
- /*
- Remove those players from the environment that
- weren't listed by the server.
- */
- //infostream<<"Removing dead players"<<std::endl;
- core::list<Player*> players = m_env.getPlayers();
- core::list<Player*>::Iterator ip;
- for(ip=players.begin(); ip!=players.end(); ip++)
- {
- // Ingore local player
- if((*ip)->isLocal())
- continue;
-
- // Warn about a special case
- if((*ip)->peer_id == 0)
- {
- infostream<<"Client: Removing "
- "dead player with id=0"<<std::endl;
- }
-
- bool is_alive = false;
- core::list<u16>::Iterator i;
- for(i=players_alive.begin(); i!=players_alive.end(); i++)
- {
- if((*ip)->peer_id == *i)
- {
- is_alive = true;
- break;
- }
- }
- /*infostream<<"peer_id="<<((*ip)->peer_id)
- <<" is_alive="<<is_alive<<std::endl;*/
- if(is_alive)
- continue;
- infostream<<"Removing dead player "<<(*ip)->peer_id
- <<std::endl;
- m_env.removePlayer((*ip)->peer_id);
- }
- } //envlock
- }
- else if(command == TOCLIENT_SECTORMETA)
- {
- infostream<<"Client received DEPRECATED TOCLIENT_SECTORMETA"<<std::endl;
-#if 0
- /*
- [0] u16 command
- [2] u8 sector count
- [3...] v2s16 pos + sector metadata
- */
- if(datasize < 3)
- return;
-
- //infostream<<"Client received TOCLIENT_SECTORMETA"<<std::endl;
-
- { //envlock
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- u8 buf[4];
-
- is.read((char*)buf, 1);
- u16 sector_count = readU8(buf);
-
- //infostream<<"sector_count="<<sector_count<<std::endl;
-
- for(u16 i=0; i<sector_count; i++)
- {
- // Read position
- is.read((char*)buf, 4);
- v2s16 pos = readV2S16(buf);
- /*infostream<<"Client: deserializing sector at "
- <<"("<<pos.X<<","<<pos.Y<<")"<<std::endl;*/
- // Create sector
- assert(m_env.getMap().mapType() == MAPTYPE_CLIENT);
- ((ClientMap&)m_env.getMap()).deSerializeSector(pos, is);
- }
- } //envlock
-#endif
- }
else if(command == TOCLIENT_INVENTORY)
{
if(datasize < 3)
//t4.stop();
//TimeTaker t1("inventory.deSerialize()", m_device);
- player->inventory.deSerialize(is, this);
+ player->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:"<<std::endl;
//player->inventory.print(infostream);
}
}
- //DEBUG
- else if(command == TOCLIENT_OBJECTDATA)
- {
- // Strip command word and create a stringstream
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- u8 buf[12];
-
- /*
- Read players
- */
-
- is.read((char*)buf, 2);
- u16 playercount = readU16(buf);
-
- for(u16 i=0; i<playercount; i++)
- {
- is.read((char*)buf, 2);
- u16 peer_id = readU16(buf);
- is.read((char*)buf, 12);
- v3s32 p_i = readV3S32(buf);
- is.read((char*)buf, 12);
- v3s32 s_i = readV3S32(buf);
- is.read((char*)buf, 4);
- s32 pitch_i = readS32(buf);
- is.read((char*)buf, 4);
- s32 yaw_i = readS32(buf);
-
- Player *player = m_env.getPlayer(peer_id);
-
- // Skip if player doesn't exist
- if(player == NULL)
- {
- continue;
- }
-
- // Skip if player is local player
- if(player->isLocal())
- {
- continue;
- }
-
- f32 pitch = (f32)pitch_i / 100.0;
- f32 yaw = (f32)yaw_i / 100.0;
- v3f position((f32)p_i.X/100., (f32)p_i.Y/100., (f32)p_i.Z/100.);
- v3f speed((f32)s_i.X/100., (f32)s_i.Y/100., (f32)s_i.Z/100.);
-
- player->setPosition(position);
- player->setSpeed(speed);
- player->setPitch(pitch);
- player->setYaw(yaw);
- }
-
- /*
- Read block objects
- NOTE: Deprecated stuff
- */
-
- // Read active block count
- u16 blockcount = readU16(is);
- if(blockcount != 0){
- infostream<<"TOCLIENT_OBJECTDATA: blockcount != 0 "
- "not supported"<<std::endl;
- return;
- }
- }
else if(command == TOCLIENT_TIME_OF_DAY)
{
if(datasize < 4)
u16 time_of_day = readU16(&data[2]);
time_of_day = time_of_day % 24000;
//infostream<<"Client: time_of_day="<<time_of_day<<std::endl;
-
- /*
- time_of_day:
- 0 = midnight
- 12000 = midday
- */
- {
- m_env.setTimeOfDay(time_of_day);
-
- u32 dr = m_env.getDayNightRatio();
-
- infostream<<"Client: time_of_day="<<time_of_day
- <<", dr="<<dr
- <<std::endl;
+ float time_speed = 0;
+ if(datasize >= 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): "
+ <<time_speed<<" tod_diff_f="<<tod_diff_f
+ <<" time_diff="<<time_diff<<std::endl;
+ }
}
+
+ // Update environment
+ m_env.setTimeOfDay(time_of_day);
+ m_env.setTimeOfDaySpeed(time_speed);
+ m_time_of_day_set = true;
+ u32 dr = m_env.getDayNightRatio();
+ verbosestream<<"Client: time_of_day="<<time_of_day
+ <<" time_speed="<<time_speed
+ <<" dr="<<dr<<std::endl;
}
else if(command == TOCLIENT_CHAT_MESSAGE)
{
std::istringstream is(datastring, std::ios_base::binary);
Player *player = m_env.getLocalPlayer();
assert(player != NULL);
+ u8 oldhp = player->hp;
u8 hp = readU8(is);
player->hp = hp;
+
+ 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)
{
}
else if(command == TOCLIENT_PLAYERITEM)
{
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- u16 count = readU16(is);
-
- for (u16 i = 0; i < count; ++i) {
- u16 peer_id = readU16(is);
- Player *player = m_env.getPlayer(peer_id);
-
- if (player == NULL)
- {
- infostream<<"Client: ignoring player item "
- << deSerializeString(is)
- << " for non-existing peer id " << peer_id
- << std::endl;
- continue;
- } else if (player->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));
- if (itemstring.empty()) {
- inv->deleteItem(0);
- infostream
- <<"Client: empty player item for peer "
- << peer_id << std::endl;
- } else {
- std::istringstream iss(itemstring);
- delete inv->changeItem(0,
- InventoryItem::deSerialize(iss, this));
- infostream<<"Client: player item for peer " << peer_id << ": ";
- player->getWieldItem()->serialize(infostream);
- infostream<<std::endl;
- }
- }
- }
+ infostream<<"Client: WARNING: Ignoring TOCLIENT_PLAYERITEM"<<std::endl;
}
else if(command == TOCLIENT_DEATHSCREEN)
{
event.deathscreen.camera_point_target_z = camera_point_target.Z;
m_client_event_queue.push_back(event);
}
- else if(command == TOCLIENT_TEXTURES)
+ else if(command == TOCLIENT_ANNOUNCE_MEDIA)
{
- io::IFileSystem *irrfs = m_device->getFileSystem();
- video::IVideoDriver *vdrv = m_device->getVideoDriver();
-
std::string datastring((char*)&data[2], datasize-2);
std::istringstream is(datastring, std::ios_base::binary);
- // Stop threads while updating content definitions
- m_mesh_update_thread.stop();
+ // Mesh update thread must be stopped while
+ // updating content definitions
+ assert(!m_mesh_update_thread.IsRunning());
+
+ int num_files = readU16(is);
+ verbosestream<<"Client received TOCLIENT_ANNOUNCE_MEDIA ("
+ <<num_files<<" files)"<<std::endl;
+
+ core::list<MediaRequest> file_requests;
+
+ for(int i=0; i<num_files; i++)
+ {
+ //read file from cache
+ std::string name = deSerializeString(is);
+ std::string sha1_base64 = deSerializeString(is);
+
+ // if name contains illegal characters, ignore the file
+ if(!string_allowed(name, TEXTURENAME_ALLOWED_CHARS)){
+ errorstream<<"Client: ignoring illegal file name "
+ <<"sent by server: \""<<name<<"\""<<std::endl;
+ continue;
+ }
+
+ std::string sha1_raw = base64_decode(sha1_base64);
+ std::string sha1_hex = hex_encode(sha1_raw);
+ std::ostringstream tmp_os(std::ios_base::binary);
+ bool found_in_cache = m_media_cache.load_sha1(sha1_raw, tmp_os);
+ m_media_name_sha1_map.set(name, sha1_raw);
+
+ // If found in cache, try to load it from there
+ if(found_in_cache)
+ {
+ bool success = loadMedia(tmp_os.str(), name);
+ if(success){
+ verbosestream<<"Client: Loaded cached media: "
+ <<sha1_hex<<" \""<<name<<"\""<<std::endl;
+ continue;
+ } else{
+ infostream<<"Client: Failed to load cached media: "
+ <<sha1_hex<<" \""<<name<<"\""<<std::endl;
+ }
+ }
+ // Didn't load from cache; queue it to be requested
+ verbosestream<<"Client: Adding file to request list: \""
+ <<sha1_hex<<" \""<<name<<"\""<<std::endl;
+ file_requests.push_back(MediaRequest(name));
+ }
+
+ ClientEvent event;
+ event.type = CE_TEXTURES_UPDATED;
+ m_client_event_queue.push_back(event);
+
/*
u16 command
- u16 total number of texture bunches
+ u16 number of files requested
+ for each file {
+ u16 length of name
+ string name
+ }
+ */
+ std::ostringstream os(std::ios_base::binary);
+ writeU16(os, TOSERVER_REQUEST_MEDIA);
+ writeU16(os, file_requests.size());
+
+ for(core::list<MediaRequest>::Iterator i = file_requests.begin();
+ i != file_requests.end(); i++) {
+ os<<serializeString(i->name);
+ }
+
+ // Make data buffer
+ std::string s = os.str();
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+ // Send as reliable
+ Send(0, data, true);
+ infostream<<"Client: Sending media request list to server ("
+ <<file_requests.size()<<" files)"<<std::endl;
+ }
+ 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
u16 index of this bunch
- u32 number of textures in this bunch
- for each texture {
+ u32 number of files in this bunch
+ for each file {
u16 length of name
string name
u32 length of data
*/
int num_bunches = readU16(is);
int bunch_i = readU16(is);
- m_texture_receive_progress = (float)bunch_i / (float)(num_bunches - 1);
+ 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_textures_received = true;
- int num_textures = readU32(is);
- infostream<<"Client: Received textures: bunch "<<bunch_i<<"/"
- <<num_bunches<<" textures="<<num_textures
+ m_media_received = true;
+ int num_files = readU32(is);
+ infostream<<"Client: Received files: bunch "<<bunch_i<<"/"
+ <<num_bunches<<" files="<<num_files
<<" size="<<datasize<<std::endl;
- for(int i=0; i<num_textures; i++){
+ for(int i=0; i<num_files; i++){
std::string name = deSerializeString(is);
std::string data = deSerializeLongString(is);
- // Silly irrlicht's const-incorrectness
- Buffer<char> data_rw(data.c_str(), data.size());
- // Create an irrlicht memory file
- io::IReadFile *rfile = irrfs->createMemoryReadFile(
- *data_rw, data.size(), "_tempreadfile");
- assert(rfile);
- // Read image
- video::IImage *img = vdrv->createImageFromFile(rfile);
- if(!img){
- errorstream<<"Client: Cannot create image from data of "
- <<"received texture \""<<name<<"\""<<std::endl;
- rfile->drop();
+
+ // if name contains illegal characters, ignore the file
+ if(!string_allowed(name, TEXTURENAME_ALLOWED_CHARS)){
+ errorstream<<"Client: ignoring illegal file name "
+ <<"sent by server: \""<<name<<"\""<<std::endl;
continue;
}
- m_tsrc->insertSourceImage(name, img);
- img->drop();
- rfile->drop();
- }
-
- if(m_nodedef_received && m_textures_received){
- // Rebuild inherited images and recreate textures
- m_tsrc->rebuildImagesAndTextures();
-
- // Update texture atlas
- if(g_settings->getBool("enable_texture_atlas"))
- m_tsrc->buildMainAtlas(this);
- // Update node textures
- m_nodedef->updateTextures(m_tsrc);
- }
+ bool success = loadMedia(data, name);
+ if(success){
+ verbosestream<<"Client: Loaded received media: "
+ <<"\""<<name<<"\". Caching."<<std::endl;
+ } else{
+ infostream<<"Client: Failed to load received media: "
+ <<"\""<<name<<"\". Not caching."<<std::endl;
+ continue;
+ }
+
+ bool did = fs::CreateAllDirs(getMediaCacheDir());
+ if(!did){
+ errorstream<<"Could not create media cache directory"
+ <<std::endl;
+ }
- // Resume threads
- m_mesh_update_thread.setRun(true);
- m_mesh_update_thread.Start();
+ {
+ core::map<std::string, std::string>::Node *n;
+ n = m_media_name_sha1_map.find(name);
+ if(n == NULL)
+ errorstream<<"The server sent a file that has not "
+ <<"been announced."<<std::endl;
+ else
+ m_media_cache.update_sha1(data);
+ }
+ }
ClientEvent event;
event.type = CE_TEXTURES_UPDATED;
}
else if(command == TOCLIENT_TOOLDEF)
{
- infostream<<"Client: Received tool definitions: packet size: "
+ infostream<<"Client: WARNING: Ignoring TOCLIENT_TOOLDEF"<<std::endl;
+ }
+ else if(command == TOCLIENT_NODEDEF)
+ {
+ infostream<<"Client: Received node definitions: packet size: "
<<datasize<<std::endl;
+ // Mesh update thread must be stopped while
+ // updating content definitions
+ assert(!m_mesh_update_thread.IsRunning());
+
+ // Decompress node definitions
std::string datastring((char*)&data[2], datasize-2);
std::istringstream is(datastring, std::ios_base::binary);
-
- m_tooldef_received = true;
-
- // Stop threads while updating content definitions
- m_mesh_update_thread.stop();
-
std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
- m_tooldef->deSerialize(tmp_is);
-
- // Resume threads
- m_mesh_update_thread.setRun(true);
- m_mesh_update_thread.Start();
+ std::ostringstream tmp_os;
+ decompressZlib(tmp_is, tmp_os);
+
+ // Deserialize node definitions
+ std::istringstream tmp_is2(tmp_os.str());
+ m_nodedef->deSerialize(tmp_is2);
+ m_nodedef_received = true;
}
- else if(command == TOCLIENT_NODEDEF)
+ else if(command == TOCLIENT_CRAFTITEMDEF)
{
- infostream<<"Client: Received node definitions: packet size: "
+ infostream<<"Client: WARNING: Ignoring TOCLIENT_CRAFTITEMDEF"<<std::endl;
+ }
+ else if(command == TOCLIENT_ITEMDEF)
+ {
+ infostream<<"Client: Received item definitions: packet size: "
<<datasize<<std::endl;
+ // Mesh update thread must be stopped while
+ // updating content definitions
+ assert(!m_mesh_update_thread.IsRunning());
+
+ // Decompress item definitions
std::string datastring((char*)&data[2], datasize-2);
std::istringstream is(datastring, std::ios_base::binary);
+ std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+ std::ostringstream tmp_os;
+ decompressZlib(tmp_is, tmp_os);
- m_nodedef_received = true;
+ // Deserialize node definitions
+ std::istringstream tmp_is2(tmp_os.str());
+ m_itemdef->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);
- // Stop threads while updating content definitions
- m_mesh_update_thread.stop();
+ 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:
+ 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;
+ }
+ }
+ else if(command == TOCLIENT_STOP_SOUND)
+ {
+ std::string datastring((char*)&data[2], datasize-2);
+ std::istringstream is(datastring, std::ios_base::binary);
- std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
- m_nodedef->deSerialize(tmp_is, this);
+ s32 server_id = readS32(is);
+ std::map<s32, int>::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);
- if(m_textures_received){
- // Update texture atlas
- if(g_settings->getBool("enable_texture_atlas"))
- m_tsrc->buildMainAtlas(this);
-
- // Update node textures
- m_nodedef->updateTextures(m_tsrc);
+ m_privileges.clear();
+ infostream<<"Client: Privileges updated: ";
+ u16 num_privileges = readU16(is);
+ for(u16 i=0; i<num_privileges; i++){
+ std::string priv = deSerializeString(is);
+ m_privileges.insert(priv);
+ infostream<<priv<<" ";
}
-
- // Resume threads
- m_mesh_update_thread.setRun(true);
- m_mesh_update_thread.Start();
+ infostream<<std::endl;
}
else
{
m_con.Send(PEER_ID_SERVER, channelnum, data, reliable);
}
-void Client::groundAction(u8 action, v3s16 nodepos_undersurface,
- v3s16 nodepos_oversurface, u16 item)
+void Client::interact(u8 action, const PointedThing& pointed)
{
if(connectedAndInitialized() == false){
- infostream<<"Client::groundAction() "
+ infostream<<"Client::interact() "
"cancelled (not connected)"
<<std::endl;
return;
}
-
+
+ std::ostringstream os(std::ios_base::binary);
+
/*
- length: 17
[0] u16 command
[2] u8 action
- [3] v3s16 nodepos_undersurface
- [9] v3s16 nodepos_abovesurface
- [15] u16 item
+ [3] u16 item
+ [5] u32 length of the next item
+ [9] serialized PointedThing
actions:
- 0: start digging
- 1: place block
- 2: stop digging (all parameters ignored)
- 3: digging completed
+ 0: start digging (from undersurface) or use
+ 1: stop digging (all parameters ignored)
+ 2: digging completed
+ 3: place block or item (to abovesurface)
+ 4: use item
*/
- u8 datasize = 2 + 1 + 6 + 6 + 2;
- SharedBuffer<u8> data(datasize);
- writeU16(&data[0], TOSERVER_GROUND_ACTION);
- writeU8(&data[2], action);
- writeV3S16(&data[3], nodepos_undersurface);
- writeV3S16(&data[9], nodepos_oversurface);
- writeU16(&data[15], item);
- Send(0, data, true);
-}
-
-void Client::clickActiveObject(u8 button, u16 id, u16 item_i)
-{
- if(connectedAndInitialized() == false){
- infostream<<"Client::clickActiveObject() "
- "cancelled (not connected)"
- <<std::endl;
- return;
- }
-
- Player *player = m_env.getLocalPlayer();
- if(player == NULL)
- return;
+ writeU16(os, TOSERVER_INTERACT);
+ writeU8(os, action);
+ writeU16(os, getPlayerItem());
+ std::ostringstream tmp_os(std::ios::binary);
+ pointed.serialize(tmp_os);
+ os<<serializeLongString(tmp_os.str());
- ClientActiveObject *obj = m_env.getActiveObject(id);
- if(obj){
- if(button == 0){
- ToolItem *titem = NULL;
- std::string toolname = "";
-
- InventoryList *mlist = player->inventory.getList("main");
- if(mlist != NULL)
- {
- InventoryItem *item = mlist->getItem(item_i);
- if(item && (std::string)item->getName() == "ToolItem")
- {
- titem = (ToolItem*)item;
- toolname = titem->getToolName();
- }
- }
+ std::string s = os.str();
+ SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- v3f playerpos = player->getPosition();
- v3f objpos = obj->getPosition();
- v3f dir = (objpos - playerpos).normalize();
-
- bool disable_send = obj->directReportPunch(toolname, dir);
-
- if(disable_send)
- return;
- }
- }
-
- /*
- length: 7
- [0] u16 command
- [2] u8 button (0=left, 1=right)
- [3] u16 id
- [5] u16 item
- */
- u8 datasize = 2 + 1 + 6 + 2 + 2;
- SharedBuffer<u8> data(datasize);
- writeU16(&data[0], TOSERVER_CLICK_ACTIVEOBJECT);
- writeU8(&data[2], button);
- writeU16(&data[3], id);
- writeU16(&data[5], item_i);
+ // Send as reliable
Send(0, data, true);
}
-void Client::sendSignNodeText(v3s16 p, std::string text)
+void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
+ const std::map<std::string, std::string> &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<<serializeString(formname);
+ writeU16(os, fields.size());
+ for(std::map<std::string, std::string>::const_iterator
+ i = fields.begin(); i != fields.end(); i++){
+ const std::string &name = i->first;
+ const std::string &value = i->second;
+ os<<serializeString(name);
+ os<<serializeLongString(value);
+ }
- // Write text
- os.write((char*)text.c_str(), textlen);
-
// Make data buffer
std::string s = os.str();
SharedBuffer<u8> data((u8*)s.c_str(), s.size());
void Client::removeNode(v3s16 p)
{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
core::map<v3s16, MapBlock*> modified_blocks;
try
{
}
+ // add urgent task to update the modified node
+ addUpdateMeshTaskForNode(p, false, true);
+
for(core::map<v3s16, MapBlock * >::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
- //m_env.getClientMap().updateMeshes(p, m_env.getDayNightRatio());
addUpdateMeshTaskWithEdge(p);
}
}
void Client::addNode(v3s16 p, MapNode n)
{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
TimeTaker timer1("Client::addNode()");
core::map<v3s16, MapBlock*> modified_blocks;
try
{
//TimeTaker timer3("Client::addNode(): addNodeAndUpdate");
- std::string st = std::string("");
- m_env.getMap().addNodeAndUpdate(p, n, modified_blocks, st);
+ m_env.getMap().addNodeAndUpdate(p, n, modified_blocks);
}
catch(InvalidPositionException &e)
{}
- //TimeTaker timer2("Client::addNode(): updateMeshes");
-
for(core::map<v3s16, MapBlock * >::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
- //m_env.getClientMap().updateMeshes(p, m_env.getDayNightRatio());
addUpdateMeshTaskWithEdge(p);
}
}
-void Client::updateCamera(v3f pos, v3f dir, f32 fov)
-{
- m_env.getClientMap().updateCamera(pos, dir, fov);
-}
-
-void Client::renderPostFx()
-{
- m_env.getClientMap().renderPostFx();
-}
-
-MapNode Client::getNode(v3s16 p)
-{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
- return m_env.getMap().getNode(p);
-}
-
-NodeMetadata* Client::getNodeMetadata(v3s16 p)
-{
- return m_env.getMap().getNodeMetadata(p);
-}
-
-LocalPlayer* Client::getLocalPlayer()
-{
- return m_env.getLocalPlayer();
-}
-
void Client::setPlayerControl(PlayerControl &control)
{
//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
void Client::selectPlayerItem(u16 item)
{
- LocalPlayer *player = m_env.getLocalPlayer();
- assert(player != NULL);
-
- player->wieldItem(item);
-
+ //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
+ m_playeritem = item;
+ m_inventory_updated = true;
sendPlayerItem(item);
}
dst = player->inventory;
}
-InventoryContext *Client::getInventoryContext()
+Inventory* Client::getInventory(const InventoryLocation &loc)
{
- return &m_inventory_context;
-}
-
-Inventory* Client::getInventory(InventoryContext *c, std::string id)
-{
- if(id == "current_player")
+ switch(loc.type){
+ case InventoryLocation::UNDEFINED:
+ {}
+ break;
+ case InventoryLocation::CURRENT_PLAYER:
{
- assert(c->current_player);
- return &(c->current_player->inventory);
+ Player *player = m_env.getLocalPlayer();
+ assert(player != NULL);
+ return &player->inventory;
}
-
- Strfnd fn(id);
- std::string id0 = fn.next(":");
-
- if(id0 == "nodemeta")
+ break;
+ case InventoryLocation::PLAYER:
{
- v3s16 p;
- p.X = stoi(fn.next(","));
- p.Y = stoi(fn.next(","));
- p.Z = stoi(fn.next(","));
- NodeMetadata* meta = getNodeMetadata(p);
- if(meta)
- return meta->getInventory();
- infostream<<"nodemeta at ("<<p.X<<","<<p.Y<<","<<p.Z<<"): "
- <<"no metadata found"<<std::endl;
- return NULL;
- }
-
- infostream<<__FUNCTION_NAME<<": unknown id "<<id<<std::endl;
+ Player *player = m_env.getPlayer(loc.name.c_str());
+ if(!player)
+ return NULL;
+ return &player->inventory;
+ }
+ break;
+ case InventoryLocation::NODEMETA:
+ {
+ NodeMetadata *meta = m_env.getMap().getNodeMetadata(loc.p);
+ if(!meta)
+ return NULL;
+ return meta->getInventory();
+ }
+ break;
+ default:
+ assert(0);
+ }
return NULL;
}
void Client::inventoryAction(InventoryAction *a)
{
+ /*
+ Send it to the server
+ */
sendInventoryAction(a);
+
+ /*
+ Predict some local inventory changes
+ */
+ a->clientApply(this, this);
}
ClientActiveObject * Client::getSelectedActiveObject(
//<<", m_opt_not_found_history.size()="<<m_opt_not_found_history.size()
<<std::endl;*/
}
-
-u32 Client::getDayNightRatio()
+
+core::list<std::wstring> Client::getConnectedPlayerNames()
{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
- return m_env.getDayNightRatio();
+ core::list<Player*> players = m_env.getPlayers(true);
+ core::list<std::wstring> playerNames;
+ for(core::list<Player*>::Iterator
+ i = players.begin();
+ i != players.end(); i++)
+ {
+ Player *player = *i;
+ playerNames.push_back(narrow_to_wide(player->getName()));
+ }
+ return playerNames;
}
-u16 Client::getHP()
+float Client::getAnimationTime()
{
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
- return player->hp;
+ return m_animation_time;
}
-void Client::setTempMod(v3s16 p, NodeMod mod)
+int Client::getCrackLevel()
{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
- assert(m_env.getMap().mapType() == MAPTYPE_CLIENT);
+ return m_crack_level;
+}
+
+void Client::setCrack(int level, v3s16 pos)
+{
+ int old_crack_level = m_crack_level;
+ v3s16 old_crack_pos = m_crack_pos;
- core::map<v3s16, MapBlock*> affected_blocks;
- ((ClientMap&)m_env.getMap()).setTempMod(p, mod,
- &affected_blocks);
+ m_crack_level = level;
+ m_crack_pos = pos;
- for(core::map<v3s16, MapBlock*>::Iterator
- i = affected_blocks.getIterator();
- i.atEnd() == false; i++)
+ if(old_crack_level >= 0 && (level < 0 || pos != old_crack_pos))
{
- i.getNode()->getValue()->updateMesh(m_env.getDayNightRatio());
+ // remove old crack
+ addUpdateMeshTaskForNode(old_crack_pos, false, true);
+ }
+ if(level >= 0 && (old_crack_level < 0 || pos != old_crack_pos))
+ {
+ // add new crack
+ addUpdateMeshTaskForNode(pos, false, true);
}
}
-void Client::clearTempMod(v3s16 p)
+u16 Client::getHP()
{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
- assert(m_env.getMap().mapType() == MAPTYPE_CLIENT);
+ Player *player = m_env.getLocalPlayer();
+ assert(player != NULL);
+ return player->hp;
+}
- core::map<v3s16, MapBlock*> affected_blocks;
- ((ClientMap&)m_env.getMap()).clearTempMod(p,
- &affected_blocks);
+bool Client::getChatMessage(std::wstring &message)
+{
+ if(m_chat_queue.size() == 0)
+ return false;
+ message = m_chat_queue.pop_front();
+ return true;
+}
- for(core::map<v3s16, MapBlock*>::Iterator
- i = affected_blocks.getIterator();
- i.atEnd() == false; i++)
+void Client::typeChatMessage(const std::wstring &message)
+{
+ // Discard empty line
+ if(message == L"")
+ return;
+
+ // Send to others
+ sendChatMessage(message);
+
+ // Show locally
+ if (message[0] == L'/')
+ {
+ m_chat_queue.push_back(
+ (std::wstring)L"issued command: "+message);
+ }
+ else
{
- i.getNode()->getValue()->updateMesh(m_env.getDayNightRatio());
+ LocalPlayer *player = m_env.getLocalPlayer();
+ assert(player != NULL);
+ std::wstring name = narrow_to_wide(player->getName());
+ m_chat_queue.push_back(
+ (std::wstring)L"<"+name+L"> "+message);
}
}
-void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server)
+void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
{
/*infostream<<"Client::addUpdateMeshTask(): "
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+ <<" ack_to_server="<<ack_to_server
+ <<" urgent="<<urgent
<<std::endl;*/
MapBlock *b = m_env.getMap().getBlockNoCreateNoEx(p);
Create a task to update the mesh of the block
*/
- MeshMakeData *data = new MeshMakeData;
+ MeshMakeData *data = new MeshMakeData(this);
{
//TimeTaker timer("data fill");
// Release: ~0ms
// Debug: 1-6ms, avg=2ms
- data->fill(getDayNightRatio(), b);
+ data->fill(b);
+ data->setCrack(m_crack_level, m_crack_pos);
+ 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);
+ m_mesh_update_thread.m_queue_in.addBlock(p, data, ack_to_server, urgent);
/*infostream<<"Mesh update input queue size is "
<<m_mesh_update_thread.m_queue_in.size()
<<std::endl;*/
-
-#if 0
- // Temporary test: make mesh directly in here
- {
- //TimeTaker timer("make mesh");
- // 10ms
- scene::SMesh *mesh_new = NULL;
- mesh_new = makeMapBlockMesh(data);
- b->replaceMesh(mesh_new);
- delete data;
- }
-#endif
-
- /*
- Mark mesh as non-expired at this point so that it can already
- be marked as expired again if the data changes
- */
- b->setMeshExpired(false);
}
-void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server)
+void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server, bool urgent)
{
/*{
v3s16 p = blockpos;
try{
v3s16 p = blockpos + v3s16(0,0,0);
//MapBlock *b = m_env.getMap().getBlockNoCreate(p);
- addUpdateMeshTask(p, ack_to_server);
+ addUpdateMeshTask(p, ack_to_server, urgent);
}
catch(InvalidPositionException &e){}
// Leading edge
try{
v3s16 p = blockpos + v3s16(-1,0,0);
- addUpdateMeshTask(p);
+ addUpdateMeshTask(p, false, urgent);
}
catch(InvalidPositionException &e){}
try{
v3s16 p = blockpos + v3s16(0,-1,0);
- addUpdateMeshTask(p);
+ addUpdateMeshTask(p, false, urgent);
}
catch(InvalidPositionException &e){}
try{
v3s16 p = blockpos + v3s16(0,0,-1);
- addUpdateMeshTask(p);
+ addUpdateMeshTask(p, false, urgent);
}
catch(InvalidPositionException &e){}
}
+void Client::addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server, bool urgent)
+{
+ {
+ v3s16 p = nodepos;
+ infostream<<"Client::addUpdateMeshTaskForNode(): "
+ <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+ <<std::endl;
+ }
+
+ v3s16 blockpos = getNodeBlockPos(nodepos);
+ v3s16 blockpos_relative = blockpos * MAP_BLOCKSIZE;
+
+ try{
+ v3s16 p = blockpos + v3s16(0,0,0);
+ addUpdateMeshTask(p, ack_to_server, urgent);
+ }
+ catch(InvalidPositionException &e){}
+ // Leading edge
+ if(nodepos.X == blockpos_relative.X){
+ try{
+ v3s16 p = blockpos + v3s16(-1,0,0);
+ addUpdateMeshTask(p, false, urgent);
+ }
+ catch(InvalidPositionException &e){}
+ }
+ if(nodepos.Y == blockpos_relative.Y){
+ try{
+ v3s16 p = blockpos + v3s16(0,-1,0);
+ addUpdateMeshTask(p, false, urgent);
+ }
+ catch(InvalidPositionException &e){}
+ }
+ if(nodepos.Z == blockpos_relative.Z){
+ try{
+ v3s16 p = blockpos + v3s16(0,0,-1);
+ addUpdateMeshTask(p, false, urgent);
+ }
+ catch(InvalidPositionException &e){}
+ }
+}
+
ClientEvent Client::getClientEvent()
{
if(m_client_event_queue.size() == 0)
return m_client_event_queue.pop_front();
}
+void Client::afterContentReceived()
+{
+ verbosestream<<"Client::afterContentReceived() started"<<std::endl;
+ assert(m_itemdef_received);
+ assert(m_nodedef_received);
+ assert(m_media_received);
+
+ // remove the information about which checksum each texture
+ // ought to have
+ m_media_name_sha1_map.clear();
+
+ // Rebuild inherited images and recreate textures
+ verbosestream<<"Rebuilding images and textures"<<std::endl;
+ m_tsrc->rebuildImagesAndTextures();
+
+ // Update texture atlas
+ verbosestream<<"Updating texture atlas"<<std::endl;
+ if(g_settings->getBool("enable_texture_atlas"))
+ m_tsrc->buildMainAtlas(this);
+
+ // Update node aliases
+ verbosestream<<"Updating node aliases"<<std::endl;
+ m_nodedef->updateAliases(m_itemdef);
+
+ // Update node textures
+ verbosestream<<"Updating node textures"<<std::endl;
+ m_nodedef->updateTextures(m_tsrc);
+
+ // Update item textures and meshes
+ verbosestream<<"Updating item textures and meshes"<<std::endl;
+ m_itemdef->updateTexturesAndMeshes(this);
+
+ // Start mesh update thread after setting up content definitions
+ verbosestream<<"Starting mesh update thread"<<std::endl;
+ m_mesh_update_thread.Start();
+
+ verbosestream<<"Client::afterContentReceived() done"<<std::endl;
+}
+
float Client::getRTT(void)
{
try{
// IGameDef interface
// Under envlock
-IToolDefManager* Client::getToolDefManager()
+IItemDefManager* Client::getItemDefManager()
{
- return m_tooldef;
+ return m_itemdef;
}
INodeDefManager* Client::getNodeDefManager()
{
return m_nodedef;
}
+ICraftDefManager* Client::getCraftDefManager()
+{
+ return NULL;
+ //return m_craftdef;
+}
ITextureSource* Client::getTextureSource()
{
return m_tsrc;
assert(0);
return CONTENT_IGNORE;
}
+ISoundManager* Client::getSoundManager()
+{
+ return m_sound;
+}
+MtEventManager* Client::getEventManager()
+{
+ return m_event;
+}
projects / minetest.git / blobdiff