Merge branch 'master' into sqc_13_connexion_srv

This commit is contained in:
MarcEricMartel
2023-09-25 16:30:49 -04:00
8 changed files with 41 additions and 3 deletions

View File

@@ -38,12 +38,13 @@ private:
float GetScale() const;
int GetFps(float elapsedTime) const;
int GetCountdown(float elapsedTime);
bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
void DisplayCrosshair();
void DisplayCurrentItem();
void DisplayHud();
void DisplayHud(int timer);
void DisplayInfo(float elapsedTime, BlockType bloc);
void DrawHud(float elapsedTime, BlockType bloc);
void PrintText(float x, float y, float scale, const std::string& t);
@@ -71,8 +72,10 @@ private:
Bullet* m_bullets[MAX_BULLETS];
float m_scale;
float m_time = 0;
int m_renderCount = 0;
int m_countdown = COUNTDOWN;
bool m_wireframe = false;
bool m_isSkybox = true;
@@ -81,6 +84,8 @@ private:
bool m_displayCrosshair = true;
bool m_displayHud = true;
bool m_displayInfo = false;
bool m_resetcountdown = false;
bool m_stopcountdown = false;
bool m_keyW = false;
bool m_keyA = false;