memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'SQC19_Booster' into online_boosts

Browse Source
This commit is contained in:
MarcEricMartel
2023-12-18 11:19:52 -05:00
parent cf831e339f f2c5f8b636
commit 68d03c1eac
15 changed files with 216 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SQCSim-common/player.h
View File

@@ -4,6 +4,8 @@
#include <cmath>
#include "transformation.h"
#include "vector3.h"
#include "booster.h"
#include "define.h"
class World;
@@ -11,7 +13,7 @@ class World;
class Player {
public:
enum Sound { NOSOUND, STEP, FALL };
enum Booster { SPEED, HEAL, DAMAGE, INVINCIBLE };
//enum BoosterType { SPEED, HEAL, DAMAGE, INVINCIBLE };
Player(const Vector3f& position, float rotX = 0, float rotY = 0);
~Player();
@@ -19,8 +21,9 @@ public:
void TurnLeftRight(float value, float sensitivity);
void TurnTopBottom(float value, float sensitivity);
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 GetBooster(Booster boosttype);
Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime, Booster booster_table[]);
void TakeBooster(Booster booster_table[], float elapsedTime);
void GetBooster(BOOST_TYPE boosttype, float elapsedTime);
void RemoveBooster(float elapsedtime);
void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;
@@ -50,9 +53,9 @@ public:
bool Eulogy = false;
bool boostspeed;
bool boostdamage;
bool boostinvincible;
bool boostspeed = false;
bool boostdamage = false;
bool boostinvincible = false;
private:
uint64_t getId() const;
@@ -77,7 +80,6 @@ protected:
bool m_airborne;
Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
};
#endif //_PLAYER_H__