summaryrefslogtreecommitdiff
path: root/src/player.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/player.h')
-rw-r--r--src/player.h281
1 files changed, 17 insertions, 264 deletions
diff --git a/src/player.h b/src/player.h
index b317cda4f..5f9bb7ec9 100644
--- a/src/player.h
+++ b/src/player.h
@@ -46,7 +46,10 @@ struct PlayerControl
RMB = false;
pitch = 0;
yaw = 0;
+ sidew_move_joystick_axis = .0f;
+ forw_move_joystick_axis = .0f;
}
+
PlayerControl(
bool a_up,
bool a_down,
@@ -55,10 +58,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;
@@ -68,10 +74,13 @@ 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;
+ sidew_move_joystick_axis = a_sidew_move_joystick_axis;
+ forw_move_joystick_axis = a_forw_move_joystick_axis;
}
bool up;
bool down;
@@ -80,16 +89,17 @@ struct PlayerControl
bool jump;
bool aux1;
bool sneak;
+ bool zoom;
bool LMB;
bool RMB;
float pitch;
float yaw;
+ float sidew_move_joystick_axis;
+ float forw_move_joystick_axis;
};
class Map;
-class IGameDef;
struct CollisionInfo;
-class PlayerSAO;
struct HudElement;
class Environment;
@@ -100,7 +110,7 @@ class Player
{
public:
- Player(IGameDef *gamedef, const char *name);
+ Player(const char *name, IItemDefManager *idef);
virtual ~Player() = 0;
virtual void move(f32 dtime, Environment *env, f32 pos_max_d)
@@ -119,88 +129,10 @@ public:
m_speed = speed;
}
- v3f getPosition()
- {
- return m_position;
- }
-
- v3s16 getLightPosition() const;
-
- v3f getEyeOffset()
- {
- float eye_height = camera_barely_in_ceiling ? 1.5f : 1.625f;
- return v3f(0, BS * eye_height, 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;
- }
-
- f32 getRadYaw()
- {
- return (m_yaw + 90.) * core::DEGTORAD;
- }
+ const char *getName() const { return m_name; }
- const char *getName() const
+ u32 getFreeHudID()
{
- return m_name;
- }
-
- aabb3f getCollisionbox()
- {
- return m_collisionbox;
- }
-
- u32 getFreeHudID() {
size_t size = hud.size();
for (size_t i = 0; i != size; i++) {
if (!hud[i])
@@ -209,126 +141,6 @@ public:
return size;
}
- void setHotbarItemcount(s32 hotbar_itemcount)
- {
- hud_hotbar_itemcount = hotbar_itemcount;
- }
-
- s32 getHotbarItemcount()
- {
- return hud_hotbar_itemcount;
- }
-
- void setHotbarImage(const std::string &name)
- {
- hud_hotbar_image = name;
- }
-
- std::string getHotbarImage()
- {
- return hud_hotbar_image;
- }
-
- void setHotbarSelectedImage(const std::string &name)
- {
- hud_hotbar_selected_image = name;
- }
-
- std::string getHotbarSelectedImage() {
- return hud_hotbar_selected_image;
- }
-
- void setSky(const video::SColor &bgcolor, const std::string &type,
- const std::vector<std::string> &params)
- {
- m_sky_bgcolor = bgcolor;
- m_sky_type = type;
- m_sky_params = params;
- }
-
- void getSky(video::SColor *bgcolor, std::string *type,
- std::vector<std::string> *params)
- {
- *bgcolor = m_sky_bgcolor;
- *type = m_sky_type;
- *params = m_sky_params;
- }
-
- void overrideDayNightRatio(bool do_override, float ratio)
- {
- m_day_night_ratio_do_override = do_override;
- m_day_night_ratio = ratio;
- }
-
- void getDayNightRatio(bool *do_override, float *ratio)
- {
- *do_override = m_day_night_ratio_do_override;
- *ratio = m_day_night_ratio;
- }
-
- void setLocalAnimations(v2s32 frames[4], float frame_speed)
- {
- for (int i = 0; i < 4; i++)
- local_animations[i] = frames[i];
- local_animation_speed = frame_speed;
- }
-
- void getLocalAnimations(v2s32 *frames, float *frame_speed)
- {
- for (int i = 0; i < 4; i++)
- frames[i] = local_animations[i];
- *frame_speed = local_animation_speed;
- }
-
- 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);
-
- bool checkModified() const
- {
- return m_dirty || inventory.checkModified();
- }
-
- void setModified(const bool x)
- {
- m_dirty = x;
- if (x == false)
- inventory.setModified(x);
- }
-
- // Use a function, if isDead can be defined by other conditions
- bool isDead() { return hp == 0; }
-
- bool got_teleported;
- 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;
v3f eye_offset_first;
v3f eye_offset_third;
@@ -347,67 +159,30 @@ public:
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 protocol_version;
u16 peer_id;
std::string inventory_formspec;
PlayerControl control;
- PlayerControl getPlayerControl()
- {
- return control;
- }
+ const PlayerControl& getPlayerControl() { return control; }
u32 keyPressed;
-
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;
- std::string hud_hotbar_image;
- std::string hud_hotbar_selected_image;
protected:
- IGameDef *m_gamedef;
-
char m_name[PLAYERNAME_SIZE];
- u16 m_breath;
- f32 m_pitch;
- f32 m_yaw;
v3f m_speed;
- v3f m_position;
- aabb3f m_collisionbox;
-
- bool m_dirty;
std::vector<HudElement *> hud;
-
- std::string m_sky_type;
- video::SColor m_sky_bgcolor;
- std::vector<std::string> m_sky_params;
-
- bool m_day_night_ratio_do_override;
- float m_day_night_ratio;
private:
// Protect some critical areas
// hud for example can be modified by EmergeThread
@@ -415,27 +190,5 @@ private:
Mutex m_mutex;
};
-
-/*
- Player on the server
-*/
-class RemotePlayer : public Player
-{
-public:
- RemotePlayer(IGameDef *gamedef, const char *name);
- 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;
-};
-
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:55:36 +0000