Merge branch 'SQC-15_animation' into SQC19_Booster
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
#include "transformation.h"
|
||||
#include "vector3.h"
|
||||
|
||||
|
||||
class World;
|
||||
|
||||
class Player {
|
||||
@@ -19,9 +20,11 @@ public:
|
||||
void TurnTopBottom(float value);
|
||||
Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime);
|
||||
Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime);
|
||||
void ApplyTransformation(Transformation& transformation, bool rel = true) const;
|
||||
void GetBooster(Booster boosttype);
|
||||
void RemoveBooster(float elapsedtime);
|
||||
void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;
|
||||
|
||||
void SetDirection(Vector3f dir);
|
||||
Vector3f GetPosition() const;
|
||||
Vector3f GetDirection() const;
|
||||
Vector3f GetVelocity() const;
|
||||
@@ -30,6 +33,10 @@ public:
|
||||
float GetHP() const;
|
||||
void Teleport(int& x, int& z);
|
||||
|
||||
bool AmIDead();
|
||||
void InflictDamage(float hitPoints);
|
||||
|
||||
private:
|
||||
uint64_t getId() const;
|
||||
|
||||
protected:
|
||||
@@ -54,6 +61,8 @@ protected:
|
||||
bool boostdamage;
|
||||
bool boostinvincible;
|
||||
|
||||
|
||||
|
||||
Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
|
||||
};
|
||||
#endif //_PLAYER_H__
|
||||
|
Reference in New Issue
Block a user