godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge pull request #103956 from dugramen/curve-handles-outwards

Browse Source 
Path2D prefer control points for outward curve
This commit is contained in:
Thaddeus Crews
2025-03-24 10:01:05 -05:00
parent f810c74c19 4fbf38d091
commit a5926394d3
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
editor/plugins/path_2d_editor_plugin.cpp
View File

@@ -110,6 +110,7 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
moving_screen_from = gpoint; moving_screen_from = gpoint;
return true; return true;
} else if (mode == MODE_EDIT || mode == MODE_EDIT_CURVE) { } else if (mode == MODE_EDIT || mode == MODE_EDIT_CURVE) {
control_points_in_range = 0;
// In/out controls can be moved in multiple modes. // In/out controls can be moved in multiple modes.
if (dist_to_p_out < grab_threshold && i < (curve->get_point_count() - 1)) { if (dist_to_p_out < grab_threshold && i < (curve->get_point_count() - 1)) {
action = ACTION_MOVING_OUT; action = ACTION_MOVING_OUT;
@@ -117,13 +118,17 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
moving_from = curve->get_point_out(i); moving_from = curve->get_point_out(i);
moving_screen_from = gpoint; moving_screen_from = gpoint;
orig_in_length = curve->get_point_in(action_point).length(); orig_in_length = curve->get_point_in(action_point).length();
return true; control_points_in_range += 1;
} else if (dist_to_p_in < grab_threshold && i > 0) { }
if (dist_to_p_in < grab_threshold && i > 0) {
action = ACTION_MOVING_IN; action = ACTION_MOVING_IN;
action_point = i; action_point = i;
moving_from = curve->get_point_in(i); moving_from = curve->get_point_in(i);
moving_screen_from = gpoint; moving_screen_from = gpoint;
orig_out_length = curve->get_point_out(action_point).length(); orig_out_length = curve->get_point_out(action_point).length();
control_points_in_range += 1;
}
if (control_points_in_range > 0) {
return true; return true;
} }
} }
@@ -298,6 +303,27 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseMotion> mm = p_event; Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid()) { if (mm.is_valid()) {
// When both control points were in range of click,
// pick the point that drags the curve outwards.
if (control_points_in_range == 2) {
control_points_in_range = 0;
Ref<Curve2D> curve = node->get_curve();
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_screen_transform();
Point2 relative = xform.affine_inverse().basis_xform(mm->get_relative());
real_t angle_in = relative.angle_to(curve->get_point_position(action_point - 1) - curve->get_point_position(action_point));
real_t angle_out = relative.angle_to(curve->get_point_position(action_point + 1) - curve->get_point_position(action_point));
if (Math::abs(angle_in) < Math::abs(angle_out)) {
action = ACTION_MOVING_IN;
moving_from = curve->get_point_in(action_point);
orig_out_length = curve->get_point_out(action_point).length();
} else {
action = ACTION_MOVING_OUT;
moving_from = curve->get_point_out(action_point);
orig_in_length = curve->get_point_in(action_point).length();
}
}
if (action == ACTION_NONE && mode == MODE_EDIT) { if (action == ACTION_NONE && mode == MODE_EDIT) {
// Handle Edge Follow // Handle Edge Follow
bool old_edge = on_edge; bool old_edge = on_edge;

4
editor/plugins/path_2d_editor_plugin.h
View File

@@ -96,6 +96,10 @@ class Path2DEditor : public HBoxContainer {
Vector2 edge_point; Vector2 edge_point;
Vector2 original_mouse_pos; Vector2 original_mouse_pos;
// Number of control points in range of the last click.
// 0, 1, or 2.
int control_points_in_range = 0;
void _mode_selected(int p_mode); void _mode_selected(int p_mode);
void _handle_option_pressed(int p_option); void _handle_option_pressed(int p_option);
void _cancel_current_action(); void _cancel_current_action();