From 3f83c3a0ac95f42b1fcc22480a8190f7eedc698c Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Thu, 28 Jul 2022 15:29:38 +0100 Subject: When Camera2D enters tree, ensure first update is not lost --- scene/2d/camera_2d.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scene/2d') diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 76b354805c..ade8534112 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -247,8 +247,8 @@ void Camera2D::_notification(int p_what) { add_to_group(canvas_group_name); _update_process_callback(); - _update_scroll(); first = true; + _update_scroll(); } break; case NOTIFICATION_EXIT_TREE: { -- cgit v1.2.3 From e61dc6bb0498e2c93d510be6c1f7e38fd94ae052 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Thu, 28 Jul 2022 15:32:45 +0100 Subject: Ensure changes to Camera2D's limits don't affect smoothed_camera_pos --- scene/2d/camera_2d.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scene/2d') diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index ade8534112..c43a796170 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -439,7 +439,9 @@ void Camera2D::clear_current() { void Camera2D::set_limit(Side p_side, int p_limit) { ERR_FAIL_INDEX((int)p_side, 4); limit[p_side] = p_limit; + Point2 old_smoothed_camera_pos = smoothed_camera_pos; _update_scroll(); + smoothed_camera_pos = old_smoothed_camera_pos; } int Camera2D::get_limit(Side p_side) const { -- cgit v1.2.3