Decoration: Change divlen to sidelen

[dragonfireclient.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index b4b7af7c3347d74ad95e16481e711ba1b6983870..f0cc5586816372c007532ef6101854491784ddca 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 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 Lesser General Public License as published by
@@ -33,12 +33,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "filecache.h"
 #include "localplayer.h"
+#include "server.h"
+#include "particles.h"
 #include "util/pointedthing.h"
+#include <algorithm>
 
 struct MeshMakeData;
 class MapBlockMesh;
 class IGameDef;
 class IWritableTextureSource;
+class IWritableShaderSource;
 class IWritableItemDefManager;
 class IWritableNodeDefManager;
 //class IWritableCraftDefManager;
@@ -128,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<MediaRequest> m_file_requests;
+       MutexedQueue<std::pair<std::string, std::string> > m_file_data;
+       std::list<MediaRequest> 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
@@ -156,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;
        };
 };
 
@@ -174,6 +259,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                        std::string password,
                        MapDrawControl &control,
                        IWritableTextureSource *tsrc,
+                       IWritableShaderSource *shsrc,
                        IWritableItemDefManager *itemdef,
                        IWritableNodeDefManager *nodedef,
                        ISoundManager *sound,
@@ -255,7 +341,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        // Prints a line or two of info
        void printDebugInfo(std::ostream &os);
 
-       core::list<std::wstring> getConnectedPlayerNames();
+       std::list<std::string> getConnectedPlayerNames();
 
        float getAnimationTime();
 
@@ -287,16 +373,19 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        { return m_access_denied_reason; }
 
        float mediaReceiveProgress()
-       { return m_media_receive_progress; }
+       {
+               if (!m_media_receive_started) return 0;
+               return 1.0 * m_media_received_count / m_media_count;
+       }
 
        bool texturesReceived()
-       { return m_media_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; }
        
-       void afterContentReceived();
+       void afterContentReceived(IrrlichtDevice *device, gui::IGUIFont* font);
 
        float getRTT(void);
 
@@ -305,6 +394,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        virtual INodeDefManager* getNodeDefManager();
        virtual ICraftDefManager* getCraftDefManager();
        virtual ITextureSource* getTextureSource();
+       virtual IShaderSource* getShaderSource();
        virtual u16 allocateUnknownNodeId(const std::string &name);
        virtual ISoundManager* getSoundManager();
        virtual MtEventManager* getEventManager();
@@ -315,7 +405,9 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        
        // 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<MediaRequest> &file_requests);
+
        // Virtual methods from con::PeerHandler
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
@@ -337,12 +429,14 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        IntervalLimiter m_map_timer_and_unload_interval;
 
        IWritableTextureSource *m_tsrc;
+       IWritableShaderSource *m_shsrc;
        IWritableItemDefManager *m_itemdef;
        IWritableNodeDefManager *m_nodedef;
        ISoundManager *m_sound;
        MtEventManager *m_event;
 
        MeshUpdateThread m_mesh_update_thread;
+       std::list<MediaFetchThread*> m_media_fetch_threads;
        ClientEnvironment m_env;
        con::Connection m_con;
        IrrlichtDevice *m_device;
@@ -352,7 +446,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        bool m_inventory_updated;
        Inventory *m_inventory_from_server;
        float m_inventory_from_server_age;
-       core::map<v3s16, bool> m_active_blocks;
+       std::set<v3s16> m_active_blocks;
        PacketCounter m_packetcounter;
        // Block mesh animation parameters
        float m_animation_time;
@@ -370,9 +464,10 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        Queue<ClientEvent> m_client_event_queue;
        FileCache m_media_cache;
        // Mapping from media file name to SHA1 checksum
-       core::map<std::string, std::string> m_media_name_sha1_map;
-       float m_media_receive_progress;
-       bool m_media_received;
+       std::map<std::string, std::string> 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;
        friend class FarMesh;