aboutsummaryrefslogtreecommitdiffstats
path: root/yage/core/window.cpp
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2018-06-22 00:14:10 +0100
committerGitHub <noreply@github.com>2018-06-22 00:14:10 +0100
commitb1673de1b46bd2e566b7c66197ad989d0323f061 (patch)
tree2cbfdab552025af7a8772069b9f9935f9c9f387f /yage/core/window.cpp
parent39ef9c1cbe660a8369a33eb0ba13cc15be4cfa15 (diff)
parent3702e753a5f7b31c31261c968757e19e808a84ec (diff)
downloadYAGE-b1673de1b46bd2e566b7c66197ad989d0323f061.tar.gz
YAGE-b1673de1b46bd2e566b7c66197ad989d0323f061.zip
Merge pull request #19 from ymherklotz/develop
Develop
Diffstat (limited to 'yage/core/window.cpp')
-rw-r--r--yage/core/window.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/yage/core/window.cpp b/yage/core/window.cpp
index 25f9f834..392d4363 100644
--- a/yage/core/window.cpp
+++ b/yage/core/window.cpp
@@ -61,6 +61,7 @@ void Window::create(std::string window_name, int width, int height)
// set key callback
glfwSetKeyCallback(window_, key_callback);
+
// set resize callback
glfwSetFramebufferSizeCallback(window_, framebuffer_size_callback);
@@ -108,7 +109,7 @@ void Window::pollEvents() const
glfwPollEvents();
}
-bool Window::keyPressed(key k)
+bool Window::keyPressed(key k) const
{
if (window_ == nullptr) {
throw runtime_error("Window is not initialized");