diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-08-24 00:25:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-24 00:25:31 +0100 |
commit | a326354ea6fccf76665a4212bf14daeba0f52ec8 (patch) | |
tree | 18cd2deb0c30b38d8ca7c5305735d2323259e020 /src/camera2d.cpp | |
parent | 0a49874288f92c120d7e165550eb6dbbe1ef7307 (diff) | |
parent | 5403490b941f7c031bf1aafdb91b1098f69edbf2 (diff) | |
download | YAGE-a326354ea6fccf76665a4212bf14daeba0f52ec8.tar.gz YAGE-a326354ea6fccf76665a4212bf14daeba0f52ec8.zip |
Merge pull request #3 from ymherklotz/developv0.1.0
Merge develop to master
Diffstat (limited to 'src/camera2d.cpp')
-rw-r--r-- | src/camera2d.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/camera2d.cpp b/src/camera2d.cpp index 690ac98d..9f210ddc 100644 --- a/src/camera2d.cpp +++ b/src/camera2d.cpp @@ -10,15 +10,18 @@ #include <GL/glew.h> -namespace yage { +namespace yage +{ Camera2D::Camera2D(int screen_width, int screen_height) - : position_(0.f, 0.f), - camera_matrix_(1.f), + : position_(0.f, 0.f), camera_matrix_(1.f), ortho_matrix_( - glm::ortho(0.f, (float)screen_width, 0.f, (float)screen_height)) {} + glm::ortho(0.f, (float)screen_width, 0.f, (float)screen_height)) +{ +} -void Camera2D::update(GlslProgram& program) { +void Camera2D::update(GlslProgram &program) +{ if (matrix_needs_update_) { glm::vec3 translate(-position_.x, -position_.y, 0.f); glm::vec3 scale(scale_, scale_, 0.f); @@ -33,9 +36,10 @@ void Camera2D::update(GlslProgram& program) { glUniformMatrix4fv(matrix_location, 1, GL_FALSE, &(camera_matrix_[0][0])); } -void Camera2D::move(const glm::vec2& direction) { +void Camera2D::move(const glm::vec2 &direction) +{ position_ += direction; matrix_needs_update_ = true; } -} // yage +} // yage |