Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GraphEdit] Convert to minimap line after getting connection line. #92463

Merged
merged 1 commit into from
May 29, 2024
Merged

[GraphEdit] Convert to minimap line after getting connection line. #92463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions scene/gui/graph_edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,18 +1299,26 @@ List<Ref<GraphEdit::Connection>> GraphEdit::get_connections_intersecting_with_re
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) {
const Vector<Vector2> &points = get_connection_line(p_from, p_to);
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) {
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;
colors.reserve(points.size());

float length_inv = 1.0 / (p_from).distance_to(p_to);
const Vector2 &from = points[0];
const Vector2 &to = points[points.size() - 1];
float length_inv = 1.0 / (from).distance_to(to);
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));
}

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() {
Expand Down Expand Up @@ -1565,16 +1573,17 @@ void GraphEdit::_minimap_draw() {

// Draw node 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 to_position = minimap->_convert_from_graph_position(c->_cache.to_pos * zoom - graph_offset) + minimap_offset;
Vector2 from_graph_position = c->_cache.from_pos * zoom - graph_offset;
Vector2 to_graph_position = c->_cache.to_pos * zoom - graph_offset;
Color from_color = c->_cache.from_color;
Color to_color = c->_cache.to_color;

if (c->activity > 0) {
from_color = from_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.
Expand Down
2 changes: 1 addition & 1 deletion scene/gui/graph_edit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class GraphEdit : public Control {
void _top_connection_layer_input(const Ref<InputEvent> &p_ev);

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 _update_top_connection_layer();
void _update_connections();
Expand Down
Loading