godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #106180 from ogapo/2d-camera-limits-fix 

Improved Camera2D limits handling when limits are smaller than screen rect
This commit is contained in:
Thaddeus Crews 2025-05-20 11:37:21 -05:00
parent d82d9c30fd 5afb64e167
commit 51080b218b
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
scene/2d/camera_2d.cpp
View File

@ -219,20 +219,28 @@ Transform2D Camera2D::get_camera_transform() {
Rect2 screen_rect(-screen_offset + camera_pos, screen_size * zoom_scale);
if (limit_enabled && limit_smoothing_enabled) {
if (screen_rect.position.x < limit[SIDE_LEFT]) {
// Apply horizontal limiting.
if (screen_rect.size.x > limit[SIDE_RIGHT] - limit[SIDE_LEFT]) {
// Split the limit difference horizontally.
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]) {
// Only apply left limit.
camera_pos.x -= screen_rect.position.x - limit[SIDE_LEFT];
}
if (screen_rect.position.x + screen_rect.size.x > limit[SIDE_RIGHT]) {
} else if (screen_rect.position.x + screen_rect.size.x > limit[SIDE_RIGHT]) {
// Only apply the right limit.
camera_pos.x -= screen_rect.position.x + screen_rect.size.x - limit[SIDE_RIGHT];
}
if (screen_rect.position.y + screen_rect.size.y > limit[SIDE_BOTTOM]) {
camera_pos.y -= screen_rect.position.y + screen_rect.size.y - limit[SIDE_BOTTOM];
}
if (screen_rect.position.y < limit[SIDE_TOP]) {
// Apply vertical limiting.
if (screen_rect.size.y > limit[SIDE_BOTTOM] - limit[SIDE_TOP]) {
// Split the limit difference vertically.
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]) {
// Only apply the top limit.
camera_pos.y -= screen_rect.position.y - limit[SIDE_TOP];
} else if (screen_rect.position.y + screen_rect.size.y > limit[SIDE_BOTTOM]) {
// Only apply the bottom limit.
camera_pos.y -= screen_rect.position.y + screen_rect.size.y - limit[SIDE_BOTTOM];
}
}
@ -273,20 +281,28 @@ Transform2D Camera2D::get_camera_transform() {
if (limit_enabled && (!position_smoothing_enabled || !limit_smoothing_enabled)) {
Point2 bottom_right_corner = Point2(screen_rect.position + 2.0 * (camera_pos - screen_rect.position));
if (screen_rect.position.x < limit[SIDE_LEFT]) {
// Apply horizontal limiting.
if (bottom_right_corner.x - screen_rect.position.x > limit[SIDE_RIGHT] - limit[SIDE_LEFT]) {
// 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;
} else if (screen_rect.position.x < limit[SIDE_LEFT]) {
// Only apply left limit.
screen_rect.position.x = limit[SIDE_LEFT];
}
if (bottom_right_corner.x > limit[SIDE_RIGHT]) {
} else if (bottom_right_corner.x > limit[SIDE_RIGHT]) {
// Only apply right limit.
screen_rect.position.x = limit[SIDE_RIGHT] - (bottom_right_corner.x - screen_rect.position.x);
}
if (bottom_right_corner.y > limit[SIDE_BOTTOM]) {
screen_rect.position.y = limit[SIDE_BOTTOM] - (bottom_right_corner.y - screen_rect.position.y);
}
if (screen_rect.position.y < limit[SIDE_TOP]) {
// Apply vertical limiting.
if (bottom_right_corner.y - screen_rect.position.y > limit[SIDE_BOTTOM] - limit[SIDE_TOP]) {
// Split the limit difference vertically.
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]) {
// Only apply the top limit.
screen_rect.position.y = limit[SIDE_TOP];
} else if (bottom_right_corner.y > limit[SIDE_BOTTOM]) {
// Only apply the bottom limit.
screen_rect.position.y = limit[SIDE_BOTTOM] - (bottom_right_corner.y - screen_rect.position.y);
}
}