#include <ostream>
#include "clientobject.h"
#include "utility.h" // For IntervalLimiter
+#include "gamedef.h"
struct MeshMakeData;
+class IGameDef;
+class IWritableTextureSource;
+class IWritableToolDefManager;
+class IWritableNodeDefManager;
class ClientNotReadyException : public BaseException
{
{
public:
- MeshUpdateThread()
+ MeshUpdateThread(IGameDef *gamedef):
+ m_gamedef(gamedef)
{
}
MeshUpdateQueue m_queue_in;
MutexedQueue<MeshUpdateResult> m_queue_out;
+
+ IGameDef *m_gamedef;
};
enum ClientEventType
{
CE_NONE,
CE_PLAYER_DAMAGE,
- CE_PLAYER_FORCE_MOVE
+ CE_PLAYER_FORCE_MOVE,
+ CE_DEATHSCREEN,
+ CE_TEXTURES_UPDATED
};
struct ClientEvent
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{
+ } textures_updated;
};
};
-class Client : public con::PeerHandler, public InventoryManager
+class Client : public con::PeerHandler, public InventoryManager, public IGameDef
{
public:
/*
IrrlichtDevice *device,
const char *playername,
std::string password,
- MapDrawControl &control
- );
+ MapDrawControl &control,
+ IWritableTextureSource *tsrc,
+ IWritableToolDefManager *tooldef,
+ IWritableNodeDefManager *nodedef
+ );
~Client();
/*
void groundAction(u8 action, v3s16 nodepos_undersurface,
v3s16 nodepos_oversurface, u16 item);
- void clickObject(u8 button, v3s16 blockpos, s16 id, u16 item);
- void clickActiveObject(u8 button, u16 id, u16 item);
+ void clickActiveObject(u8 button, u16 id, u16 item_i);
- void sendSignText(v3s16 blockpos, s16 id, std::string text);
void sendSignNodeText(v3s16 p, std::string text);
void sendInventoryAction(InventoryAction *a);
void sendChatMessage(const std::wstring &message);
void sendChangePassword(const std::wstring oldpassword,
const std::wstring newpassword);
void sendDamage(u8 damage);
+ void sendRespawn();
// locks envlock
void removeNode(v3s16 p);
// locks envlock
void addNode(v3s16 p, MapNode n);
- void updateCamera(v3f pos, v3f dir);
+ 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);
- // Get the player position, and optionally put the
- // eye position in *eye_position
- v3f getPlayerPosition(v3f *eye_position=NULL);
+ LocalPlayer* getLocalPlayer();
void setPlayerControl(PlayerControl &control);
Inventory* getInventory(InventoryContext *c, std::string id);
void inventoryAction(InventoryAction *a);
- // Gets closest object pointed by the shootline
- // Returns NULL if not found
- MapBlockObject * getSelectedObject(
- f32 max_d,
- v3f from_pos_f_on_map,
- core::line3d<f32> shootline_on_map
- );
-
// Gets closest object pointed by the shootline
// Returns NULL if not found
ClientActiveObject * getSelectedActiveObject(
float getAvgRtt()
{
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
- con::Peer *peer = m_con.GetPeerNoEx(PEER_ID_SERVER);
- if(peer == NULL)
- return 0.0;
- return peer->avg_rtt;
+ try{
+ return m_con.GetPeerAvgRTT(PEER_ID_SERVER);
+ } catch(con::PeerNotFoundException){
+ return 1337;
+ }
}
bool getChatMessage(std::wstring &message)
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);
ClientEvent getClientEvent();
inline bool accessDenied()
- {
- return m_access_denied;
- }
+ { return m_access_denied; }
inline std::wstring accessDeniedReason()
- {
- return m_access_denied_reason;
- }
+ { return m_access_denied_reason; }
- /*
- This should only be used for calling the special drawing stuff in
- ClientEnvironment
- */
- ClientEnvironment * getEnv()
- {
- return &m_env;
- }
+ float getRTT(void);
+
+ // IGameDef interface
+ // Under envlock
+ virtual IToolDefManager* getToolDefManager();
+ virtual INodeDefManager* getNodeDefManager();
+ virtual ITextureSource* getTextureSource();
private:
void sendPlayerPos();
// This sends the player's current name etc to the server
void sendPlayerInfo();
+ // Send the item number 'item' as player item to the server
+ void sendPlayerItem(u16 item);
float m_packetcounter_timer;
float m_connection_reinit_timer;
float m_ignore_damage_timer; // Used after server moves player
IntervalLimiter m_map_timer_and_unload_interval;
+ IWritableTextureSource *m_tsrc;
+ IWritableToolDefManager *m_tooldef;
+ IWritableNodeDefManager *m_nodedef;
MeshUpdateThread m_mesh_update_thread;
-
ClientEnvironment m_env;
-
con::Connection m_con;
-
IrrlichtDevice *m_device;
-
- v3f camera_position;
- v3f camera_direction;
-
// Server serialization version
u8 m_server_ser_ver;
-
// This is behind m_env_mutex.
bool m_inventory_updated;
-
core::map<v3s16, bool> m_active_blocks;
-
PacketCounter m_packetcounter;
-
// Received from the server. 0-23999
u32 m_time_of_day;
-
// 0 <= m_daynight_i < DAYNIGHT_CACHE_COUNT
//s32 m_daynight_i;
//u32 m_daynight_ratio;
-
Queue<std::wstring> m_chat_queue;
-
// The seed returned by the server in TOCLIENT_INIT is stored here
u64 m_map_seed;
-
std::string m_password;
bool m_access_denied;
std::wstring m_access_denied_reason;
-
InventoryContext m_inventory_context;
-
Queue<ClientEvent> m_client_event_queue;
-
friend class FarMesh;
};
projects / oweals / minetest.git / blobdiff