sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop into master #9

Merged
SemvdH merged 126 commits from develop into main 2021-06-18 15:56:41 +00:00
Conversation 4 Commits 126 Files Changed 73 +12 -10
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a204dbbc18 - Show all commits

14
src/scenes/in_Game_Scene.cpp
View File

@@ -177,21 +177,23 @@ namespace scene
gui::Button pause_button_resume(render_engine::loader::LoadTexture("res/menu_item_start1.png"), glm::vec2(0.0f, 0.3f), glm::vec2(0.25f, 0.25f));
pause_button_resume.SetHoverTexture(render_engine::loader::LoadTexture("res/menu_item_start1_hover.png"));
pause_button_resume.SetClickedTexture(render_engine::loader::LoadTexture("res/menu_item_start1_click.png"));
pause_button_resume.SetOnClickAction([]()
std::function<void()> resume_fun = [this]()
{
std::cout << "I got clicked on the resume button!" << std::endl;
//game_state = scene::Game_State::RUNNING;
});
game_state = scene::Game_State::RUNNING;
};
pause_button_resume.SetOnClickAction(resume_fun);
pause_guis.push_back(&pause_button_resume);
gui::Button pause_button_quit(render_engine::loader::LoadTexture("res/menu_item_quit1.png"), glm::vec2(0.0f, -0.3f), glm::vec2(0.25f, 0.25f));
pause_button_quit.SetHoverTexture(render_engine::loader::LoadTexture("res/menu_item_quit1_hover.png"));
pause_button_quit.SetClickedTexture(render_engine::loader::LoadTexture("res/menu_item_quit1_click.png"));
pause_button_quit.SetOnClickAction([]()
std::function<void()> stop_function = [this]()
{
std::cout << "I got clicked on the quit button!" << std::endl;
//return_value = scene::Scenes::STOP;
});
return_value = scene::Scenes::STOP;
};
pause_button_quit.SetOnClickAction(stop_function);
pause_guis.push_back(&pause_button_quit);
regions.push_back(&reg_left);