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

Jump to bottom

[3.x] Include the follow-viewport-transform into CanvasLayer transform calculations #70310

Merged
merged 1 commit into from Dec 22, 2022
Merged

[3.x] Include the follow-viewport-transform into CanvasLayer transform calculations #70310

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/classes/CanvasItem.xml
View file
Open in desktop
Expand Up @@ -289,7 +289,7 @@
<method name="get_canvas_transform" qualifiers="const">
<return type="Transform2D" />
<description>
Returns the transform matrix of this item's canvas.
Returns the transform from the coordinate system of the canvas, this item is in, to the [Viewport]s coordinate system.
</description>
</method>
<method name="get_global_mouse_position" qualifiers="const">
Expand All @@ -307,7 +307,7 @@
<method name="get_global_transform_with_canvas" qualifiers="const">
<return type="Transform2D" />
<description>
Returns the global transform matrix of this item in relation to the canvas.
Returns the transform from the local coordinate system of this [CanvasItem] to the [Viewport]s coordinate system.
</description>
</method>
<method name="get_local_mouse_position" qualifiers="const">
Expand All @@ -331,7 +331,7 @@
<method name="get_viewport_transform" qualifiers="const">
<return type="Transform2D" />
<description>
Returns this item's transform in relation to the viewport.
Returns the transform from the coordinate system of the canvas, this item is in, to the [Viewport]s embedders coordinate system.
</description>
</method>
<method name="get_world_2d" qualifiers="const">
Expand Down
6 changes: 6 additions & 0 deletions doc/classes/CanvasLayer.xml
View file
Open in desktop
Expand Up @@ -18,6 +18,12 @@
Returns the RID of the canvas used by this layer.
</description>
</method>
<method name="get_final_transform" qualifiers="const">
<return type="Transform2D" />
<description>
Returns the transform from the [CanvasLayer]s coordinate system to the [Viewport]s coordinate system.
</description>
</method>
<method name="hide">
<return type="void" />
<description>
Expand Down
8 changes: 4 additions & 4 deletions scene/2d/canvas_item.cpp
View file
Open in desktop
Expand Up @@ -466,7 +466,7 @@ void CanvasItem::_update_callback() {

Transform2D CanvasItem::get_global_transform_with_canvas() const {
if (canvas_layer) {
return canvas_layer->get_transform() * get_global_transform();
return canvas_layer->get_final_transform() * get_global_transform();
} else if (is_inside_tree()) {
return get_viewport()->get_canvas_transform() * get_global_transform();
} else {
Expand Down Expand Up @@ -1210,7 +1210,7 @@ Transform2D CanvasItem::get_canvas_transform() const {
ERR_FAIL_COND_V(!is_inside_tree(), Transform2D());

if (canvas_layer) {
return canvas_layer->get_transform();
return canvas_layer->get_final_transform();
} else if (Object::cast_to<CanvasItem>(get_parent())) {
return Object::cast_to<CanvasItem>(get_parent())->get_canvas_transform();
} else {
Expand All @@ -1223,9 +1223,9 @@ Transform2D CanvasItem::get_viewport_transform() const {

if (canvas_layer) {
if (get_viewport()) {
return get_viewport()->get_final_transform() * canvas_layer->get_transform();
return get_viewport()->get_final_transform() * canvas_layer->get_final_transform();
} else {
return canvas_layer->get_transform();
return canvas_layer->get_final_transform();
}

} else {
Expand Down
13 changes: 13 additions & 0 deletions scene/main/canvas_layer.cpp
View file
Open in desktop
Expand Up @@ -83,6 +83,18 @@ Transform2D CanvasLayer::get_transform() const {
return transform;
}

Transform2D CanvasLayer::get_final_transform() const {
if (is_following_viewport()) {
Transform2D follow;
follow.scale(Vector2(get_follow_viewport_scale(), get_follow_viewport_scale()));
if (vp) {
follow = vp->get_canvas_transform() * follow;
}
return follow * transform;
}
return transform;
}

void CanvasLayer::_update_xform() {
transform.set_rotation_and_scale(rot, scale);
transform.set_origin(ofs);
Expand Down Expand Up @@ -301,6 +313,7 @@ void CanvasLayer::_bind_methods() {

ClassDB::bind_method(D_METHOD("set_transform", "transform"), &CanvasLayer::set_transform);
ClassDB::bind_method(D_METHOD("get_transform"), &CanvasLayer::get_transform);
ClassDB::bind_method(D_METHOD("get_final_transform"), &CanvasLayer::get_final_transform);

ClassDB::bind_method(D_METHOD("set_offset", "offset"), &CanvasLayer::set_offset);
ClassDB::bind_method(D_METHOD("get_offset"), &CanvasLayer::get_offset);
Expand Down
1 change: 1 addition & 0 deletions scene/main/canvas_layer.h
View file
Open in desktop
Expand Up @@ -77,6 +77,7 @@ class CanvasLayer : public Node {

void set_transform(const Transform2D &p_xform);
Transform2D get_transform() const;
Transform2D get_final_transform() const;

void set_offset(const Vector2 &p_offset);
Vector2 get_offset() const;
Expand Down
2 changes: 1 addition & 1 deletion scene/main/viewport.cpp
View file
Open in desktop
Expand Up @@ -553,7 +553,7 @@ void Viewport::_process_picking(bool p_ignore_paused) {
ObjectID canvas_layer_id;
if (E->get()) {
// A descendant CanvasLayer
canvas_transform = E->get()->get_transform();
canvas_transform = E->get()->get_final_transform();
canvas_layer_id = E->get()->get_instance_id();
} else {
// This Viewport's builtin canvas
Expand Down