diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-19 20:48:59 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-19 20:48:59 +0200 |
| commit | 6da39ce18de976cbf101292aabb598de2e4f6648 (patch) | |
| tree | 8c76a0591afc7e049aeca3f9e0275593844365d1 | |
| parent | 1566da2a6f4761aca1b9243cc45283e0ef8ff3b6 (diff) | |
| parent | 7a8aea0be9186e9b47b28ca3d2999d7182a73d2b (diff) | |
Merge pull request #4380 from bojidar-bg/camera2d-fix-zoom
Fix Camera2D ignoring zoom when checking limits
| -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 39d2367bc0..68d8b09e04 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -144,7 +144,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; |