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

Push reajustements apres merge 31

Browse Source
This commit is contained in:
mduval76 2023-11-27 17:07:51 -05:00
parent b23b2c6838
commit 6db90a3a16
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SQCSim2021/engine.cpp
View File

@ -322,18 +322,6 @@ void Engine::DrawOption()
ShowCursor(); ShowCursor();
} }
void Engine::Init() {
glDisable(GL_BLEND);
glEnable(GL_DEPTH_TEST);
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
ShowCursor();
}
void Engine::Init() { void Engine::Init() {
GLenum glewErr = glewInit(); GLenum glewErr = glewInit();
@ -1323,10 +1311,6 @@ void Engine::Render(float elapsedTime) {
{ {
DrawOption(); DrawOption();
} }
else if (m_gamestate == GameState::PAUSE)
{
DrawPause();
}
else if (m_gamestate == GameState::QUIT) else if (m_gamestate == GameState::QUIT)
Stop(); Stop();
} }

2
SQCSim2021/engine.h
View File

@ -107,7 +107,7 @@ private:
std::chrono::high_resolution_clock::time_point m_startTime; std::chrono::high_resolution_clock::time_point m_startTime;
//Menu //Menu
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY,SINGLEMULTI }; enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE, SINGLEMULTI };
GameState m_gamestate = GameState::MAIN_MENU; GameState m_gamestate = GameState::MAIN_MENU;
Texture MenuTitleTexture; Texture MenuTitleTexture;