Merge pull request #4380 from bojidar-bg/camera2d-fix-zoom

Fix Camera2D ignoring zoom when checking limits
This commit is contained in:
Rémi Verschelde 2016-04-19 20:48:59 +02:00
commit 6da39ce18d

View file

@ -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;