Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Viewport stretch transform was calculated incorrectly #60706

Closed
wants to merge 1 commit into from
Closed

Viewport stretch transform was calculated incorrectly #60706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions scene/main/viewport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3922,7 +3922,7 @@ Viewport::~Viewport() {
/////////////////////////////////

void SubViewport::set_size(const Size2i &p_size) {
_set_size(p_size, _get_size_2d_override(), Rect2i(), _stretch_transform(), true);
_set_size(p_size, _get_size_2d_override(), Rect2i(), _stretch_transform(p_size, _get_size_2d_override()), true);

SubViewportContainer *c = Object::cast_to<SubViewportContainer>(get_parent());
if (c) {
Expand All @@ -3935,7 +3935,7 @@ Size2i SubViewport::get_size() const {
}

void SubViewport::set_size_2d_override(const Size2i &p_size) {
_set_size(_get_size(), p_size, Rect2i(), _stretch_transform(), true);
_set_size(_get_size(), p_size, Rect2i(), _stretch_transform(_get_size(), p_size), true);
}

Size2i SubViewport::get_size_2d_override() const {
Expand All @@ -3948,7 +3948,7 @@ void SubViewport::set_size_2d_override_stretch(bool p_enable) {
}

size_2d_override_stretch = p_enable;
_set_size(_get_size(), _get_size_2d_override(), Rect2i(), _stretch_transform(), true);
_set_size(_get_size(), _get_size_2d_override(), Rect2i(), _stretch_transform(_get_size(), _get_size_2d_override()), true);
}

bool SubViewport::is_size_2d_override_stretch_enabled() const {
Expand Down Expand Up @@ -3977,14 +3977,11 @@ DisplayServer::WindowID SubViewport::get_window_id() const {
return DisplayServer::INVALID_WINDOW_ID;
}

Transform2D SubViewport::_stretch_transform() {
Transform2D SubViewport::_stretch_transform(const Size2i &p_size, const Size2i &p_view_size_2d_override) {
Transform2D transform = Transform2D();
Size2i view_size_2d_override = _get_size_2d_override();
if (size_2d_override_stretch && view_size_2d_override.width > 0 && view_size_2d_override.height > 0) {
Size2 scale = _get_size() / view_size_2d_override;
transform.scale(scale);
if (size_2d_override_stretch && p_view_size_2d_override.width > 0 && p_view_size_2d_override.height > 0) {
transform.scale(Vector2(p_size) / p_view_size_2d_override);
}

return transform;
}

Expand Down
2 changes: 1 addition & 1 deletion scene/main/viewport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ class SubViewport : public Viewport {
protected:
static void _bind_methods();
virtual DisplayServer::WindowID get_window_id() const override;
Transform2D _stretch_transform();
Transform2D _stretch_transform(const Size2i &p_size, const Size2i &p_view_size_2d_override);
void _notification(int p_what);

public:
Expand Down