X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient.h;h=f5929e0553d8b003ba5fa2f058a87b6d9be0aaf6;hb=b4df0d67dd9fca20df632f0247b97f8370757a3c;hp=d722493155def2f85ce5dfc30d50ad4fa33ee84d;hpb=eb88e5dd4b181a90b382c036cf6c4f42e63e8cc2;p=minetest.git diff --git a/src/client.h b/src/client.h index d72249315..f5929e055 100644 --- a/src/client.h +++ b/src/client.h @@ -17,17 +17,15 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef CLIENT_HEADER -#define CLIENT_HEADER +#pragma once -#include "network/connection.h" #include "clientenvironment.h" #include "irrlichttypes_extrabloated.h" -#include "threading/mutex.h" #include #include #include #include +#include #include "clientobject.h" #include "gamedef.h" #include "inventorymanager.h" @@ -36,8 +34,16 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "particles.h" #include "mapnode.h" #include "tileanimation.h" +#include "mesh_generator_thread.h" +#include "network/address.h" +#include "network/peerhandler.h" +#include +#define CLIENT_CHAT_MESSAGE_LIMIT_PER_10S 10.0f + +struct ClientEvent; struct MeshMakeData; +struct ChatMessage; class MapBlockMesh; class IWritableTextureSource; class IWritableShaderSource; @@ -46,23 +52,17 @@ class IWritableNodeDefManager; //class IWritableCraftDefManager; class ClientMediaDownloader; struct MapDrawControl; +class ModChannelMgr; class MtEventManager; struct PointedThing; -class Database; -class Mapper; +class MapDatabase; +class Minimap; struct MinimapMapblock; class Camera; class NetworkPacket; - -struct QueuedMeshUpdate -{ - v3s16 p; - MeshMakeData *data; - bool ack_block_to_server; - - QueuedMeshUpdate(); - ~QueuedMeshUpdate(); -}; +namespace con { +class Connection; +} enum LocalClientState { LC_Created, @@ -70,191 +70,6 @@ enum LocalClientState { LC_Ready }; -/* - A thread-safe queue of mesh update tasks -*/ -class MeshUpdateQueue -{ -public: - MeshUpdateQueue(); - - ~MeshUpdateQueue(); - - /* - peer_id=0 adds with nobody to send to - */ - void addBlock(v3s16 p, MeshMakeData *data, - bool ack_block_to_server, bool urgent); - - // Returned pointer must be deleted - // Returns NULL if queue is empty - QueuedMeshUpdate * pop(); - - u32 size() - { - MutexAutoLock lock(m_mutex); - return m_queue.size(); - } - -private: - std::vector m_queue; - std::set m_urgents; - Mutex m_mutex; -}; - -struct MeshUpdateResult -{ - v3s16 p; - MapBlockMesh *mesh; - bool ack_block_to_server; - - MeshUpdateResult(): - p(-1338,-1338,-1338), - mesh(NULL), - ack_block_to_server(false) - { - } -}; - -class MeshUpdateThread : public UpdateThread -{ -private: - MeshUpdateQueue m_queue_in; - -protected: - virtual void doUpdate(); - -public: - - MeshUpdateThread() : UpdateThread("Mesh") {} - - void enqueueUpdate(v3s16 p, MeshMakeData *data, - bool ack_block_to_server, bool urgent); - MutexedQueue m_queue_out; - - v3s16 m_camera_offset; -}; - -enum ClientEventType -{ - CE_NONE, - CE_PLAYER_DAMAGE, - CE_PLAYER_FORCE_MOVE, - CE_DEATHSCREEN, - CE_SHOW_FORMSPEC, - CE_SHOW_LOCAL_FORMSPEC, - CE_SPAWN_PARTICLE, - CE_ADD_PARTICLESPAWNER, - CE_DELETE_PARTICLESPAWNER, - CE_HUDADD, - CE_HUDRM, - CE_HUDCHANGE, - CE_SET_SKY, - CE_OVERRIDE_DAY_NIGHT_RATIO, -}; - -struct ClientEvent -{ - ClientEventType type; - union{ - //struct{ - //} none; - struct{ - u8 amount; - } player_damage; - struct{ - f32 pitch; - f32 yaw; - } player_force_move; - struct{ - bool set_camera_point_target; - f32 camera_point_target_x; - 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; - bool collision_removal; - bool vertical; - std::string *texture; - struct TileAnimationParams animation; - u8 glow; - } 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; - bool collision_removal; - u16 attached_id; - bool vertical; - std::string *texture; - u32 id; - struct TileAnimationParams animation; - u8 glow; - } 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; - v3f *world_pos; - v2s32 * size; - } hudadd; - struct{ - u32 id; - } hudrm; - struct{ - u32 id; - HudElementStat stat; - v2f *v2fdata; - std::string *sdata; - u32 data; - v3f *v3fdata; - v2s32 * v2s32data; - } hudchange; - struct{ - video::SColor *bgcolor; - std::string *type; - std::vector *params; - } set_sky; - struct{ - bool do_override; - float ratio_f; - } override_day_night_ratio; - }; -}; - /* Packet counter */ @@ -262,9 +77,7 @@ struct ClientEvent class PacketCounter { public: - PacketCounter() - { - } + PacketCounter() = default; void add(u16 command) { @@ -281,23 +94,15 @@ class PacketCounter void clear() { - for(std::map::iterator - i = m_packets.begin(); - i != m_packets.end(); ++i) - { - i->second = 0; + for (auto &m_packet : m_packets) { + m_packet.second = 0; } } void print(std::ostream &o) { - for(std::map::iterator - i = m_packets.begin(); - i != m_packets.end(); ++i) - { - o<<"cmd "<first - <<" count "<second - < &getPrivilegeList() const + { return m_privileges; } + bool getChatMessage(std::wstring &message); void typeChatMessage(const std::wstring& message); @@ -488,8 +316,9 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef void updateCameraOffset(v3s16 camera_offset) { m_mesh_update_thread.m_camera_offset = camera_offset; } - // Get event from queue. CE_NONE is returned if queue is empty. - ClientEvent getClientEvent(); + bool hasClientEvents() const { return !m_client_event_queue.empty(); } + // Get event from queue. If queue is empty, it triggers an assertion failure. + ClientEvent * getClientEvent(); bool accessDenied() const { return m_access_denied; } @@ -510,33 +339,26 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef bool nodedefReceived() { return m_nodedef_received; } bool mediaReceived() - { return m_media_downloader == NULL; } + { return !m_media_downloader; } u8 getProtoVersion() { return m_proto_ver; } - bool connectedToServer() - { return m_con.Connected(); } + bool connectedToServer(); float mediaReceiveProgress(); - void afterContentReceived(IrrlichtDevice *device); - - float getRTT(void); - float getCurRate(void); - float getAvgRate(void); + void afterContentReceived(); - Mapper* getMapper () - { return m_mapper; } + float getRTT(); + float getCurRate(); - void setCamera(Camera* camera) - { m_camera = camera; } + Minimap* getMinimap() { return m_minimap; } + void setCamera(Camera* camera) { m_camera = camera; } - Camera* getCamera () - { return m_camera; } + Camera* getCamera () { return m_camera; } - bool isMinimapDisabledByServer() - { return m_minimap_disabled_by_server; } + bool shouldShowMinimap() const; // IGameDef interface virtual IItemDefManager* getItemDefManager(); @@ -545,14 +367,14 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef ITextureSource* getTextureSource(); virtual IShaderSource* getShaderSource(); IShaderSource *shsrc() { return getShaderSource(); } - scene::ISceneManager* getSceneManager(); virtual u16 allocateUnknownNodeId(const std::string &name); virtual ISoundManager* getSoundManager(); virtual MtEventManager* getEventManager(); virtual ParticleManager* getParticleManager(); bool checkLocalPrivilege(const std::string &priv) { return checkPrivilege(priv); } - virtual scene::IAnimatedMesh* getMesh(const std::string &filename); + virtual scene::IAnimatedMesh* getMesh(const std::string &filename, bool cache = false); + const std::string* getModFile(const std::string &filename); virtual std::string getModStoragePath() const; virtual bool registerModStorage(ModMetadata *meta); @@ -563,27 +385,48 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef bool loadMedia(const std::string &data, const std::string &filename); // Send a request for conventional media transfer void request_media(const std::vector &file_requests); - // Send a notification that no conventional media transfer is needed - void received_media(); LocalClientState getState() { return m_state; } - void makeScreenshot(IrrlichtDevice *device); + void makeScreenshot(); - inline void pushToChatQueue(const std::wstring &input) + inline void pushToChatQueue(ChatMessage *cec) { - m_chat_queue.push(input); + m_chat_queue.push(cec); } ClientScripting *getScript() { return m_script; } const bool moddingEnabled() const { return m_modding_enabled; } - inline void pushToEventQueue(const ClientEvent &event) + void pushToEventQueue(ClientEvent *event); + + void showMinimap(bool show = true); + + const Address getServerAddress(); + + const std::string &getAddressName() const + { + return m_address_name; + } + + inline bool checkCSMFlavourLimit(CSMFlavourLimit flag) const + { + return m_csm_flavour_limits & flag; + } + + u32 getCSMNodeRangeLimit() const { - m_client_event_queue.push(event); + return m_csm_noderange_limit; } + bool joinModChannel(const std::string &channel); + bool leaveModChannel(const std::string &channel); + bool sendModChannelMessage(const std::string &channel, const std::string &message); + ModChannel *getModChannel(const std::string &channel); + private: + void loadMods(); + bool checkBuiltinIntegrity(); // Virtual methods from con::PeerHandler void peerAdded(con::Peer *peer); @@ -604,7 +447,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef // helper method shared with clientpackethandler static AuthMechanism choseAuthMech(const u32 mechs); - void sendLegacyInit(const char* playerName, const char* playerPassword); void sendInit(const std::string &playerName); void startAuth(AuthMechanism chosen_auth_mechanism); void sendDeletedBlocks(std::vector &blocks); @@ -615,11 +457,12 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef inline std::string getPlayerName() { return m_env.getLocalPlayer()->getName(); } - float m_packetcounter_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 + bool canSendChatMessage() const; + + float m_packetcounter_timer = 0.0f; + float m_connection_reinit_timer = 0.1f; + float m_avg_rtt_timer = 0.0f; + float m_playerpos_send_timer = 0.0f; IntervalLimiter m_map_timer_and_unload_interval; IWritableTextureSource *m_tsrc; @@ -633,11 +476,11 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef MeshUpdateThread m_mesh_update_thread; ClientEnvironment m_env; ParticleManager m_particle_manager; - con::Connection m_con; - IrrlichtDevice *m_device; - Camera *m_camera; - Mapper *m_mapper; - bool m_minimap_disabled_by_server; + std::unique_ptr m_con; + std::string m_address_name; + Camera *m_camera = nullptr; + Minimap *m_minimap = nullptr; + bool m_minimap_disabled_by_server = false; // Server serialization version u8 m_server_ser_ver; @@ -646,27 +489,30 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef // and aren't accurate. We simply just don't know, because // the server didn't send the version back then. // If 0, server init hasn't been received yet. - u8 m_proto_ver; + u8 m_proto_ver = 0; - u16 m_playeritem; - bool m_inventory_updated; - Inventory *m_inventory_from_server; - float m_inventory_from_server_age; + u16 m_playeritem = 0; + bool m_inventory_updated = false; + Inventory *m_inventory_from_server = nullptr; + float m_inventory_from_server_age = 0.0f; PacketCounter m_packetcounter; // Block mesh animation parameters - float m_animation_time; - int m_crack_level; + float m_animation_time = 0.0f; + int m_crack_level = -1; v3s16 m_crack_pos; // 0 <= m_daynight_i < DAYNIGHT_CACHE_COUNT //s32 m_daynight_i; //u32 m_daynight_ratio; - std::queue m_chat_queue; + std::queue m_out_chat_queue; + u32 m_last_chat_message_sent; + float m_chat_message_allowance = 5.0f; + std::queue m_chat_queue; // The authentication methods we can use to enter sudo mode (=change password) u32 m_sudo_auth_methods; // The seed returned by the server in TOCLIENT_INIT is stored here - u64 m_map_seed; + u64 m_map_seed = 0; // Auth data std::string m_playername; @@ -675,63 +521,68 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef std::string m_new_password; // Usable by auth mechanisms. AuthMechanism m_chosen_auth_mech; - void * m_auth_data; + void *m_auth_data = nullptr; - bool m_access_denied; - bool m_access_denied_reconnect; - std::string m_access_denied_reason; - std::queue m_client_event_queue; - bool m_itemdef_received; - bool m_nodedef_received; + bool m_access_denied = false; + bool m_access_denied_reconnect = false; + std::string m_access_denied_reason = ""; + std::queue m_client_event_queue; + bool m_itemdef_received = false; + bool m_nodedef_received = false; + bool m_mods_loaded = false; ClientMediaDownloader *m_media_downloader; // 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; + bool m_time_of_day_set = false; + float m_last_time_of_day_f = -1.0f; + float m_time_of_day_update_timer = 0.0f; // An interval for generally sending object positions and stuff - float m_recommended_send_interval; + float m_recommended_send_interval = 0.1f; // Sounds - float m_removed_sounds_check_timer; + float m_removed_sounds_check_timer = 0.0f; // Mapping from server sound ids to our sound ids - UNORDERED_MAP m_sounds_server_to_client; + std::unordered_map m_sounds_server_to_client; // And the other way! - UNORDERED_MAP m_sounds_client_to_server; + std::unordered_map m_sounds_client_to_server; // And relations to objects - UNORDERED_MAP m_sounds_to_objects; + std::unordered_map m_sounds_to_objects; // Privileges - UNORDERED_SET m_privileges; + std::unordered_set m_privileges; // Detached inventories // key = name - UNORDERED_MAP m_detached_inventories; + std::unordered_map m_detached_inventories; // Storage for mesh data for creating multiple instances of the same mesh StringMap m_mesh_data; + StringMap m_mod_files; + // own state LocalClientState m_state; + GameUI *m_game_ui; + // Used for saving server map to disk client-side - Database *m_localdb; + MapDatabase *m_localdb = nullptr; IntervalLimiter m_localdb_save_interval; u16 m_cache_save_interval; - // TODO: Add callback to update these when g_settings changes - bool m_cache_smooth_lighting; - bool m_cache_enable_shaders; - bool m_cache_use_tangent_vertices; - - ClientScripting *m_script; + ClientScripting *m_script = nullptr; bool m_modding_enabled; - UNORDERED_MAP m_mod_storages; - float m_mod_storage_save_timer; + std::unordered_map m_mod_storages; + float m_mod_storage_save_timer = 10.0f; + std::vector m_mods; - DISABLE_CLASS_COPY(Client); -}; + bool m_shutdown = false; -#endif // !CLIENT_HEADER + // CSM flavour limits byteflag + u64 m_csm_flavour_limits = CSMFlavourLimit::CSM_FL_NONE; + u32 m_csm_noderange_limit = 8; + + std::unique_ptr m_modchannel_mgr; +};