godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 2D instance drop position

This commit is contained in:
kobewi 2022-02-20 22:36:14 +01:00
parent b0ba9468ee
commit 3a9fb3aff0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -5500,16 +5500,18 @@ bool CanvasItemEditorViewport::_create_instance(Node *parent, String &path, cons
editor_data->get_undo_redo().add_do_method(ed, "live_debug_instance_node", edited_scene->get_path_to(parent), path, new_name); editor_data->get_undo_redo().add_do_method(ed, "live_debug_instance_node", edited_scene->get_path_to(parent), path, new_name);
editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(edited_scene->get_path_to(parent)) + "/" + new_name)); editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(edited_scene->get_path_to(parent)) + "/" + new_name));
CanvasItem *parent_ci = Object::cast_to<CanvasItem>(parent); CanvasItem *instance_ci = Object::cast_to<CanvasItem>(instantiated_scene);
if (parent_ci) { if (instance_ci) {
Vector2 target_pos = canvas_item_editor->get_canvas_transform().affine_inverse().xform(p_point); Vector2 target_pos = canvas_item_editor->get_canvas_transform().affine_inverse().xform(p_point);
target_pos = canvas_item_editor->snap_point(target_pos); target_pos = canvas_item_editor->snap_point(target_pos);
target_pos = parent_ci->get_global_transform_with_canvas().affine_inverse().xform(target_pos);
// Preserve instance position of the original scene. CanvasItem *parent_ci = Object::cast_to<CanvasItem>(parent);
CanvasItem *instance_ci = Object::cast_to<CanvasItem>(instantiated_scene); if (parent_ci) {
if (instance_ci) { target_pos = parent_ci->get_global_transform_with_canvas().affine_inverse().xform(target_pos);
target_pos += instance_ci->_edit_get_position();
} }
// Preserve instance position of the original scene.
target_pos += instance_ci->_edit_get_position();
editor_data->get_undo_redo().add_do_method(instantiated_scene, "set_position", target_pos); editor_data->get_undo_redo().add_do_method(instantiated_scene, "set_position", target_pos);
} }