diff options
author | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2016-04-19 21:32:26 +0300 |
---|---|---|
committer | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2016-04-19 21:35:02 +0300 |
commit | 7a8aea0be9186e9b47b28ca3d2999d7182a73d2b (patch) | |
tree | 770c37daecdf7a1d201c69294bbdd686db9462ca | |
parent | a3fbabf4a1a4b2fd5cfad3802b93ffd5a851feb2 (diff) |
Fix Camera2D ignoring zoom when checking limits
Closes #1912
-rw-r--r-- | scene/2d/camera_2d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 67c1733759..ea0fe2b0d6 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -145,7 +145,7 @@ Matrix32 Camera2D::get_camera_transform() { screen_offset = screen_offset.rotated(angle); } - Rect2 screen_rect(-screen_offset+ret_camera_pos,screen_size); + Rect2 screen_rect(-screen_offset+ret_camera_pos,screen_size*zoom); if (screen_rect.pos.x + screen_rect.size.x > limit[MARGIN_RIGHT]) screen_rect.pos.x = limit[MARGIN_RIGHT] - screen_rect.size.x; |