diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index e5d97d1..2f872e7 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -156,7 +156,7 @@ void Engine::DrawMenu() glVertex2i(0, 200); glEnd();*/ - /*MenuOptionsTexture.Bind(); + MenuOptionsTexture.Bind(); glTranslated(0, -100, 0); glBegin(GL_QUADS); glTexCoord2f(0, 0); @@ -167,7 +167,7 @@ void Engine::DrawMenu() glVertex2i(sButton, 200); glTexCoord2f(0, 1); glVertex2i(0, 200); - glEnd();*/ + glEnd(); MenuQuitTexture.Bind(); glTranslated(0, -100, 0); @@ -185,7 +185,7 @@ void Engine::DrawMenu() } else { - /*MenuOptionsTexture.Bind(); + MenuOptionsTexture.Bind(); glTranslated(200, 0, 0); glBegin(GL_QUADS); glTexCoord2f(0, 0); @@ -198,7 +198,7 @@ void Engine::DrawMenu() glVertex2i(0, 200); glEnd(); - WireFrameTexture.Bind(); + /*WireFrameTexture.Bind(); glTranslated(0, 300, 0); glBegin(GL_QUADS); glTexCoord2f(0, 0); @@ -209,9 +209,9 @@ void Engine::DrawMenu() glVertex2i(sButton, 200); glTexCoord2f(0, 1); glVertex2i(0, 200); - glEnd(); + glEnd();*/ - OnOffBtnTexture.Bind(); + /*OnOffBtnTexture.Bind(); glTranslated(200, 0, 0); glBegin(GL_QUADS); glTexCoord2f(0, 0); @@ -223,7 +223,7 @@ void Engine::DrawMenu() glTexCoord2f(0, 1); glVertex2i(0, 200); glEnd(); - glTranslated(-400, -300, 0); + glTranslated(-400, -300, 0);*/ MusicTexture.Bind(); glTranslated(200, 200, 0); @@ -262,7 +262,7 @@ void Engine::DrawMenu() glVertex2i(sButton, 200); glTexCoord2f(0, 1); glVertex2i(0, 200); - glEnd();*/ + glEnd(); } //glEnable(GL_LIGHTING); @@ -1321,7 +1321,7 @@ void Engine::MousePressEvent(const MOUSE_BUTTON& button, int x, int y) { if ((m_mousemx >= 285 && m_mousemx <= 490) && (m_mousemy >= 150 && m_mousemy <= 250)) m_gamestate = GameState::SINGLEMULTI; if ((m_mousemx >= 305 && m_mousemx <= 450) && (m_mousemy >= 300 && m_mousemy <= 400)) - m_gamestate = GameState::QUIT; + m_gamestate = GameState::OPTIONS; } else if (m_gamestate == GameState::SINGLEMULTI) { diff --git a/SQCSim2021/engine.h b/SQCSim2021/engine.h index 6aa4f89..543daf3 100644 --- a/SQCSim2021/engine.h +++ b/SQCSim2021/engine.h @@ -98,6 +98,9 @@ private: Texture MenuQuitTexture; Texture MenuOptionsTexture; Texture SplachScreenTexture; + Texture MusicTexture; //TODO + Texture OnOffBtnTexture;//TODO + Texture BackBtnTexture;//TODO float m_scale; float m_time = 0;