asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #92463 from Daylily-Zeleen/daylily-zeleen/fix_graph_edit_minimap_connection_line

Browse source 
[GraphEdit] Convert to minimap line after getting connection line.
This commit is contained in:
Rémi Verschelde 2024-05-29 11:20:04 +02:00
commit b60471f3c0
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scene/gui/graph_edit.cpp
View file

@ -1299,18 +1299,26 @@ List<Ref<GraphEdit::Connection>> GraphEdit::get_connections_intersecting_with_re
return intersecting_connections; return intersecting_connections;
} }
void GraphEdit::_draw_minimap_connection_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_from_color, const Color &p_to_color) { void GraphEdit::_draw_minimap_connection_line(const Vector2 &p_from_graph_position, const Vector2 &p_to_graph_position, const Color &p_from_color, const Color &p_to_color) {
const Vector<Vector2> &points = get_connection_line(p_from, p_to); Vector<Vector2> points = get_connection_line(p_from_graph_position, p_to_graph_position);
ERR_FAIL_COND_MSG(points.size() < 2, "\"_get_connection_line()\" returned an invalid line.");
// Convert to minimap points.
for (Vector2 &point : points) {
point = minimap->_convert_from_graph_position(point) + minimap->minimap_offset;
}
// Setup polyline colors.
LocalVector<Color> colors; LocalVector<Color> colors;
colors.reserve(points.size()); colors.reserve(points.size());
const Vector2 &from = points[0];
float length_inv = 1.0 / (p_from).distance_to(p_to); const Vector2 &to = points[points.size() - 1];
float length_inv = 1.0 / (from).distance_to(to);
for (const Vector2 &point : points) { for (const Vector2 &point : points) {
float normalized_curve_position = (p_from).distance_to(point) * length_inv; float normalized_curve_position = from.distance_to(point) * length_inv;
colors.push_back(p_from_color.lerp(p_to_color, normalized_curve_position)); colors.push_back(p_from_color.lerp(p_to_color, normalized_curve_position));
} }
p_where->draw_polyline_colors(points, colors, 0.5, lines_antialiased); minimap->draw_polyline_colors(points, colors, 0.5, lines_antialiased);
} }
void GraphEdit::_update_connections() { void GraphEdit::_update_connections() {
@ -1565,8 +1573,8 @@ void GraphEdit::_minimap_draw() {
// Draw node connections. // Draw node connections.
for (const Ref<Connection> &c : connections) { for (const Ref<Connection> &c : connections) {
Vector2 from_position = minimap->_convert_from_graph_position(c->_cache.from_pos * zoom - graph_offset) + minimap_offset; Vector2 from_graph_position = c->_cache.from_pos * zoom - graph_offset;
Vector2 to_position = minimap->_convert_from_graph_position(c->_cache.to_pos * zoom - graph_offset) + minimap_offset; Vector2 to_graph_position = c->_cache.to_pos * zoom - graph_offset;
Color from_color = c->_cache.from_color; Color from_color = c->_cache.from_color;
Color to_color = c->_cache.to_color; Color to_color = c->_cache.to_color;
@ -1574,7 +1582,8 @@ void GraphEdit::_minimap_draw() {
from_color = from_color.lerp(theme_cache.activity_color, c->activity); from_color = from_color.lerp(theme_cache.activity_color, c->activity);
to_color = to_color.lerp(theme_cache.activity_color, c->activity); to_color = to_color.lerp(theme_cache.activity_color, c->activity);
} }
_draw_minimap_connection_line(minimap, from_position, to_position, from_color, to_color);
_draw_minimap_connection_line(from_graph_position, to_graph_position, from_color, to_color);
} }
// Draw the "camera" viewport. // Draw the "camera" viewport.

2
scene/gui/graph_edit.h
View file

@ -328,7 +328,7 @@ private:
void _top_connection_layer_input(const Ref<InputEvent> &p_ev); void _top_connection_layer_input(const Ref<InputEvent> &p_ev);
float _get_shader_line_width(); float _get_shader_line_width();
void _draw_minimap_connection_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_color, const Color &p_to_color); void _draw_minimap_connection_line(const Vector2 &p_from_graph_position, const Vector2 &p_to_graph_position, const Color &p_from_color, const Color &p_to_color);
void _invalidate_connection_line_cache(); void _invalidate_connection_line_cache();
void _update_top_connection_layer(); void _update_top_connection_layer();
void _update_connections(); void _update_connections();