Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109133 from aaronp64/polygon_editor_grab_radius

Browse Source 
Use `point_grab_radius` setting in `Polygon2DEditor` bottom panel editor
This commit is contained in:
Thaddeus Crews
2025-08-21 18:39:35 -05:00
parent 84a3881120 aaaa840568
commit b947e5f8cc
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
editor/scene/2d/polygon_2d_editor_plugin.cpp
View File

@@ -574,13 +574,16 @@ void Polygon2DEditor::_canvas_input(const Ref<InputEvent> &p_input) {
return; return;
} }
const real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
int closest = -1; int closest = -1;
real_t closest_dist = Math::INF;
for (int i = editing_points.size() - 1; i >= editing_points.size() - internal_vertices; i--) { for (int i = editing_points.size() - 1; i >= editing_points.size() - internal_vertices && closest_dist >= 8; i--) {
Vector2 tuv = mtx.xform(previous_polygon[i]); Vector2 tuv = mtx.xform(previous_polygon[i]);
if (tuv.distance_to(mb->get_position()) < 8) { const real_t dist = tuv.distance_to(mb->get_position());
if (dist < grab_threshold && dist < closest_dist) {
closest = i; closest = i;
break; closest_dist = dist;
} }
} }
@@ -625,11 +628,15 @@ void Polygon2DEditor::_canvas_input(const Ref<InputEvent> &p_input) {
} }
if (current_action == ACTION_EDIT_POINT) { if (current_action == ACTION_EDIT_POINT) {
const real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
point_drag_index = -1; point_drag_index = -1;
for (int i = 0; i < editing_points.size(); i++) { real_t closest_dist = Math::INF;
if (mtx.xform(editing_points[i]).distance_to(mb->get_position()) < 8) { for (int i = editing_points.size() - 1; i >= 0 && closest_dist >= 8; i--) {
const real_t dist = mtx.xform(editing_points[i]).distance_to(mb->get_position());
if (dist < grab_threshold && dist < closest_dist) {
drag_from = mb->get_position(); drag_from = mb->get_position();
point_drag_index = i; point_drag_index = i;
closest_dist = dist;
} }
} }
@@ -639,13 +646,16 @@ void Polygon2DEditor::_canvas_input(const Ref<InputEvent> &p_input) {
} }
if (current_action == ACTION_ADD_POLYGON) { if (current_action == ACTION_ADD_POLYGON) {
const real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
int closest = -1; int closest = -1;
real_t closest_dist = Math::INF;
for (int i = editing_points.size() - 1; i >= 0; i--) { for (int i = editing_points.size() - 1; i >= 0 && closest_dist >= 8; i--) {
Vector2 tuv = mtx.xform(editing_points[i]); Vector2 tuv = mtx.xform(editing_points[i]);
if (tuv.distance_to(mb->get_position()) < 8) { const real_t dist = tuv.distance_to(mb->get_position());
if (dist < grab_threshold && dist < closest_dist) {
closest = i; closest = i;
break; closest_dist = dist;
} }
} }