Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / client.h

diff --git a/src/client/client.h b/src/client/client.h
index f7a9030bc02ff00c0a1bdeed0af22d1c57e5de98..d49f2f9ada7392fe9426da50f89c05ba6c838d87 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -45,12 +45,14 @@ struct ClientEvent;
 struct MeshMakeData;
 struct ChatMessage;
 class MapBlockMesh;
+class RenderingEngine;
 class IWritableTextureSource;
 class IWritableShaderSource;
 class ISoundManager;
 class NodeDefManager;
 //class IWritableCraftDefManager;
 class ClientMediaDownloader;
+class SingleMediaDownloader;
 struct MapDrawControl;
 class ModChannelMgr;
 class MtEventManager;
@@ -122,6 +124,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                        NodeDefManager *nodedef,
                        ISoundManager *sound,
                        MtEventManager *event,
+                       RenderingEngine *rendering_engine,
                        bool ipv6,
                        GameUI *game_ui
        );
@@ -223,6 +226,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        void handleCommand_PlayerSpeed(NetworkPacket *pkt);
        void handleCommand_MediaPush(NetworkPacket *pkt);
        void handleCommand_MinimapModes(NetworkPacket *pkt);
+       void handleCommand_SetLighting(NetworkPacket *pkt);
 
        void ProcessData(NetworkPacket *pkt);
 
@@ -242,6 +246,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        void sendDamage(u16 damage);
        void sendRespawn();
        void sendReady();
+       void sendHaveMedia(const std::vector<u32> &tokens);
 
        ClientEnvironment& getEnv() { return m_env; }
        ITextureSource *tsrc() { return getTextureSource(); }
@@ -322,18 +327,22 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                m_access_denied = true;
                m_access_denied_reason = reason;
        }
+       inline void setFatalError(const LuaError &e)
+       {
+               setFatalError(std::string("Lua: ") + e.what());
+       }
 
        // Renaming accessDeniedReason to better name could be good as it's used to
        // disconnect client when CSM failed.
        const std::string &accessDeniedReason() const { return m_access_denied_reason; }
 
-       const bool itemdefReceived() const
+       bool itemdefReceived() const
        { return m_itemdef_received; }
-       const bool nodedefReceived() const
+       bool nodedefReceived() const
        { return m_nodedef_received; }
-       const bool mediaReceived() const
+       bool mediaReceived() const
        { return !m_media_downloader; }
-       const bool activeObjectsReceived() const
+       bool activeObjectsReceived() const
        { return m_activeobjects_received; }
 
        u16 getProtoVersion()
@@ -346,6 +355,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        float mediaReceiveProgress();
 
        void afterContentReceived();
+       void showUpdateProgressTexture(void *args, u32 progress, u32 max_progress);
 
        float getRTT();
        float getCurRate();
@@ -354,6 +364,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        void setCamera(Camera* camera) { m_camera = camera; }
 
        Camera* getCamera () { return m_camera; }
+       scene::ISceneManager *getSceneManager();
 
        bool shouldShowMinimap() const;
 
@@ -372,15 +383,19 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        bool checkLocalPrivilege(const std::string &priv){ return checkPrivilege(priv); }
        virtual scene::IAnimatedMesh* getMesh(const std::string &filename, bool cache = false);
        const std::string* getModFile(std::string filename);
+       ModMetadataDatabase *getModStorageDatabase() override { return m_mod_storage_database; }
 
-       std::string getModStoragePath() const override;
        bool registerModStorage(ModMetadata *meta) override;
        void unregisterModStorage(const std::string &name) override;
 
+       // Migrates away old files-based mod storage if necessary
+       void migrateModStorage();
+
        // The following set of functions is used by ClientMediaDownloader
        // Insert a media file appropriately into the appropriate manager
        bool loadMedia(const std::string &data, const std::string &filename,
                bool from_media_push = false);
+
        // Send a request for conventional media transfer
        void request_media(const std::vector<std::string> &file_requests);
 
@@ -394,7 +409,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        }
 
        ClientScripting *getScript() { return m_script; }
-       const bool modsLoaded() const { return m_mods_loaded; }
+       bool modsLoaded() const { return m_mods_loaded; }
 
        void pushToEventQueue(ClientEvent *event);
 
@@ -418,11 +433,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                return false;
        }
 
-       inline std::unordered_map<u32, u32> &getHUDTranslationMap()
-       {
-               return m_hud_server_to_client;
-       }
-
        bool joinModChannel(const std::string &channel) override;
        bool leaveModChannel(const std::string &channel) override;
        bool sendModChannelMessage(const std::string &channel,
@@ -481,6 +491,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        NodeDefManager *m_nodedef;
        ISoundManager *m_sound;
        MtEventManager *m_event;
+       RenderingEngine *m_rendering_engine;
 
 
        ClientEnvironment m_env;
@@ -541,9 +552,13 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        bool m_activeobjects_received = false;
        bool m_mods_loaded = false;
 
+       std::vector<std::string> m_remote_media_servers;
+       // Media downloader, only exists during init
        ClientMediaDownloader *m_media_downloader;
        // Set of media filenames pushed by server at runtime
        std::unordered_set<std::string> m_media_pushed_files;
+       // Pending downloads of dynamic media (key: token)
+       std::vector<std::pair<u32, std::shared_ptr<SingleMediaDownloader>>> m_pending_media_downloads;
 
        // time_of_day speed approximation for old protocol
        bool m_time_of_day_set = false;
@@ -562,9 +577,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        // Relation of client id to object id
        std::unordered_map<int, u16> m_sounds_to_objects;
 
-       // Map server hud ids to client hud ids
-       std::unordered_map<u32, u32> m_hud_server_to_client;
-
        // Privileges
        std::unordered_set<std::string> m_privileges;
 
@@ -588,6 +600,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        // Client modding
        ClientScripting *m_script = nullptr;
        std::unordered_map<std::string, ModMetadata *> m_mod_storages;
+       ModMetadataDatabase *m_mod_storage_database = nullptr;
        float m_mod_storage_save_timer = 10.0f;
        std::vector<ModSpec> m_mods;
        StringMap m_mod_vfs;