X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fplayer.h;h=e343f55a5432fa698b127d6ba00b9f18523c1646;hb=90e7d42375918636bf65fd6273675a576530778d;hp=4459b421a29477d2c1af770e8d040def196c6f34;hpb=ced6d20295a8263757d57c02a07ffcb66688a163;p=dragonfireclient.git diff --git a/src/player.h b/src/player.h index 4459b421a..e343f55a5 100644 --- a/src/player.h +++ b/src/player.h @@ -17,34 +17,25 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef PLAYER_HEADER -#define PLAYER_HEADER +#pragma once #include "irrlichttypes_bloated.h" #include "inventory.h" -#include "constants.h" // BS +#include "constants.h" +#include "network/networkprotocol.h" +#include "util/basic_macros.h" #include +#include #define PLAYERNAME_SIZE 20 #define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_" +#define PLAYERNAME_ALLOWED_CHARS_USER_EXPL "'a' to 'z', 'A' to 'Z', '0' to '9', '-', '_'" struct PlayerControl { - PlayerControl() - { - up = false; - down = false; - left = false; - right = false; - jump = false; - aux1 = false; - sneak = false; - LMB = false; - RMB = false; - pitch = 0; - yaw = 0; - } + PlayerControl() = default; + PlayerControl( bool a_up, bool a_down, @@ -53,10 +44,13 @@ struct PlayerControl bool a_jump, bool a_aux1, bool a_sneak, + bool a_zoom, bool a_LMB, bool a_RMB, float a_pitch, - float a_yaw + float a_yaw, + float a_sidew_move_joystick_axis, + float a_forw_move_joystick_axis ) { up = a_up; @@ -66,28 +60,32 @@ struct PlayerControl jump = a_jump; aux1 = a_aux1; sneak = a_sneak; + zoom = a_zoom; LMB = a_LMB; RMB = a_RMB; pitch = a_pitch; yaw = a_yaw; - } - bool up; - bool down; - bool left; - bool right; - bool jump; - bool aux1; - bool sneak; - bool LMB; - bool RMB; - float pitch; - float yaw; + sidew_move_joystick_axis = a_sidew_move_joystick_axis; + forw_move_joystick_axis = a_forw_move_joystick_axis; + } + bool up = false; + bool down = false; + bool left = false; + bool right = false; + bool jump = false; + bool aux1 = false; + bool sneak = false; + bool zoom = false; + bool LMB = false; + bool RMB = false; + float pitch = 0.0f; + float yaw = 0.0f; + float sidew_move_joystick_axis = 0.0f; + float forw_move_joystick_axis = 0.0f; }; class Map; -class IGameDef; struct CollisionInfo; -class PlayerSAO; struct HudElement; class Environment; @@ -95,114 +93,31 @@ class Player { public: - Player(IGameDef *gamedef, const char *name); + Player(const char *name, IItemDefManager *idef); virtual ~Player() = 0; + DISABLE_CLASS_COPY(Player); + virtual void move(f32 dtime, Environment *env, f32 pos_max_d) {} virtual void move(f32 dtime, Environment *env, f32 pos_max_d, - std::list *collision_info) + std::vector *collision_info) {} - v3f getSpeed() + const v3f &getSpeed() const { return m_speed; } - void setSpeed(v3f speed) + void setSpeed(const v3f &speed) { m_speed = speed; } - - void accelerateHorizontal(v3f target_speed, f32 max_increase); - void accelerateVertical(v3f target_speed, f32 max_increase); - - v3f getPosition() - { - return m_position; - } - - v3s16 getLightPosition() const; - - v3f getEyeOffset() - { - // This is at the height of the eyes of the current figure - // return v3f(0, BS*1.5, 0); - // This is more like in minecraft - if(camera_barely_in_ceiling) - return v3f(0,BS*1.5,0); - else - return v3f(0,BS*1.625,0); - } - - v3f getEyePosition() - { - return m_position + getEyeOffset(); - } - - virtual void setPosition(const v3f &position) - { - if (position != m_position) - m_dirty = true; - m_position = position; - } - - void setPitch(f32 pitch) - { - if (pitch != m_pitch) - m_dirty = true; - m_pitch = pitch; - } - - virtual void setYaw(f32 yaw) - { - if (yaw != m_yaw) - m_dirty = true; - m_yaw = yaw; - } - f32 getPitch() - { - return m_pitch; - } - - f32 getYaw() - { - return m_yaw; - } - - u16 getBreath() - { - return m_breath; - } - - virtual void setBreath(u16 breath) - { - if (breath != m_breath) - m_dirty = true; - m_breath = breath; - } - - f32 getRadPitch() - { - return -1.0 * m_pitch * core::DEGTORAD; - } + const char *getName() const { return m_name; } - f32 getRadYaw() + u32 getFreeHudID() { - return (m_yaw + 90.) * core::DEGTORAD; - } - - const char * getName() const - { - return m_name; - } - - core::aabbox3d getCollisionbox() { - return m_collisionbox; - } - - u32 getFreeHudID() const { size_t size = hud.size(); for (size_t i = 0; i != size; i++) { if (!hud[i]) @@ -211,44 +126,9 @@ class Player return size; } - virtual bool isLocal() const - { return false; } - virtual PlayerSAO *getPlayerSAO() - { return NULL; } - virtual void setPlayerSAO(PlayerSAO *sao) - { FATAL_ERROR("FIXME"); } - - /* - serialize() writes a bunch of text that can contain - any characters except a '\0', and such an ending that - deSerialize stops reading exactly at the right point. - */ - void serialize(std::ostream &os); - void deSerialize(std::istream &is, std::string playername); + v3f eye_offset_first; + v3f eye_offset_third; - bool checkModified() const - { - return m_dirty || inventory.checkModified(); - } - - void setModified(const bool x) - { - m_dirty = x; - if (x == false) - inventory.setModified(x); - } - - bool touching_ground; - // This oscillates so that the player jumps a bit above the surface - bool in_liquid; - // This is more stable and defines the maximum speed of the player - bool in_liquid_stable; - // Gets the viscosity of water to calculate friction - u8 liquid_viscosity; - bool is_climbing; - bool swimming_vertical; - bool camera_barely_in_ceiling; - Inventory inventory; f32 movement_acceleration_default; @@ -264,83 +144,31 @@ class Player f32 movement_liquid_sink; f32 movement_gravity; - float physics_override_speed; - float physics_override_jump; - float physics_override_gravity; - bool physics_override_sneak; - bool physics_override_sneak_glitch; - v2s32 local_animations[4]; float local_animation_speed; - u16 hp; - - float hurt_tilt_timer; - float hurt_tilt_strength; - - u16 peer_id; - std::string inventory_formspec; - + PlayerControl control; - PlayerControl getPlayerControl() - { - return control; - } - - u32 keyPressed; - + const PlayerControl& getPlayerControl() { return control; } + + u32 keyPressed = 0; HudElement* getHud(u32 id); u32 addHud(HudElement* hud); HudElement* removeHud(u32 id); void clearHud(); - u32 maxHudId() { - return hud.size(); - } u32 hud_flags; s32 hud_hotbar_itemcount; protected: - IGameDef *m_gamedef; - char m_name[PLAYERNAME_SIZE]; - u16 m_breath; - f32 m_pitch; - f32 m_yaw; v3f m_speed; - v3f m_position; - core::aabbox3d m_collisionbox; - - bool m_dirty; std::vector hud; -}; - - -/* - Player on the server -*/ -class RemotePlayer : public Player -{ -public: - RemotePlayer(IGameDef *gamedef, const char *name): - Player(gamedef, name), - m_sao(NULL) - {} - virtual ~RemotePlayer() {} - - void save(std::string savedir); - - PlayerSAO *getPlayerSAO() - { return m_sao; } - void setPlayerSAO(PlayerSAO *sao) - { m_sao = sao; } - void setPosition(const v3f &position); - private: - PlayerSAO *m_sao; + // Protect some critical areas + // hud for example can be modified by EmergeThread + // and ServerThread + std::mutex m_mutex; }; - -#endif -