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

Merge branch 'master' into SQC-18_Mecanique_de_combat

Browse Source
This commit is contained in:
Jonathan Trottier
2023-10-30 14:37:58 -04:00
parent 6e75bec25c bbfc98ff12
commit 4df7cfbd5d
31 changed files with 1241 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SQCSim-common/player.cpp
View File

@@ -4,10 +4,12 @@
Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(position), m_rotX(rotX), m_rotY(rotY) {
m_velocity = Vector3f(0, 0, 0);
m_airborne = true;
m_hp = 1.0f; //TODO: Remettre <20> 1.0f
m_hp = 1.0f; //TODO: Remettre <20> 1.0f
m_username = "Zelda Bee-Bop56";
}
Player::~Player() {}
void Player::TurnLeftRight(float value) {
m_rotY += value;
if (m_rotY > 360) m_rotY = 0;
@@ -165,7 +167,7 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
m_position += m_velocity;
static float bobbingtime = 0; // Gestion de la cam<61>ra
static float bobbingtime = 0; // Gestion de la cam<61>ra
static bool leftright = false;
static bool isStep = false;
if (bobbingtime <= 360.f)
@@ -226,4 +228,9 @@ void Player::InflictDamage(float hitPoints)
}
uint64_t Player::getId() const { return id; }
Vector3f Player::InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now) {
return Vector3f();
}