Fix and tune stars

[minetest.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index 4b16b717caf7e8ce26030c4fb30b05b9daec71da..1903f3aa7b56c1bc6bf0dd9ec06ce20bf6383e6d 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -27,6 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common_irrlicht.h"
 #include "jmutex.h"
 #include <ostream>
+#include <set>
+#include <vector>
 #include "clientobject.h"
 #include "utility.h" // For IntervalLimiter
 #include "gamedef.h"
@@ -34,11 +36,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 
 struct MeshMakeData;
+class MapBlockMesh;
 class IGameDef;
 class IWritableTextureSource;
 class IWritableItemDefManager;
 class IWritableNodeDefManager;
 //class IWritableCraftDefManager;
+class ClientEnvironment;
+struct MapDrawControl;
 
 class ClientNotReadyException : public BaseException
 {
@@ -71,7 +76,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
@@ -84,14 +90,15 @@ class MeshUpdateQueue
        }
        
 private:
-       core::list<QueuedMeshUpdate*> m_queue;
+       std::vector<QueuedMeshUpdate*> m_queue;
+       std::set<v3s16> m_urgents;
        JMutex m_mutex;
 };
 
 struct MeshUpdateResult
 {
        v3s16 p;
-       scene::SMesh *mesh;
+       MapBlockMesh *mesh;
        bool ack_block_to_server;
 
        MeshUpdateResult():
@@ -192,19 +199,12 @@ 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<u8> 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);
@@ -214,23 +214,14 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                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);
@@ -260,12 +251,12 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 
        core::list<std::wstring> getConnectedPlayerNames();
 
-       u32 getDayNightRatio();
+       float getAnimationTime();
 
-       u16 getHP();
+       int getCrackLevel();
+       void setCrack(int level, v3s16 pos);
 
-       void setTempMod(v3s16 p, NodeMod mod);
-       void clearTempMod(v3s16 p);
+       u16 getHP();
 
        float getAvgRtt()
        {
@@ -281,9 +272,10 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 
        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();
@@ -352,8 +344,10 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        float m_inventory_from_server_age;
        core::map<v3s16, bool> 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;
@@ -369,6 +363,11 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        bool m_itemdef_received;
        bool m_nodedef_received;
        friend class FarMesh;
+
+       // 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;
 };
 
 #endif // !SERVER