Merge branch 'master' into SQC19_Booster
This commit is contained in:
		| @@ -13,6 +13,8 @@ public: | ||||
| 	enum Booster { SPEED, HEAL, DAMAGE, INVINCIBLE }; | ||||
|  | ||||
| 	Player(const Vector3f& position, float rotX = 0, float rotY = 0); | ||||
| 	~Player(); | ||||
|  | ||||
| 	void TurnLeftRight(float value); | ||||
| 	void TurnTopBottom(float value); | ||||
| 	Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime); | ||||
| @@ -28,12 +30,15 @@ public: | ||||
| 	float GetHP() const; | ||||
| 	void Teleport(int& x, int& z); | ||||
|  | ||||
| private: | ||||
| 	uint64_t getId() const; | ||||
|  | ||||
| protected: | ||||
| 	Vector3f m_position; | ||||
| 	Vector3f m_velocity; | ||||
| 	Vector3f m_direction; | ||||
|  | ||||
| 	std::string m_username; | ||||
| 	uint64_t id = 0; | ||||
|  | ||||
| 	float m_rotX = 0;  | ||||
| 	float m_rotY = 0; | ||||
| @@ -48,6 +53,8 @@ private: | ||||
| 	bool boostspeed; | ||||
| 	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