X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient.h;h=f0cc5586816372c007532ef6101854491784ddca;hb=56093b6614a47b181bbce6d4e35d213a4e04120c;hp=49794acf585b16d4050024172ebec96c3809bcdc;hpb=0e1f448b619de6651205692806c6f137f481dc43;p=dragonfireclient.git diff --git a/src/client.h b/src/client.h index 49794acf5..f0cc55868 100644 --- a/src/client.h +++ b/src/client.h @@ -1,18 +1,18 @@ /* -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 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. */ @@ -20,26 +20,35 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef CLIENT_HEADER #define CLIENT_HEADER -#ifndef SERVER - #include "connection.h" #include "environment.h" -#include "common_irrlicht.h" +#include "irrlichttypes_extrabloated.h" #include "jmutex.h" #include +#include +#include #include "clientobject.h" -#include "utility.h" // For IntervalLimiter #include "gamedef.h" #include "inventorymanager.h" #include "filesys.h" +#include "filecache.h" +#include "localplayer.h" +#include "server.h" +#include "particles.h" +#include "util/pointedthing.h" +#include struct MeshMakeData; +class MapBlockMesh; class IGameDef; class IWritableTextureSource; -class IWritableToolDefManager; +class IWritableShaderSource; +class IWritableItemDefManager; class IWritableNodeDefManager; //class IWritableCraftDefManager; -class IWritableCraftItemDefManager; +class ClientEnvironment; +struct MapDrawControl; +class MtEventManager; class ClientNotReadyException : public BaseException { @@ -72,7 +81,8 @@ class MeshUpdateQueue /* peer_id=0 adds with nobody to send to */ - void addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server); + void addBlock(v3s16 p, MeshMakeData *data, + bool ack_block_to_server, bool urgent); // Returned pointer must be deleted // Returns NULL if queue is empty @@ -85,14 +95,15 @@ class MeshUpdateQueue } private: - core::list m_queue; + std::vector m_queue; + std::set m_urgents; JMutex m_mutex; }; struct MeshUpdateResult { v3s16 p; - scene::SMesh *mesh; + MapBlockMesh *mesh; bool ack_block_to_server; MeshUpdateResult(): @@ -121,13 +132,38 @@ class MeshUpdateThread : public SimpleThread IGameDef *m_gamedef; }; +class MediaFetchThread : public SimpleThread +{ +public: + + MediaFetchThread(IGameDef *gamedef): + m_gamedef(gamedef) + { + } + + void * Thread(); + + std::list m_file_requests; + MutexedQueue > m_file_data; + std::list m_failed; + std::string m_remote_url; + IGameDef *m_gamedef; +}; + enum ClientEventType { CE_NONE, CE_PLAYER_DAMAGE, CE_PLAYER_FORCE_MOVE, CE_DEATHSCREEN, - CE_TEXTURES_UPDATED + CE_TEXTURES_UPDATED, + CE_SHOW_FORMSPEC, + CE_SPAWN_PARTICLE, + CE_ADD_PARTICLESPAWNER, + CE_DELETE_PARTICLESPAWNER, + CE_HUDADD, + CE_HUDRM, + CE_HUDCHANGE }; struct ClientEvent @@ -149,8 +185,64 @@ struct ClientEvent f32 camera_point_target_y; f32 camera_point_target_z; } deathscreen; + struct{ + std::string *formspec; + std::string *formname; + } show_formspec; struct{ } textures_updated; + struct{ + v3f *pos; + v3f *vel; + v3f *acc; + f32 expirationtime; + f32 size; + bool collisiondetection; + std::string *texture; + } spawn_particle; + struct{ + u16 amount; + f32 spawntime; + v3f *minpos; + v3f *maxpos; + v3f *minvel; + v3f *maxvel; + v3f *minacc; + v3f *maxacc; + f32 minexptime; + f32 maxexptime; + f32 minsize; + f32 maxsize; + bool collisiondetection; + std::string *texture; + u32 id; + } add_particlespawner; + struct{ + u32 id; + } delete_particlespawner; + struct{ + u32 id; + u8 type; + v2f *pos; + std::string *name; + v2f *scale; + std::string *text; + u32 number; + u32 item; + u32 dir; + v2f *align; + v2f *offset; + } hudadd; + struct{ + u32 id; + } hudrm; + struct{ + u32 id; + HudElementStat stat; + v2f *v2fdata; + std::string *sdata; + u32 data; + } hudchange; }; }; @@ -167,9 +259,11 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef std::string password, MapDrawControl &control, IWritableTextureSource *tsrc, - IWritableToolDefManager *tooldef, + IWritableShaderSource *shsrc, + IWritableItemDefManager *itemdef, IWritableNodeDefManager *nodedef, - IWritableCraftItemDefManager *craftitemdef + ISoundManager *sound, + MtEventManager *event ); ~Client(); @@ -194,45 +288,32 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef */ void step(float dtime); - // Called from updater thread - // Returns dtime - //float asyncStep(); - void ProcessData(u8 *data, u32 datasize, u16 sender_peer_id); // Returns true if something was received bool AsyncProcessPacket(); bool AsyncProcessData(); void Send(u16 channelnum, SharedBuffer data, bool reliable); - // Pops out a packet from the packet queue - //IncomingPacket getPacket(); - void interact(u8 action, const PointedThing& pointed); - void sendSignNodeText(v3s16 p, std::string text); + void sendNodemetaFields(v3s16 p, const std::string &formname, + const std::map &fields); + void sendInventoryFields(const std::string &formname, + const std::map &fields); void sendInventoryAction(InventoryAction *a); void sendChatMessage(const std::wstring &message); void sendChangePassword(const std::wstring oldpassword, - const std::wstring newpassword); + const std::wstring newpassword); void sendDamage(u8 damage); void sendRespawn(); + + ClientEnvironment& getEnv() + { return m_env; } - // locks envlock + // Causes urgent mesh updates (unlike Map::add/removeNodeWithEvent) void removeNode(v3s16 p); - // locks envlock void addNode(v3s16 p, MapNode n); - void updateCamera(v3f pos, v3f dir, f32 fov); - - void renderPostFx(); - - // Returns InvalidPositionException if not found - MapNode getNode(v3s16 p); - // Wrapper to Map - NodeMetadata* getNodeMetadata(v3s16 p); - - LocalPlayer* getLocalPlayer(); - void setPlayerControl(PlayerControl &control); void selectPlayerItem(u16 item); @@ -245,11 +326,8 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef // Copies the inventory of the local player to parameter void getLocalInventory(Inventory &dst); - InventoryContext *getInventoryContext(); - /* InventoryManager interface */ Inventory* getInventory(const InventoryLocation &loc); - //Inventory* getInventory(InventoryContext *c, std::string id); void inventoryAction(InventoryAction *a); // Gets closest object pointed by the shootline @@ -263,51 +341,27 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef // Prints a line or two of info void printDebugInfo(std::ostream &os); - u32 getDayNightRatio(); + std::list getConnectedPlayerNames(); - u16 getHP(); + float getAnimationTime(); - void setTempMod(v3s16 p, NodeMod mod); - void clearTempMod(v3s16 p); + int getCrackLevel(); + void setCrack(int level, v3s16 pos); - float getAvgRtt() - { - try{ - return m_con.GetPeerAvgRTT(PEER_ID_SERVER); - } catch(con::PeerNotFoundException){ - return 1337; - } - } + u16 getHP(); - bool getChatMessage(std::wstring &message) - { - if(m_chat_queue.size() == 0) - return false; - message = m_chat_queue.pop_front(); - return true; - } + bool checkPrivilege(const std::string &priv) + { return (m_privileges.count(priv) != 0); } - void addChatMessage(const std::wstring &message) - { - if (message[0] == L'/') { - m_chat_queue.push_back( - (std::wstring)L"issued command: "+message); - return; - } - - //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); - } + bool getChatMessage(std::wstring &message); + void typeChatMessage(const std::wstring& message); u64 getMapSeed(){ return m_map_seed; } - void addUpdateMeshTask(v3s16 blockpos, bool ack_to_server=false); + void addUpdateMeshTask(v3s16 blockpos, bool ack_to_server=false, bool urgent=false); // Including blocks at appropriate edges - void addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server=false); + void addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server=false, bool urgent=false); + void addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server=false, bool urgent=false); // Get event from queue. CE_NONE is returned if queue is empty. ClientEvent getClientEvent(); @@ -318,30 +372,42 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef std::wstring accessDeniedReason() { return m_access_denied_reason; } - float textureReceiveProgress() - { return m_texture_receive_progress; } + float mediaReceiveProgress() + { + if (!m_media_receive_started) return 0; + return 1.0 * m_media_received_count / m_media_count; + } bool texturesReceived() - { return m_textures_received; } - bool tooldefReceived() - { return m_tooldef_received; } + { return m_media_receive_started && m_media_received_count == m_media_count; } + bool itemdefReceived() + { return m_itemdef_received; } bool nodedefReceived() { return m_nodedef_received; } - bool craftitemdefReceived() - { return m_craftitemdef_received; } + void afterContentReceived(IrrlichtDevice *device, gui::IGUIFont* font); + float getRTT(void); // IGameDef interface - virtual IToolDefManager* getToolDefManager(); + virtual IItemDefManager* getItemDefManager(); virtual INodeDefManager* getNodeDefManager(); virtual ICraftDefManager* getCraftDefManager(); - virtual ICraftItemDefManager* getCraftItemDefManager(); virtual ITextureSource* getTextureSource(); + virtual IShaderSource* getShaderSource(); virtual u16 allocateUnknownNodeId(const std::string &name); + virtual ISoundManager* getSoundManager(); + virtual MtEventManager* getEventManager(); + virtual bool checkLocalPrivilege(const std::string &priv) + { return checkPrivilege(priv); } private: + // Insert a media file appropriately into the appropriate manager + bool loadMedia(const std::string &data, const std::string &filename); + + void request_media(const std::list &file_requests); + // Virtual methods from con::PeerHandler void peerAdded(con::Peer *peer); void deletingPeer(con::Peer *peer, bool timeout); @@ -363,10 +429,14 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef IntervalLimiter m_map_timer_and_unload_interval; IWritableTextureSource *m_tsrc; - IWritableToolDefManager *m_tooldef; + IWritableShaderSource *m_shsrc; + IWritableItemDefManager *m_itemdef; IWritableNodeDefManager *m_nodedef; - IWritableCraftItemDefManager *m_craftitemdef; + ISoundManager *m_sound; + MtEventManager *m_event; + MeshUpdateThread m_mesh_update_thread; + std::list m_media_fetch_threads; ClientEnvironment m_env; con::Connection m_con; IrrlichtDevice *m_device; @@ -374,10 +444,14 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef u8 m_server_ser_ver; u16 m_playeritem; bool m_inventory_updated; - core::map m_active_blocks; + Inventory *m_inventory_from_server; + float m_inventory_from_server_age; + std::set m_active_blocks; PacketCounter m_packetcounter; - // Received from the server. 0-23999 - u32 m_time_of_day; + // Block mesh animation parameters + float m_animation_time; + int m_crack_level; + v3s16 m_crack_pos; // 0 <= m_daynight_i < DAYNIGHT_CACHE_COUNT //s32 m_daynight_i; //u32 m_daynight_ratio; @@ -387,17 +461,41 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef std::string m_password; bool m_access_denied; std::wstring m_access_denied_reason; - InventoryContext m_inventory_context; Queue m_client_event_queue; - float m_texture_receive_progress; - bool m_textures_received; - bool m_tooldef_received; + FileCache m_media_cache; + // Mapping from media file name to SHA1 checksum + std::map m_media_name_sha1_map; + bool m_media_receive_started; + u32 m_media_count; + u32 m_media_received_count; + bool m_itemdef_received; bool m_nodedef_received; - bool m_craftitemdef_received; friend class FarMesh; -}; -#endif // !SERVER + // time_of_day speed approximation for old protocol + bool m_time_of_day_set; + float m_last_time_of_day_f; + float m_time_of_day_update_timer; + + // An interval for generally sending object positions and stuff + float m_recommended_send_interval; + + // Sounds + float m_removed_sounds_check_timer; + // Mapping from server sound ids to our sound ids + std::map m_sounds_server_to_client; + // And the other way! + std::map m_sounds_client_to_server; + // And relations to objects + std::map m_sounds_to_objects; + + // Privileges + std::set m_privileges; + + // Detached inventories + // key = name + std::map m_detached_inventories; +}; #endif // !CLIENT_HEADER