mini-push
This commit is contained in:
parent
3ca941f0ce
commit
75a32270b5
@ -156,7 +156,7 @@ void Engine::DrawMenu()
|
|||||||
glVertex2i(0, 200);
|
glVertex2i(0, 200);
|
||||||
glEnd();*/
|
glEnd();*/
|
||||||
|
|
||||||
/*MenuOptionsTexture.Bind();
|
MenuOptionsTexture.Bind();
|
||||||
glTranslated(0, -100, 0);
|
glTranslated(0, -100, 0);
|
||||||
glBegin(GL_QUADS);
|
glBegin(GL_QUADS);
|
||||||
glTexCoord2f(0, 0);
|
glTexCoord2f(0, 0);
|
||||||
@ -167,7 +167,7 @@ void Engine::DrawMenu()
|
|||||||
glVertex2i(sButton, 200);
|
glVertex2i(sButton, 200);
|
||||||
glTexCoord2f(0, 1);
|
glTexCoord2f(0, 1);
|
||||||
glVertex2i(0, 200);
|
glVertex2i(0, 200);
|
||||||
glEnd();*/
|
glEnd();
|
||||||
|
|
||||||
MenuQuitTexture.Bind();
|
MenuQuitTexture.Bind();
|
||||||
glTranslated(0, -100, 0);
|
glTranslated(0, -100, 0);
|
||||||
@ -185,7 +185,7 @@ void Engine::DrawMenu()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/*MenuOptionsTexture.Bind();
|
MenuOptionsTexture.Bind();
|
||||||
glTranslated(200, 0, 0);
|
glTranslated(200, 0, 0);
|
||||||
glBegin(GL_QUADS);
|
glBegin(GL_QUADS);
|
||||||
glTexCoord2f(0, 0);
|
glTexCoord2f(0, 0);
|
||||||
@ -198,7 +198,7 @@ void Engine::DrawMenu()
|
|||||||
glVertex2i(0, 200);
|
glVertex2i(0, 200);
|
||||||
glEnd();
|
glEnd();
|
||||||
|
|
||||||
WireFrameTexture.Bind();
|
/*WireFrameTexture.Bind();
|
||||||
glTranslated(0, 300, 0);
|
glTranslated(0, 300, 0);
|
||||||
glBegin(GL_QUADS);
|
glBegin(GL_QUADS);
|
||||||
glTexCoord2f(0, 0);
|
glTexCoord2f(0, 0);
|
||||||
@ -209,9 +209,9 @@ void Engine::DrawMenu()
|
|||||||
glVertex2i(sButton, 200);
|
glVertex2i(sButton, 200);
|
||||||
glTexCoord2f(0, 1);
|
glTexCoord2f(0, 1);
|
||||||
glVertex2i(0, 200);
|
glVertex2i(0, 200);
|
||||||
glEnd();
|
glEnd();*/
|
||||||
|
|
||||||
OnOffBtnTexture.Bind();
|
/*OnOffBtnTexture.Bind();
|
||||||
glTranslated(200, 0, 0);
|
glTranslated(200, 0, 0);
|
||||||
glBegin(GL_QUADS);
|
glBegin(GL_QUADS);
|
||||||
glTexCoord2f(0, 0);
|
glTexCoord2f(0, 0);
|
||||||
@ -223,7 +223,7 @@ void Engine::DrawMenu()
|
|||||||
glTexCoord2f(0, 1);
|
glTexCoord2f(0, 1);
|
||||||
glVertex2i(0, 200);
|
glVertex2i(0, 200);
|
||||||
glEnd();
|
glEnd();
|
||||||
glTranslated(-400, -300, 0);
|
glTranslated(-400, -300, 0);*/
|
||||||
|
|
||||||
MusicTexture.Bind();
|
MusicTexture.Bind();
|
||||||
glTranslated(200, 200, 0);
|
glTranslated(200, 200, 0);
|
||||||
@ -262,7 +262,7 @@ void Engine::DrawMenu()
|
|||||||
glVertex2i(sButton, 200);
|
glVertex2i(sButton, 200);
|
||||||
glTexCoord2f(0, 1);
|
glTexCoord2f(0, 1);
|
||||||
glVertex2i(0, 200);
|
glVertex2i(0, 200);
|
||||||
glEnd();*/
|
glEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
//glEnable(GL_LIGHTING);
|
//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))
|
if ((m_mousemx >= 285 && m_mousemx <= 490) && (m_mousemy >= 150 && m_mousemy <= 250))
|
||||||
m_gamestate = GameState::SINGLEMULTI;
|
m_gamestate = GameState::SINGLEMULTI;
|
||||||
if ((m_mousemx >= 305 && m_mousemx <= 450) && (m_mousemy >= 300 && m_mousemy <= 400))
|
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)
|
else if (m_gamestate == GameState::SINGLEMULTI)
|
||||||
{
|
{
|
||||||
|
@ -98,6 +98,9 @@ private:
|
|||||||
Texture MenuQuitTexture;
|
Texture MenuQuitTexture;
|
||||||
Texture MenuOptionsTexture;
|
Texture MenuOptionsTexture;
|
||||||
Texture SplachScreenTexture;
|
Texture SplachScreenTexture;
|
||||||
|
Texture MusicTexture; //TODO
|
||||||
|
Texture OnOffBtnTexture;//TODO
|
||||||
|
Texture BackBtnTexture;//TODO
|
||||||
|
|
||||||
float m_scale;
|
float m_scale;
|
||||||
float m_time = 0;
|
float m_time = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user