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

merge conflict

Browse Source
This commit is contained in:
Frederic Leger
2023-12-15 15:40:13 -05:00
parent 77a982b1fa
commit 570bef266c
8 changed files with 169 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SQCSim-common/player.h
View File

@@ -4,6 +4,8 @@
#include <cmath>
#include "transformation.h"
#include "vector3.h"
#include "../SQCSim2021/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[]);
void GetBooster(BOOST_TYPE boosttype);
void RemoveBooster(float elapsedtime);
void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;