Merge branch 'master' into sqc-20_audiobullet

This commit is contained in:
MarcEricMartel
2023-10-16 17:43:32 -04:00
committed by GitHub
19 changed files with 483 additions and 134 deletions

View File

@@ -24,6 +24,7 @@ class Engine : public OpenglContext {
public:
Engine();
virtual ~Engine();
virtual void DrawMenu();
virtual void Init();
virtual void DeInit();
virtual void LoadResource();
@@ -78,6 +79,15 @@ private:
Bullet* m_bullets[MAX_BULLETS];
//Menu
enum class GameState { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
GameState m_gamestate = GameState::MAIN_MENU;
Texture MenuTitleTexture;
Texture MenuBGTexture;
Texture MenuStartTexture;
Texture MenuQuitTexture;
Texture MenuOptionsTexture;
float m_scale;
float m_time = 0;
@@ -106,6 +116,9 @@ private:
bool m_mouseC = false;
bool m_mouseWU = false;
bool m_mouseWD = false;
//Pour trouver ou est la souris
float m_mousemx = 0;
float m_mousemy = 0;
std::string m_messageNotification = "";
};