[FIXED] merge

This commit is contained in:
Menno
2021-05-28 16:12:51 +02:00
parent 1ef0d87437
commit ef058b0087
5 changed files with 0 additions and 64 deletions

View File

@@ -49,14 +49,9 @@ int main(void)
current_scene = new scene::Startup_Scene();
glfwSetKeyCallback(window, [](GLFWwindow* window, int key, int scancode, int action, int mods)
{
current_scene->onKey(window, key, scancode, action, mods);
if (key == GLFW_KEY_ESCAPE)
glfwSetWindowShouldClose(window, true);
});
bool window_open = true;
@@ -90,7 +85,6 @@ int main(void)
// Clean up -> preventing memory leaks!!!
std::cout << "ending..." << std::endl;
delete current_scene;
glfwTerminate();
return 0;
}