PolyGun/PolyGun
6
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: PolyGun:c45ee1b6ed48a190578cec441db6e72c2a61b492
Branches Tags
PolyGun:master
PolyGun:as
...
compare: PolyGun:bc914d7398a3abf878dce7f67b78611cb0e38165
Branches Tags
PolyGun:as
PolyGun:master

2 Commits
c45ee1b6ed ... bc914d7398

Author SHA1 Message Date
Looki2000
bc914d7398 Merge branch 'master' of http://git.cubesoftware.xyz:20524/kacperks/PolyGun 2023-05-06 20:08:56 +02:00
Looki2000
1f9dc57e11 fixed render going black when cursor is not captured 2023-05-06 20:08:49 +02:00
1 changed files with 10 additions and 7 deletions
Show Stats Expand all files Collapse all files

17
src/game/screens/game_session_screen.cpp
View File

@ -312,6 +312,7 @@ void GameSessionScreen::update(double delta) {
break;
case GameState::GAME_STATE_RUNNING:{
if (glfwGetKey(m_engine->get_window(), GLFW_KEY_ESCAPE) == GLFW_PRESS) {
// "if first frame of esc press"
if (!m_is_esc_pressed) {
if (glfwGetInputMode(m_engine->get_window(), GLFW_CURSOR) == GLFW_CURSOR_DISABLED)
glfwSetInputMode(m_engine->get_window(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
@ -333,27 +334,27 @@ void GameSessionScreen::update(double delta) {
if (glfwGetKey(m_engine->get_window(), GLFW_KEY_W) == GLFW_PRESS) {
m_camera.process_movement(polygun::engine::FORWARD, delta);
m_engine->get_mesh_renderer()->set_camera(&m_camera);
//m_engine->get_mesh_renderer()->set_camera(&m_camera);
}
if (glfwGetKey(m_engine->get_window(), GLFW_KEY_S) == GLFW_PRESS) {
m_camera.process_movement(polygun::engine::BACKWARD, delta);
m_engine->get_mesh_renderer()->set_camera(&m_camera);
//m_engine->get_mesh_renderer()->set_camera(&m_camera);
}
if (glfwGetKey(m_engine->get_window(), GLFW_KEY_A) == GLFW_PRESS) {
m_camera.process_movement(polygun::engine::LEFT, delta);
m_engine->get_mesh_renderer()->set_camera(&m_camera);
//m_engine->get_mesh_renderer()->set_camera(&m_camera);
}
if (glfwGetKey(m_engine->get_window(), GLFW_KEY_D) == GLFW_PRESS) {
m_camera.process_movement(polygun::engine::RIGHT, delta);
m_engine->get_mesh_renderer()->set_camera(&m_camera);
//m_engine->get_mesh_renderer()->set_camera(&m_camera);
}
if (glfwGetKey(m_engine->get_window(), GLFW_KEY_SPACE) == GLFW_PRESS) {
m_camera.process_movement(polygun::engine::UP, delta);
m_engine->get_mesh_renderer()->set_camera(&m_camera);
//m_engine->get_mesh_renderer()->set_camera(&m_camera);
}
if (glfwGetKey(m_engine->get_window(), GLFW_KEY_LEFT_CONTROL) == GLFW_PRESS) {
m_camera.process_movement(polygun::engine::DOWN, delta);
m_engine->get_mesh_renderer()->set_camera(&m_camera);
//m_engine->get_mesh_renderer()->set_camera(&m_camera);
}
if(glfwGetInputMode(m_engine->get_window(), GLFW_CURSOR) == GLFW_CURSOR_DISABLED) {
@ -363,8 +364,10 @@ void GameSessionScreen::update(double delta) {
}
else
m_camera.update(false);
m_engine->get_mesh_renderer()->set_camera(&m_camera);
}
m_engine->get_mesh_renderer()->set_camera(&m_camera);
break;
}
}