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

Center camera2D with the proper viewport size

This commit is contained in:
Juan Linietsky 2016-09-15 08:17:23 -03:00
parent 08688931a1
commit 913925f106
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scene/2d/camera_2d.cpp
View File

@ -76,8 +76,9 @@ Matrix32 Camera2D::get_camera_transform() {
if (!get_tree()) if (!get_tree())
return Matrix32(); return Matrix32();
Size2 screen_size = get_viewport_rect().size; ERR_FAIL_COND_V( custom_viewport && !ObjectDB::get_instance(custom_viewport_id), Matrix32() );
screen_size=get_viewport_rect().size;
Size2 screen_size = viewport->get_visible_rect().size;
Point2 new_camera_pos = get_global_transform().get_origin(); Point2 new_camera_pos = get_global_transform().get_origin();
@ -446,8 +447,10 @@ void Camera2D::reset_smoothing() {
void Camera2D::align() { void Camera2D::align() {
Size2 screen_size = get_viewport_rect().size; ERR_FAIL_COND( custom_viewport && !ObjectDB::get_instance(custom_viewport_id) );
screen_size=get_viewport_rect().size;
Size2 screen_size = viewport->get_visible_rect().size;
Point2 current_camera_pos = get_global_transform().get_origin(); Point2 current_camera_pos = get_global_transform().get_origin();
if (anchor_mode==ANCHOR_MODE_DRAG_CENTER) { if (anchor_mode==ANCHOR_MODE_DRAG_CENTER) {
if (h_ofs<0) { if (h_ofs<0) {