From ab76770e75fe21c7a86133fdeb61162e24a79a18 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sun, 6 Aug 2017 17:03:05 +0100 Subject: Adding clang format with my style based on google --- src/camera2d.cpp | 54 +++++++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) (limited to 'src/camera2d.cpp') diff --git a/src/camera2d.cpp b/src/camera2d.cpp index 88b468de..690ac98d 100644 --- a/src/camera2d.cpp +++ b/src/camera2d.cpp @@ -10,36 +10,32 @@ #include -namespace yage -{ - -Camera2D::Camera2D(int screen_width, int screen_height) : - position_(0.f, 0.f), - camera_matrix_(1.f), - ortho_matrix_(glm::ortho(0.f, (float)screen_width, 0.f, (float)screen_height)) -{} - -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); - - camera_matrix_=glm::translate(ortho_matrix_, translate); - camera_matrix_=glm::scale(glm::mat4(1.f), scale)*camera_matrix_; - - matrix_needs_update_=false; - } - - GLint matrix_location = program.getUniformLocation("P"); - glUniformMatrix4fv(matrix_location, 1, GL_FALSE, &(camera_matrix_[0][0])); +namespace yage { + +Camera2D::Camera2D(int screen_width, int screen_height) + : position_(0.f, 0.f), + camera_matrix_(1.f), + ortho_matrix_( + glm::ortho(0.f, (float)screen_width, 0.f, (float)screen_height)) {} + +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); + + camera_matrix_ = glm::translate(ortho_matrix_, translate); + camera_matrix_ = glm::scale(glm::mat4(1.f), scale) * camera_matrix_; + + matrix_needs_update_ = false; + } + + GLint matrix_location = program.getUniformLocation("P"); + glUniformMatrix4fv(matrix_location, 1, GL_FALSE, &(camera_matrix_[0][0])); } -void Camera2D::move(const glm::vec2 &direction) -{ - position_+=direction; - matrix_needs_update_=true; +void Camera2D::move(const glm::vec2& direction) { + position_ += direction; + matrix_needs_update_ = true; } -} // yage +} // yage -- cgit