diff options
Diffstat (limited to 'yage')
-rw-r--r-- | yage/CMakeLists.txt | 3 | ||||
-rw-r--r-- | yage/core/camera2d.cpp | 6 | ||||
-rw-r--r-- | yage/core/camera2d.h | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/yage/CMakeLists.txt b/yage/CMakeLists.txt deleted file mode 100644 index b28b04f6..00000000 --- a/yage/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/yage/core/camera2d.cpp b/yage/core/camera2d.cpp index 89d41ab5..463dd0d2 100644 --- a/yage/core/camera2d.cpp +++ b/yage/core/camera2d.cpp @@ -14,14 +14,14 @@ namespace yage { -Camera2D::Camera2D(int screen_width, int screen_height) +Camera::Camera(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) +void Camera::update(GlslProgram &program) { if (update_matrix_) { glm::vec3 translate(-position_.x, -position_.y, 0.f); @@ -37,7 +37,7 @@ void Camera2D::update(GlslProgram &program) glUniformMatrix4fv(matrix_location, 1, GL_FALSE, &(camera_matrix_[0][0])); } -void Camera2D::move(const glm::vec2 &direction) +void Camera::move(const glm::vec2 &direction) { position_ += direction; update_matrix_ = true; diff --git a/yage/core/camera2d.h b/yage/core/camera2d.h index db941aee..109333d6 100644 --- a/yage/core/camera2d.h +++ b/yage/core/camera2d.h @@ -17,7 +17,7 @@ namespace yage class GlslProgram; -class Camera2D +class Camera { private: bool update_matrix_ = true; @@ -27,7 +27,7 @@ private: glm::mat4 ortho_matrix_; public: - Camera2D(int screen_width = 1280, int screen_height = 720); + Camera(int screen_width = 1280, int screen_height = 720); void update(GlslProgram &program); void move(const glm::vec2 &direction); |