X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient.h;h=222f83ab739615c24e7e0d0ca05651db4cbd04a9;hb=3b707b8a4a52a88da4398ec9b32109c073683a76;hp=3c8bbfaf6206e5872d6a6dc8f10c9cc0bd77494c;hpb=a55850e4dcc3440fdadb9fc94df3f2ef02f5a34d;p=dragonfireclient.git diff --git a/src/client.h b/src/client.h index 3c8bbfaf6..222f83ab7 100644 --- a/src/client.h +++ b/src/client.h @@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common_irrlicht.h" #include "jmutex.h" #include +#include "clientobject.h" class ClientNotReadyException : public BaseException { @@ -36,115 +37,178 @@ class ClientNotReadyException : public BaseException {} }; -class Client; - -class ClientUpdateThread : public SimpleThread +struct QueuedMeshUpdate { - Client *m_client; - -public: - - ClientUpdateThread(Client *client): - SimpleThread(), - m_client(client) + v3s16 p; + MeshMakeData *data; + bool ack_block_to_server; + + QueuedMeshUpdate(): + p(-1337,-1337,-1337), + data(NULL), + ack_block_to_server(false) { } - - void * Thread(); + + ~QueuedMeshUpdate() + { + if(data) + delete data; + } }; -struct IncomingPacket +/* + A thread-safe queue of mesh update tasks +*/ +class MeshUpdateQueue { - IncomingPacket() - { - m_data = NULL; - m_datalen = 0; - m_refcount = NULL; - } - IncomingPacket(const IncomingPacket &a) +public: + MeshUpdateQueue() { - m_data = a.m_data; - m_datalen = a.m_datalen; - m_refcount = a.m_refcount; - if(m_refcount != NULL) - (*m_refcount)++; + m_mutex.Init(); } - IncomingPacket(u8 *data, u32 datalen) + + ~MeshUpdateQueue() { - m_data = new u8[datalen]; - memcpy(m_data, data, datalen); - m_datalen = datalen; - m_refcount = new s32(1); + JMutexAutoLock lock(m_mutex); + + core::list::Iterator i; + for(i=m_queue.begin(); i!=m_queue.end(); i++) + { + QueuedMeshUpdate *q = *i; + delete q; + } } - ~IncomingPacket() + + /* + peer_id=0 adds with nobody to send to + */ + void addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server) { - if(m_refcount != NULL){ - assert(*m_refcount > 0); - (*m_refcount)--; - if(*m_refcount == 0){ - if(m_data != NULL) - delete[] m_data; - delete m_refcount; + DSTACK(__FUNCTION_NAME); + + assert(data); + + JMutexAutoLock lock(m_mutex); + + /* + Find if block is already in queue. + If it is, update the data and quit. + */ + core::list::Iterator i; + for(i=m_queue.begin(); i!=m_queue.end(); i++) + { + QueuedMeshUpdate *q = *i; + if(q->p == p) + { + if(q->data) + delete q->data; + q->data = data; + if(ack_block_to_server) + q->ack_block_to_server = true; + return; } } + + /* + Add the block + */ + QueuedMeshUpdate *q = new QueuedMeshUpdate; + q->p = p; + q->data = data; + q->ack_block_to_server = ack_block_to_server; + m_queue.push_back(q); } - /*IncomingPacket & operator=(IncomingPacket a) + + // Returned pointer must be deleted + // Returns NULL if queue is empty + QueuedMeshUpdate * pop() { - m_data = a.m_data; - m_datalen = a.m_datalen; - m_refcount = a.m_refcount; - (*m_refcount)++; - return *this; - }*/ - u8 *m_data; - u32 m_datalen; - s32 *m_refcount; + JMutexAutoLock lock(m_mutex); + + core::list::Iterator i = m_queue.begin(); + if(i == m_queue.end()) + return NULL; + QueuedMeshUpdate *q = *i; + m_queue.erase(i); + return q; + } + + u32 size() + { + JMutexAutoLock lock(m_mutex); + return m_queue.size(); + } + +private: + core::list m_queue; + JMutex m_mutex; }; -// TODO: Remove this. It is not used as supposed. -class LazyMeshUpdater +struct MeshUpdateResult { -public: - LazyMeshUpdater(Environment *env) + v3s16 p; + scene::SMesh *mesh; + bool ack_block_to_server; + + MeshUpdateResult(): + p(-1338,-1338,-1338), + mesh(NULL), + ack_block_to_server(false) { - m_env = env; } - ~LazyMeshUpdater() - { - /* - TODO: This could be optimized. It will currently - double-update some blocks. - */ - for(core::map::Iterator - i = m_blocks.getIterator(); - i.atEnd() == false; i++) - { - v3s16 p = i.getNode()->getKey(); - m_env->updateMeshes(p); - } - m_blocks.clear(); - } - void add(v3s16 p) +}; + +class MeshUpdateThread : public SimpleThread +{ +public: + + MeshUpdateThread() { - m_blocks.insert(p, true); } -private: - Environment *m_env; - core::map m_blocks; + + void * Thread(); + + MeshUpdateQueue m_queue_in; + + MutexedQueue m_queue_out; +}; + +enum ClientEventType +{ + CE_NONE, + CE_PLAYER_DAMAGE, + CE_PLAYER_FORCE_MOVE }; -class Client : public con::PeerHandler +struct ClientEvent +{ + ClientEventType type; + union{ + struct{ + } none; + struct{ + u8 amount; + } player_damage; + struct{ + f32 pitch; + f32 yaw; + } player_force_move; + }; +}; + +class Client : public con::PeerHandler, public InventoryManager { public: /* - NOTE: Every public method should be thread-safe + NOTE: Nothing is thread-safe here. */ + Client( IrrlichtDevice *device, const char *playername, - JMutex &range_mutex, - s16 &viewing_range_nodes, - bool &viewing_range_all + std::string password, + MapDrawControl &control ); ~Client(); @@ -171,44 +235,40 @@ class Client : public con::PeerHandler // Called from updater thread // Returns dtime - float asyncStep(); + //float asyncStep(); void ProcessData(u8 *data, u32 datasize, u16 sender_peer_id); // Returns true if something was received - bool AsyncProcessPacket(LazyMeshUpdater &mesh_updater); + bool AsyncProcessPacket(); bool AsyncProcessData(); void Send(u16 channelnum, SharedBuffer data, bool reliable); - //TODO: Remove - bool isFetchingBlocks(); - // Pops out a packet from the packet queue - IncomingPacket getPacket(); + //IncomingPacket getPacket(); void groundAction(u8 action, v3s16 nodepos_undersurface, v3s16 nodepos_oversurface, u16 item); void clickObject(u8 button, v3s16 blockpos, s16 id, u16 item); + void clickActiveObject(u8 button, u16 id, u16 item); void sendSignText(v3s16 blockpos, s16 id, std::string text); + void sendSignNodeText(v3s16 p, std::string text); void sendInventoryAction(InventoryAction *a); + void sendChatMessage(const std::wstring &message); + void sendDamage(u8 damage); + + // locks envlock + void removeNode(v3s16 p); + // locks envlock + void addNode(v3s16 p, MapNode n); void updateCamera(v3f pos, v3f dir); // Returns InvalidPositionException if not found MapNode getNode(v3s16 p); - // Returns InvalidPositionException if not found - //void setNode(v3s16 p, MapNode n); + // Wrapper to Map + NodeMetadata* getNodeMetadata(v3s16 p); - // Returns InvalidPositionException if not found - //f32 getGroundHeight(v2s16 p); - // Returns InvalidPositionException if not found - //bool isNodeUnderground(v3s16 p); - - // Note: The players should not be exposed outside - // Return value is valid until client is destroyed - //Player * getLocalPlayer(); - // Return value is valid until step() - //core::list getPlayers(); v3f getPlayerPosition(); void setPlayerControl(PlayerControl &control); @@ -218,9 +278,12 @@ class Client : public con::PeerHandler bool getLocalInventoryUpdated(); // Copies the inventory of the local player to parameter void getLocalInventory(Inventory &dst); - // TODO: Functions for sending inventory editing commands to - // server + InventoryContext *getInventoryContext(); + + Inventory* getInventory(InventoryContext *c, std::string id); + void inventoryAction(InventoryAction *a); + // Gets closest object pointed by the shootline // Returns NULL if not found MapBlockObject * getSelectedObject( @@ -229,38 +292,97 @@ class Client : public con::PeerHandler core::line3d shootline_on_map ); + // Gets closest object pointed by the shootline + // Returns NULL if not found + ClientActiveObject * getSelectedActiveObject( + f32 max_d, + v3f from_pos_f_on_map, + core::line3d shootline_on_map + ); + // Prints a line or two of info void printDebugInfo(std::ostream &os); - //s32 getDayNightIndex(); u32 getDayNightRatio(); + u16 getHP(); + //void updateSomeExpiredMeshes(); void setTempMod(v3s16 p, NodeMod mod) { - JMutexAutoLock envlock(m_env_mutex); + //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out assert(m_env.getMap().mapType() == MAPTYPE_CLIENT); - v3s16 blockpos = ((ClientMap&)m_env.getMap()).setTempMod(p, mod); - m_env.getMap().updateMeshes(blockpos, m_env.getDayNightRatio()); + + core::map affected_blocks; + ((ClientMap&)m_env.getMap()).setTempMod(p, mod, + &affected_blocks); + + for(core::map::Iterator + i = affected_blocks.getIterator(); + i.atEnd() == false; i++) + { + i.getNode()->getValue()->updateMesh(m_env.getDayNightRatio()); + } } void clearTempMod(v3s16 p) { - JMutexAutoLock envlock(m_env_mutex); + //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out assert(m_env.getMap().mapType() == MAPTYPE_CLIENT); - v3s16 blockpos = ((ClientMap&)m_env.getMap()).clearTempMod(p); - m_env.getMap().updateMeshes(blockpos, m_env.getDayNightRatio()); + + core::map affected_blocks; + ((ClientMap&)m_env.getMap()).clearTempMod(p, + &affected_blocks); + + for(core::map::Iterator + i = affected_blocks.getIterator(); + i.atEnd() == false; i++) + { + i.getNode()->getValue()->updateMesh(m_env.getDayNightRatio()); + } } float getAvgRtt() { - JMutexAutoLock lock(m_con_mutex); + //JMutexAutoLock lock(m_con_mutex); //bulk comment-out con::Peer *peer = m_con.GetPeerNoEx(PEER_ID_SERVER); if(peer == NULL) return 0.0; return peer->avg_rtt; } + + bool getChatMessage(std::wstring &message) + { + if(m_chat_queue.size() == 0) + return false; + message = m_chat_queue.pop_front(); + return true; + } + + void addChatMessage(const std::wstring &message) + { + //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out + 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); + } + + u64 getMapSeed(){ return m_map_seed; } + + void addUpdateMeshTask(v3s16 blockpos, bool ack_to_server=false); + // Including blocks at appropriate edges + void addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server=false); + + // Get event from queue. CE_NONE is returned if queue is empty. + ClientEvent getClientEvent(); + inline bool accessDenied() + { + return m_access_denied; + } + private: // Virtual methods from con::PeerHandler @@ -273,29 +395,19 @@ class Client : public con::PeerHandler void sendPlayerPos(); // This sends the player's current name etc to the server void sendPlayerInfo(); - + float m_packetcounter_timer; float m_delete_unused_sectors_timer; float m_connection_reinit_timer; float m_avg_rtt_timer; float m_playerpos_send_timer; + float m_ignore_damage_timer; // Used after server moves player - ClientUpdateThread m_thread; + MeshUpdateThread m_mesh_update_thread; - // NOTE: If connection and environment are both to be locked, - // environment shall be locked first. - - Environment m_env; - JMutex m_env_mutex; + ClientEnvironment m_env; con::Connection m_con; - JMutex m_con_mutex; - - /*core::map m_fetchblock_history; - JMutex m_fetchblock_mutex;*/ - - core::list m_incoming_queue; - JMutex m_incoming_queue_mutex; IrrlichtDevice *m_device; @@ -305,9 +417,6 @@ class Client : public con::PeerHandler // Server serialization version u8 m_server_ser_ver; - float m_step_dtime; - JMutex m_step_dtime_mutex; - // This is behind m_env_mutex. bool m_inventory_updated; @@ -316,11 +425,23 @@ class Client : public con::PeerHandler PacketCounter m_packetcounter; // Received from the server. 0-23999 - MutexedVariable m_time_of_day; + u32 m_time_of_day; // 0 <= m_daynight_i < DAYNIGHT_CACHE_COUNT //s32 m_daynight_i; //u32 m_daynight_ratio; + + Queue m_chat_queue; + + // The seed returned by the server in TOCLIENT_INIT is stored here + u64 m_map_seed; + + std::string m_password; + bool m_access_denied; + + InventoryContext m_inventory_context; + + Queue m_client_event_queue; }; #endif // !SERVER