godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Camera2D ignoring zoom when checking limits 

Closes #1912
This commit is contained in:
Bojidar Marinov 2016-04-19 21:32:26 +03:00
parent a3fbabf4a1
commit 7a8aea0be9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/2d/camera_2d.cpp
View File

@ -145,7 +145,7 @@ Matrix32 Camera2D::get_camera_transform() {
screen_offset = screen_offset.rotated(angle); 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]) if (screen_rect.pos.x + screen_rect.size.x > limit[MARGIN_RIGHT])
screen_rect.pos.x = limit[MARGIN_RIGHT] - screen_rect.size.x; screen_rect.pos.x = limit[MARGIN_RIGHT] - screen_rect.size.x;