godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #111651 from zuedev/zuedev/issue-111587

Browse Source 
Fix Camera2D limit checks for inverted boundaries
This commit is contained in:
Rémi Verschelde
2025-11-01 19:05:24 +01:00
parent accf00c000 3d7b3fa0e4
commit 04a089d469
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/2d/camera_2d.cpp
View File

@@ -164,7 +164,7 @@ Transform2D Camera2D::get_camera_transform() {
if (limit_enabled && limit_smoothing_enabled) { if (limit_enabled && limit_smoothing_enabled) {
// Apply horizontal limiting. // Apply horizontal limiting.
if (screen_rect.size.x > limit[SIDE_RIGHT] - limit[SIDE_LEFT]) { if (limit[SIDE_LEFT] > limit[SIDE_RIGHT] - screen_rect.size.x) {
// Split the limit difference horizontally. // Split the limit difference horizontally.
camera_pos.x -= screen_rect.position.x + (screen_rect.size.x - limit[SIDE_RIGHT] - limit[SIDE_LEFT]) / 2; camera_pos.x -= screen_rect.position.x + (screen_rect.size.x - limit[SIDE_RIGHT] - limit[SIDE_LEFT]) / 2;
} else if (screen_rect.position.x < limit[SIDE_LEFT]) { } else if (screen_rect.position.x < limit[SIDE_LEFT]) {
@@ -176,7 +176,7 @@ Transform2D Camera2D::get_camera_transform() {
} }
// Apply vertical limiting. // Apply vertical limiting.
if (screen_rect.size.y > limit[SIDE_BOTTOM] - limit[SIDE_TOP]) { if (limit[SIDE_TOP] > limit[SIDE_BOTTOM] - screen_rect.size.y) {
// Split the limit difference vertically. // Split the limit difference vertically.
camera_pos.y -= screen_rect.position.y + (screen_rect.size.y - limit[SIDE_BOTTOM] - limit[SIDE_TOP]) / 2; camera_pos.y -= screen_rect.position.y + (screen_rect.size.y - limit[SIDE_BOTTOM] - limit[SIDE_TOP]) / 2;
} else if (screen_rect.position.y < limit[SIDE_TOP]) { } else if (screen_rect.position.y < limit[SIDE_TOP]) {
@@ -226,7 +226,7 @@ Transform2D Camera2D::get_camera_transform() {
if (limit_enabled && (!position_smoothing_enabled || !limit_smoothing_enabled)) { if (limit_enabled && (!position_smoothing_enabled || !limit_smoothing_enabled)) {
Point2 bottom_right_corner = Point2(screen_rect.position + 2.0 * (ret_camera_pos - screen_rect.position)); Point2 bottom_right_corner = Point2(screen_rect.position + 2.0 * (ret_camera_pos - screen_rect.position));
// Apply horizontal limiting. // Apply horizontal limiting.
if (bottom_right_corner.x - screen_rect.position.x > limit[SIDE_RIGHT] - limit[SIDE_LEFT]) { if (limit[SIDE_LEFT] > limit[SIDE_RIGHT] - (bottom_right_corner.x - screen_rect.position.x)) {
// Split the difference horizontally (center it). // Split the difference horizontally (center it).
screen_rect.position.x = (limit[SIDE_LEFT] + limit[SIDE_RIGHT] - (bottom_right_corner.x - screen_rect.position.x)) / 2; screen_rect.position.x = (limit[SIDE_LEFT] + limit[SIDE_RIGHT] - (bottom_right_corner.x - screen_rect.position.x)) / 2;
} else if (screen_rect.position.x < limit[SIDE_LEFT]) { } else if (screen_rect.position.x < limit[SIDE_LEFT]) {
@@ -238,7 +238,7 @@ Transform2D Camera2D::get_camera_transform() {
} }
// Apply vertical limiting. // Apply vertical limiting.
if (bottom_right_corner.y - screen_rect.position.y > limit[SIDE_BOTTOM] - limit[SIDE_TOP]) { if (limit[SIDE_TOP] > limit[SIDE_BOTTOM] - (bottom_right_corner.y - screen_rect.position.y)) {
// Split the limit difference vertically. // Split the limit difference vertically.
screen_rect.position.y = (limit[SIDE_TOP] + limit[SIDE_BOTTOM] - (bottom_right_corner.y - screen_rect.position.y)) / 2; screen_rect.position.y = (limit[SIDE_TOP] + limit[SIDE_BOTTOM] - (bottom_right_corner.y - screen_rect.position.y)) / 2;
} else if (screen_rect.position.y < limit[SIDE_TOP]) { } else if (screen_rect.position.y < limit[SIDE_TOP]) {