diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp index 911ff0df43d..03deba3d30f 100644 --- a/editor/scene/canvas_item_editor_plugin.cpp +++ b/editor/scene/canvas_item_editor_plugin.cpp @@ -2005,7 +2005,13 @@ bool CanvasItemEditor::_gui_input_scale(const Ref &p_event) { Transform2D xform = transform * ci->get_screen_transform(); Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * edit_transform).orthonormalized(); - Transform2D simple_xform = viewport->get_transform() * unscaled_transform; + Transform2D simple_xform; + if (use_local_space) { + simple_xform = viewport->get_transform() * unscaled_transform; + } else { + Transform2D translation = Transform2D(0.0f, unscaled_transform.get_origin()); + simple_xform = viewport->get_transform() * translation; + } drag_type = DRAG_SCALE_BOTH; @@ -2063,7 +2069,14 @@ bool CanvasItemEditor::_gui_input_scale(const Ref &p_event) { for (CanvasItem *ci : drag_selection) { Transform2D parent_xform = ci->get_screen_transform() * ci->get_transform().affine_inverse(); Transform2D unscaled_transform = (transform * parent_xform * edit_transform).orthonormalized(); - Transform2D simple_xform = (viewport->get_transform() * unscaled_transform).affine_inverse() * transform; + Transform2D simple_xform; + + if (use_local_space || drag_type == DRAG_SCALE_BOTH) { + simple_xform = (viewport->get_transform() * unscaled_transform).affine_inverse() * transform; + } else { + Transform2D translation = Transform2D(0.0f, unscaled_transform.get_origin()); + simple_xform = (viewport->get_transform() * translation).affine_inverse() * transform; + } bool uniform = m->is_shift_pressed(); bool is_ctrl = m->is_command_or_control_pressed(); @@ -2072,6 +2085,11 @@ bool CanvasItemEditor::_gui_input_scale(const Ref &p_event) { Point2 drag_to_local = simple_xform.xform(drag_to); Point2 offset = drag_to_local - drag_from_local; + Transform2D object_transform = ci->_edit_get_transform(); + if (ci->is_class("Node2D")) { + object_transform.set_skew(ci->get("skew")); + } + Size2 scale = ci->_edit_get_scale(); Size2 original_scale = scale; real_t ratio = scale.y / scale.x; @@ -2089,12 +2107,24 @@ bool CanvasItemEditor::_gui_input_scale(const Ref &p_event) { scale_factor *= Vector2(1.0 / parent_scale.x, 1.0 / parent_scale.y) / (scale_max / original_scale); if (drag_type == DRAG_SCALE_X) { - scale.x += scale_factor.x; + if (!use_local_space && !uniform) { + object_transform.set_origin(Vector2(0.0, 0.0)); + object_transform.scale(Size2(scale_factor.x + 1.0, 1.0)); + scale *= object_transform.get_scale(); + } else { + scale.x += scale_factor.x; + } if (uniform) { scale.y = scale.x * ratio; } } else if (drag_type == DRAG_SCALE_Y) { - scale.y -= scale_factor.y; + if (!use_local_space && !uniform) { + object_transform.set_origin(Vector2(0.0, 0.0)); + object_transform.scale(Size2(1.0, -scale_factor.y + 1.0)); + scale *= object_transform.get_scale(); + } else { + scale.y -= scale_factor.y; + } if (uniform) { scale.x = scale.y / ratio; } @@ -2112,6 +2142,13 @@ bool CanvasItemEditor::_gui_input_scale(const Ref &p_event) { } ci->_edit_set_scale(scale); + if (!use_local_space && !uniform) { + Node2D *n2d = Object::cast_to(ci); + if (n2d) { + n2d->_edit_set_rotation(object_transform.get_rotation()); + n2d->set_skew(object_transform.get_skew()); + } + } if (using_temp_pivot) { Point2 ci_origin = ci->_edit_get_transform().get_origin(); @@ -2164,7 +2201,13 @@ bool CanvasItemEditor::_gui_input_move(const Ref &p_event) { CanvasItem *ci = selection.front()->get(); Transform2D parent_xform = ci->get_screen_transform() * ci->get_transform().affine_inverse(); Transform2D unscaled_transform = (transform * parent_xform * ci->_edit_get_transform()).orthonormalized(); - Transform2D simple_xform = viewport->get_transform() * unscaled_transform; + Transform2D simple_xform; + if (use_local_space) { + simple_xform = viewport->get_transform() * unscaled_transform; + } else { + Transform2D translation = Transform2D(0.0f, unscaled_transform.get_origin()); + simple_xform = viewport->get_transform() * translation; + } if (show_transformation_gizmos) { Size2 move_factor = Size2(MOVE_HANDLE_DISTANCE, MOVE_HANDLE_DISTANCE); @@ -2211,7 +2254,12 @@ bool CanvasItemEditor::_gui_input_move(const Ref &p_event) { const CanvasItem *selected = drag_selection.front()->get(); Transform2D parent_xform = selected->get_screen_transform() * selected->get_transform().affine_inverse(); Transform2D unscaled_transform = (transform * parent_xform * selected->_edit_get_transform()).orthonormalized(); - Transform2D simple_xform = viewport->get_transform() * unscaled_transform; + Transform2D simple_xform; + if (use_local_space) { + simple_xform = viewport->get_transform() * unscaled_transform; + } else { + simple_xform = viewport->get_transform(); + } drag_delta = simple_xform.affine_inverse().basis_xform(drag_delta); if (drag_type == DRAG_MOVE_X) { @@ -3760,7 +3808,14 @@ void CanvasItemEditor::_draw_selection() { } } else { Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized(); - Transform2D simple_xform = viewport->get_transform() * unscaled_transform; + Transform2D simple_xform; + if (use_local_space) { + simple_xform = viewport->get_transform() * unscaled_transform; + } else { + Transform2D translation = Transform2D(0.0f, unscaled_transform.get_origin()); + simple_xform = viewport->get_transform() * translation; + } + viewport->draw_set_transform_matrix(simple_xform); viewport->draw_texture(position_icon, -(position_icon->get_size() / 2)); viewport->draw_set_transform_matrix(viewport->get_transform()); @@ -3771,7 +3826,13 @@ void CanvasItemEditor::_draw_selection() { if (ci->_edit_use_pivot()) { // Draw the node's pivot Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized(); - Transform2D simple_xform = viewport->get_transform() * unscaled_transform; + Transform2D simple_xform; + if (use_local_space) { + simple_xform = viewport->get_transform() * unscaled_transform; + } else { + Transform2D translation = Transform2D(0.0f, unscaled_transform.get_origin()); + simple_xform = viewport->get_transform() * translation; + } viewport->draw_set_transform_matrix(simple_xform); viewport->draw_texture(pivot_icon, -(pivot_icon->get_size() / 2).floor()); @@ -3831,7 +3892,13 @@ void CanvasItemEditor::_draw_selection() { // Draw the move handles. if ((tool == TOOL_SELECT && is_alt && !is_ctrl) || tool == TOOL_MOVE) { Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized(); - Transform2D simple_xform = viewport->get_transform() * unscaled_transform; + Transform2D simple_xform; + if (use_local_space) { + simple_xform = viewport->get_transform() * unscaled_transform; + } else { + Transform2D translation = Transform2D(0.0f, unscaled_transform.get_origin()); + simple_xform = viewport->get_transform() * translation; + } Size2 move_factor = Size2(MOVE_HANDLE_DISTANCE, MOVE_HANDLE_DISTANCE); viewport->draw_set_transform_matrix(simple_xform); @@ -3865,7 +3932,13 @@ void CanvasItemEditor::_draw_selection() { edit_transform = ci->_edit_get_transform(); } Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * edit_transform).orthonormalized(); - Transform2D simple_xform = viewport->get_transform() * unscaled_transform; + Transform2D simple_xform; + if (use_local_space) { + simple_xform = viewport->get_transform() * unscaled_transform; + } else { + Transform2D translation = Transform2D(0.0f, unscaled_transform.get_origin()); + simple_xform = viewport->get_transform() * translation; + } Size2 scale_factor = Size2(SCALE_HANDLE_DISTANCE, SCALE_HANDLE_DISTANCE); bool uniform = Input::get_singleton()->is_key_pressed(Key::SHIFT); @@ -4031,7 +4104,14 @@ void CanvasItemEditor::_draw_invisible_nodes_positions(Node *p_node, const Trans // Draw the node's position Ref position_icon = get_editor_theme_icon(SNAME("EditorPositionUnselected")); Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized(); - Transform2D simple_xform = viewport->get_transform() * unscaled_transform; + Transform2D simple_xform; + if (use_local_space) { + simple_xform = viewport->get_transform() * unscaled_transform; + } else { + Transform2D translation = Transform2D(0.0f, unscaled_transform.get_origin()); + simple_xform = viewport->get_transform() * translation; + } + viewport->draw_set_transform_matrix(simple_xform); viewport->draw_texture(position_icon, -position_icon->get_size() / 2, Color(1.0, 1.0, 1.0, 0.5)); viewport->draw_set_transform_matrix(viewport->get_transform()); @@ -4083,7 +4163,7 @@ void CanvasItemEditor::_draw_message() { case DRAG_MOVE_X: case DRAG_MOVE_Y: { Vector2 delta = current_transform.get_origin() - original_transform.get_origin(); - if (drag_type == DRAG_MOVE) { + if (drag_type == DRAG_MOVE || use_local_space) { message = TTR("Moving:") + " (" + FORMAT(delta.x) + ", " + FORMAT(delta.y) + ") px"; } else if (drag_type == DRAG_MOVE_X) { message = TTR("Moving:") + " " + FORMAT(delta.x) + " px"; @@ -4102,7 +4182,7 @@ void CanvasItemEditor::_draw_message() { case DRAG_SCALE_BOTH: { Vector2 original_scale = (Math::is_zero_approx(original_transform.get_scale().x) || Math::is_zero_approx(original_transform.get_scale().y)) ? Vector2(CMP_EPSILON, CMP_EPSILON) : original_transform.get_scale(); Vector2 delta = current_transform.get_scale() / original_scale; - if (drag_type == DRAG_SCALE_BOTH) { + if (drag_type == DRAG_SCALE_BOTH || !use_local_space) { message = TTR("Scaling:") + String::utf8(" ×(") + FORMAT(delta.x) + ", " + FORMAT(delta.y) + ")"; } else if (drag_type == DRAG_SCALE_X) { message = TTR("Scaling:") + String::utf8(" ×") + FORMAT(delta.x); @@ -4230,6 +4310,7 @@ void CanvasItemEditor::_update_editor_settings() { move_button->set_button_icon(get_editor_theme_icon(SNAME("ToolMove"))); scale_button->set_button_icon(get_editor_theme_icon(SNAME("ToolScale"))); rotate_button->set_button_icon(get_editor_theme_icon(SNAME("ToolRotate"))); + local_space_button->set_button_icon(get_editor_theme_icon(SNAME("Object"))); smart_snap_button->set_button_icon(get_editor_theme_icon(SNAME("Snap"))); grid_snap_button->set_button_icon(get_editor_theme_icon(SNAME("SnapGrid"))); snap_config_menu->set_button_icon(get_editor_theme_icon(SNAME("GuiTabMenuHl"))); @@ -4542,6 +4623,11 @@ void CanvasItemEditor::_shortcut_zoom_set(real_t p_zoom) { _zoom_on_position(p_zoom * MAX(1, EDSCALE), viewport->get_local_mouse_position()); } +void CanvasItemEditor::_button_toggle_local_space(bool p_status) { + use_local_space = p_status; + viewport->queue_redraw(); +} + void CanvasItemEditor::_button_toggle_smart_snap(bool p_status) { smart_snap_active = p_status; viewport->queue_redraw(); @@ -5648,6 +5734,16 @@ CanvasItemEditor::CanvasItemEditor() { main_menu_hbox->add_child(memnew(VSeparator)); + local_space_button = memnew(Button); + local_space_button->set_theme_type_variation(SceneStringName(FlatButton)); + main_menu_hbox->add_child(local_space_button); + local_space_button->set_toggle_mode(true); + local_space_button->set_pressed_no_signal(true); + local_space_button->connect(SceneStringName(toggled), callable_mp(this, &CanvasItemEditor::_button_toggle_local_space)); + local_space_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_local_space", TTRC("Use Local Space"), Key::T)); + local_space_button->set_shortcut_context(this); + local_space_button->set_accessibility_name(TTRC("Use Local Space")); + smart_snap_button = memnew(Button); smart_snap_button->set_theme_type_variation(SceneStringName(FlatButton)); main_menu_hbox->add_child(smart_snap_button); diff --git a/editor/scene/canvas_item_editor_plugin.h b/editor/scene/canvas_item_editor_plugin.h index aeb30b7059c..3c5baebfdaa 100644 --- a/editor/scene/canvas_item_editor_plugin.h +++ b/editor/scene/canvas_item_editor_plugin.h @@ -238,6 +238,7 @@ private: real_t snap_rotation_step = 0.0; real_t snap_rotation_offset = 0.0; real_t snap_scale_step = 0.0; + bool use_local_space = true; bool smart_snap_active = false; bool grid_snap_active = false; @@ -332,6 +333,7 @@ private: Button *ruler_button = nullptr; + Button *local_space_button = nullptr; Button *smart_snap_button = nullptr; Button *grid_snap_button = nullptr; MenuButton *snap_config_menu = nullptr; @@ -530,6 +532,7 @@ private: void _update_zoom(real_t p_zoom); void _shortcut_zoom_set(real_t p_zoom); void _zoom_on_position(real_t p_zoom, Point2 p_position = Point2()); + void _button_toggle_local_space(bool p_status); void _button_toggle_smart_snap(bool p_status); void _button_toggle_grid_snap(bool p_status); void _button_tool_select(int p_index);