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

[GraphEdit] Make connections a property

Browse source
This commit is contained in:
Hendrik Brucker 2024-10-21 13:54:03 +02:00
parent 44fa552343
commit 4e5b560784
4 changed files with 130 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
doc/classes/GraphEdit.xml
View file

@ -130,8 +130,10 @@
<param index="1" name="from_port" type="int" /> <param index="1" name="from_port" type="int" />
<param index="2" name="to_node" type="StringName" /> <param index="2" name="to_node" type="StringName" />
<param index="3" name="to_port" type="int" /> <param index="3" name="to_port" type="int" />
<param index="4" name="keep_alive" type="bool" default="false" />
<description> <description>
Create a connection between the [param from_port] of the [param from_node] [GraphNode] and the [param to_port] of the [param to_node] [GraphNode]. If the connection already exists, no connection is created. Create a connection between the [param from_port] of the [param from_node] [GraphNode] and the [param to_port] of the [param to_node] [GraphNode]. If the connection already exists, no connection is created.
Connections with [param keep_alive] set to [code]true[/code] are not automatically deleted if invalid during a redraw.
</description> </description>
</method> </method>
<method name="detach_graph_element_from_frame"> <method name="detach_graph_element_from_frame">
@ -172,7 +174,7 @@
<param index="1" name="max_distance" type="float" default="4.0" /> <param index="1" name="max_distance" type="float" default="4.0" />
<description> <description>
Returns the closest connection to the given point in screen space. If no connection is found within [param max_distance] pixels, an empty [Dictionary] is returned. Returns the closest connection to the given point in screen space. If no connection is found within [param max_distance] pixels, an empty [Dictionary] is returned.
A connection consists in a structure of the form [code]{ from_port: 0, from_node: "GraphNode name 0", to_port: 1, to_node: "GraphNode name 1" }[/code]. A connection consists in a structure of the form [code]{ from_port: 0, from_node: "GraphNode name 0", to_port: 1, to_node: "GraphNode name 1", keep_alive: true/false }[/code].
For example, getting a connection at a given mouse position can be achieved like this: For example, getting a connection at a given mouse position can be achieved like this:
[codeblocks] [codeblocks]
[gdscript] [gdscript]
@ -189,17 +191,11 @@
Returns the points which would make up a connection between [param from_node] and [param to_node]. Returns the points which would make up a connection between [param from_node] and [param to_node].
</description> </description>
</method> </method>
<method name="get_connection_list" qualifiers="const">
<return type="Dictionary[]" />
<description>
Returns an [Array] containing the list of connections. A connection consists in a structure of the form [code]{ from_port: 0, from_node: "GraphNode name 0", to_port: 1, to_node: "GraphNode name 1" }[/code].
</description>
</method>
<method name="get_connections_intersecting_with_rect" qualifiers="const"> <method name="get_connections_intersecting_with_rect" qualifiers="const">
<return type="Dictionary[]" /> <return type="Dictionary[]" />
<param index="0" name="rect" type="Rect2" /> <param index="0" name="rect" type="Rect2" />
<description> <description>
Returns an [Array] containing the list of connections that intersect with the given [Rect2]. A connection consists in a structure of the form [code]{ from_port: 0, from_node: "GraphNode name 0", to_port: 1, to_node: "GraphNode name 1" }[/code]. Returns an [Array] containing the list of connections that intersect with the given [Rect2]. A connection consists in a structure of the form [code]{ from_port: 0, from_node: "GraphNode name 0", to_port: 1, to_node: "GraphNode name 1", keep_alive: true/false }[/code].
</description> </description>
</method> </method>
<method name="get_element_frame"> <method name="get_element_frame">
@ -288,6 +284,11 @@
<member name="connection_lines_thickness" type="float" setter="set_connection_lines_thickness" getter="get_connection_lines_thickness" default="4.0"> <member name="connection_lines_thickness" type="float" setter="set_connection_lines_thickness" getter="get_connection_lines_thickness" default="4.0">
The thickness of the lines between the nodes. The thickness of the lines between the nodes.
</member> </member>
<member name="connections" type="Dictionary[]" setter="set_connections" getter="get_connection_list" default="[]">
The connections between [GraphNode]s.
A connection is a [Dictionary] in the form of [code]{ from_port: 0, from_node: "GraphNode name 0", to_port: 1, to_node: "GraphNode name 1", keep_alive: true/false }[/code].
Connections with [code]keep_alive[/code] set to [code]true[/code] are not automatically deleted if invalid during a redraw.
</member>
<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" /> <member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" />
<member name="grid_pattern" type="int" setter="set_grid_pattern" getter="get_grid_pattern" enum="GraphEdit.GridPattern" default="0"> <member name="grid_pattern" type="int" setter="set_grid_pattern" getter="get_grid_pattern" enum="GraphEdit.GridPattern" default="0">
The pattern used for drawing the grid. The pattern used for drawing the grid.

199
scene/gui/graph_edit.cpp
View file

@ -259,7 +259,7 @@ PackedStringArray GraphEdit::get_configuration_warnings() const {
return warnings; return warnings;
} }
Error GraphEdit::connect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port) { Error GraphEdit::connect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port, bool p_keep_alive) {
ERR_FAIL_NULL_V_MSG(connections_layer, FAILED, "connections_layer is missing."); ERR_FAIL_NULL_V_MSG(connections_layer, FAILED, "connections_layer is missing.");
if (is_node_connected(p_from, p_from_port, p_to, p_to_port)) { if (is_node_connected(p_from, p_from_port, p_to, p_to_port)) {
@ -272,6 +272,7 @@ Error GraphEdit::connect_node(const StringName &p_from, int p_from_port, const S
c->to_node = p_to; c->to_node = p_to;
c->to_port = p_to_port; c->to_port = p_to_port;
c->activity = 0; c->activity = 0;
c->keep_alive = p_keep_alive;
connections.push_back(c); connections.push_back(c);
connection_map[p_from].push_back(c); connection_map[p_from].push_back(c);
connection_map[p_to].push_back(c); connection_map[p_to].push_back(c);
@ -317,23 +318,28 @@ bool GraphEdit::is_node_connected(const StringName &p_from, int p_from_port, con
void GraphEdit::disconnect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port) { void GraphEdit::disconnect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port) {
ERR_FAIL_NULL_MSG(connections_layer, "connections_layer is missing."); ERR_FAIL_NULL_MSG(connections_layer, "connections_layer is missing.");
for (const List<Ref<Connection>>::Element *E = connections.front(); E; E = E->next()) { Ref<Connection> conn_to_remove;
if (E->get()->from_node == p_from && E->get()->from_port == p_from_port && E->get()->to_node == p_to && E->get()->to_port == p_to_port) { for (const Ref<Connection> &conn : connections) {
connection_map[p_from].erase(E->get()); if (conn->from_node == p_from && conn->from_port == p_from_port && conn->to_node == p_to && conn->to_port == p_to_port) {
connection_map[p_to].erase(E->get()); conn_to_remove = conn;
E->get()->_cache.line->queue_free(); break;
connections.erase(E);
minimap->queue_redraw();
queue_redraw();
connections_layer->queue_redraw();
callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred();
return;
} }
} }
if (conn_to_remove.is_valid()) {
connection_map[p_from].erase(conn_to_remove);
connection_map[p_to].erase(conn_to_remove);
conn_to_remove->_cache.line->queue_free();
connections.erase(conn_to_remove);
minimap->queue_redraw();
queue_redraw();
connections_layer->queue_redraw();
callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred();
}
} }
const List<Ref<GraphEdit::Connection>> &GraphEdit::get_connection_list() const { const Vector<Ref<GraphEdit::Connection>> &GraphEdit::get_connections() const {
return connections; return connections;
} }
@ -575,8 +581,8 @@ void GraphEdit::_graph_node_rect_changed(GraphNode *p_node) {
return; return;
} }
for (Ref<Connection> &c : connection_map[p_node->get_name()]) { for (Ref<Connection> &conn : connection_map[p_node->get_name()]) {
c->_cache.dirty = true; conn->_cache.dirty = true;
} }
connections_layer->queue_redraw(); connections_layer->queue_redraw();
callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred(); callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred();
@ -1289,16 +1295,16 @@ Ref<GraphEdit::Connection> GraphEdit::get_closest_connection_at_point(const Vect
Ref<GraphEdit::Connection> closest_connection; Ref<GraphEdit::Connection> closest_connection;
float closest_distance = p_max_distance; float closest_distance = p_max_distance;
for (const Ref<Connection> &c : connections) { for (const Ref<Connection> &conn : connections) {
if (c->_cache.aabb.distance_to(transformed_point) > p_max_distance) { if (conn->_cache.aabb.distance_to(transformed_point) > p_max_distance) {
continue; continue;
} }
Vector<Vector2> points = get_connection_line(c->_cache.from_pos * zoom, c->_cache.to_pos * zoom); Vector<Vector2> points = get_connection_line(conn->_cache.from_pos * zoom, conn->_cache.to_pos * zoom);
for (int i = 0; i < points.size() - 1; i++) { for (int i = 0; i < points.size() - 1; i++) {
float distance = Geometry2D::get_distance_to_segment(transformed_point, &points[i]); float distance = Geometry2D::get_distance_to_segment(transformed_point, &points[i]);
if (distance <= lines_thickness * 0.5 + p_max_distance && distance < closest_distance) { if (distance <= lines_thickness * 0.5 + p_max_distance && distance < closest_distance) {
closest_connection = c; closest_connection = conn;
closest_distance = distance; closest_distance = distance;
} }
} }
@ -1312,15 +1318,15 @@ List<Ref<GraphEdit::Connection>> GraphEdit::get_connections_intersecting_with_re
transformed_rect.position += get_scroll_offset(); transformed_rect.position += get_scroll_offset();
List<Ref<Connection>> intersecting_connections; List<Ref<Connection>> intersecting_connections;
for (const Ref<Connection> &c : connections) { for (const Ref<Connection> &conn : connections) {
if (!c->_cache.aabb.intersects(transformed_rect)) { if (!conn->_cache.aabb.intersects(transformed_rect)) {
continue; continue;
} }
Vector<Vector2> points = get_connection_line(c->_cache.from_pos * zoom, c->_cache.to_pos * zoom); Vector<Vector2> points = get_connection_line(conn->_cache.from_pos * zoom, conn->_cache.to_pos * zoom);
for (int i = 0; i < points.size() - 1; i++) { for (int i = 0; i < points.size() - 1; i++) {
if (Geometry2D::segment_intersects_rect(points[i], points[i + 1], transformed_rect)) { if (Geometry2D::segment_intersects_rect(points[i], points[i + 1], transformed_rect)) {
intersecting_connections.push_back(c); intersecting_connections.push_back(conn);
break; break;
} }
} }
@ -1352,47 +1358,49 @@ void GraphEdit::_draw_minimap_connection_line(const Vector2 &p_from_graph_positi
void GraphEdit::_update_connections() { void GraphEdit::_update_connections() {
// Collect all dead connections and remove them. // Collect all dead connections and remove them.
List<List<Ref<Connection>>::Element *> dead_connections; LocalVector<Ref<Connection>> dead_connections;
for (List<Ref<Connection>>::Element *E = connections.front(); E; E = E->next()) { for (const Ref<Connection> &conn : connections) {
Ref<Connection> &c = E->get(); if (conn->_cache.dirty) {
Node *from = get_node_or_null(NodePath(conn->from_node));
if (c->_cache.dirty) {
Node *from = get_node_or_null(NodePath(c->from_node));
GraphNode *gnode_from = Object::cast_to<GraphNode>(from); GraphNode *gnode_from = Object::cast_to<GraphNode>(from);
if (!gnode_from) { if (!gnode_from && !conn->keep_alive) {
dead_connections.push_back(E); dead_connections.push_back(conn);
continue; continue;
} }
Node *to = get_node_or_null(NodePath(c->to_node)); Node *to = get_node_or_null(NodePath(conn->to_node));
GraphNode *gnode_to = Object::cast_to<GraphNode>(to); GraphNode *gnode_to = Object::cast_to<GraphNode>(to);
if (!gnode_to) { if (!gnode_to && !conn->keep_alive) {
dead_connections.push_back(E); dead_connections.push_back(conn);
continue; continue;
} }
const Vector2 from_pos = gnode_from->get_output_port_position(c->from_port) + gnode_from->get_position_offset(); if (conn->keep_alive && (!gnode_from || !gnode_to)) {
const Vector2 to_pos = gnode_to->get_input_port_position(c->to_port) + gnode_to->get_position_offset(); continue;
}
const Color from_color = gnode_from->get_output_port_color(c->from_port); const Vector2 from_pos = gnode_from->get_output_port_position(conn->from_port) + gnode_from->get_position_offset();
const Color to_color = gnode_to->get_input_port_color(c->to_port); const Vector2 to_pos = gnode_to->get_input_port_position(conn->to_port) + gnode_to->get_position_offset();
const int from_type = gnode_from->get_output_port_type(c->from_port); const Color from_color = gnode_from->get_output_port_color(conn->from_port);
const int to_type = gnode_to->get_input_port_type(c->to_port); const Color to_color = gnode_to->get_input_port_color(conn->to_port);
c->_cache.from_pos = from_pos; const int from_type = gnode_from->get_output_port_type(conn->from_port);
c->_cache.to_pos = to_pos; const int to_type = gnode_to->get_input_port_type(conn->to_port);
c->_cache.from_color = from_color;
c->_cache.to_color = to_color; conn->_cache.from_pos = from_pos;
conn->_cache.to_pos = to_pos;
conn->_cache.from_color = from_color;
conn->_cache.to_color = to_color;
PackedVector2Array line_points = get_connection_line(from_pos * zoom, to_pos * zoom); PackedVector2Array line_points = get_connection_line(from_pos * zoom, to_pos * zoom);
c->_cache.line->set_points(line_points); conn->_cache.line->set_points(line_points);
Ref<ShaderMaterial> line_material = c->_cache.line->get_material(); Ref<ShaderMaterial> line_material = conn->_cache.line->get_material();
if (line_material.is_null()) { if (line_material.is_null()) {
line_material.instantiate(); line_material.instantiate();
c->_cache.line->set_material(line_material); conn->_cache.line->set_material(line_material);
} }
float line_width = _get_shader_line_width(); float line_width = _get_shader_line_width();
@ -1402,31 +1410,31 @@ void GraphEdit::_update_connections() {
line_material->set_shader_parameter("rim_color", theme_cache.connection_rim_color); line_material->set_shader_parameter("rim_color", theme_cache.connection_rim_color);
// Compute bounding box of the line, including the line width. // Compute bounding box of the line, including the line width.
c->_cache.aabb = Rect2(line_points[0], Vector2()); conn->_cache.aabb = Rect2(line_points[0], Vector2());
for (int i = 0; i < line_points.size(); i++) { for (int i = 0; i < line_points.size(); i++) {
c->_cache.aabb.expand_to(line_points[i]); conn->_cache.aabb.expand_to(line_points[i]);
} }
c->_cache.aabb.grow_by(lines_thickness * 0.5); conn->_cache.aabb.grow_by(lines_thickness * 0.5);
c->_cache.dirty = false; conn->_cache.dirty = false;
} }
// Skip updating/drawing connections that are not visible. // Skip updating/drawing connections that are not visible.
Rect2 viewport_rect = get_viewport_rect(); Rect2 viewport_rect = get_viewport_rect();
viewport_rect.position += get_scroll_offset(); viewport_rect.position += get_scroll_offset();
if (!c->_cache.aabb.intersects(viewport_rect)) { if (!conn->_cache.aabb.intersects(viewport_rect)) {
continue; continue;
} }
Color from_color = c->_cache.from_color; Color from_color = conn->_cache.from_color;
Color to_color = c->_cache.to_color; Color to_color = conn->_cache.to_color;
if (c->activity > 0) { if (conn->activity > 0) {
from_color = from_color.lerp(theme_cache.activity_color, c->activity); from_color = from_color.lerp(theme_cache.activity_color, conn->activity);
to_color = to_color.lerp(theme_cache.activity_color, c->activity); to_color = to_color.lerp(theme_cache.activity_color, conn->activity);
} }
if (c == hovered_connection) { if (conn == hovered_connection) {
from_color = from_color.blend(theme_cache.connection_hover_tint_color); from_color = from_color.blend(theme_cache.connection_hover_tint_color);
to_color = to_color.blend(theme_cache.connection_hover_tint_color); to_color = to_color.blend(theme_cache.connection_hover_tint_color);
} }
@ -1435,21 +1443,21 @@ void GraphEdit::_update_connections() {
Ref<Gradient> line_gradient = memnew(Gradient); Ref<Gradient> line_gradient = memnew(Gradient);
float line_width = _get_shader_line_width(); float line_width = _get_shader_line_width();
c->_cache.line->set_width(line_width); conn->_cache.line->set_width(line_width);
line_gradient->set_color(0, from_color); line_gradient->set_color(0, from_color);
line_gradient->set_color(1, to_color); line_gradient->set_color(1, to_color);
c->_cache.line->set_gradient(line_gradient); conn->_cache.line->set_gradient(line_gradient);
} }
for (const List<Ref<Connection>>::Element *E : dead_connections) { for (const Ref<Connection> &dead_conn : dead_connections) {
List<Ref<Connection>> &connections_from = connection_map[E->get()->from_node]; List<Ref<Connection>> &connections_from = connection_map[dead_conn->from_node];
List<Ref<Connection>> &connections_to = connection_map[E->get()->to_node]; List<Ref<Connection>> &connections_to = connection_map[dead_conn->to_node];
connections_from.erase(E->get()); connections_from.erase(dead_conn);
connections_to.erase(E->get()); connections_to.erase(dead_conn);
E->get()->_cache.line->queue_free(); dead_conn->_cache.line->queue_free();
connections.erase(E->get()); connections.erase(dead_conn);
} }
} }
@ -1601,15 +1609,15 @@ void GraphEdit::_minimap_draw() {
} }
// Draw node connections. // Draw node connections.
for (const Ref<Connection> &c : connections) { for (const Ref<Connection> &conn : connections) {
Vector2 from_graph_position = c->_cache.from_pos * zoom - graph_offset; Vector2 from_graph_position = conn->_cache.from_pos * zoom - graph_offset;
Vector2 to_graph_position = c->_cache.to_pos * zoom - graph_offset; Vector2 to_graph_position = conn->_cache.to_pos * zoom - graph_offset;
Color from_color = c->_cache.from_color; Color from_color = conn->_cache.from_color;
Color to_color = c->_cache.to_color; Color to_color = conn->_cache.to_color;
if (c->activity > 0) { if (conn->activity > 0) {
from_color = from_color.lerp(theme_cache.activity_color, c->activity); from_color = from_color.lerp(theme_cache.activity_color, conn->activity);
to_color = to_color.lerp(theme_cache.activity_color, c->activity); to_color = to_color.lerp(theme_cache.activity_color, conn->activity);
} }
_draw_minimap_connection_line(from_graph_position, to_graph_position, from_color, to_color); _draw_minimap_connection_line(from_graph_position, to_graph_position, from_color, to_color);
@ -2064,16 +2072,16 @@ void GraphEdit::_zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputE
void GraphEdit::set_connection_activity(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port, float p_activity) { void GraphEdit::set_connection_activity(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port, float p_activity) {
ERR_FAIL_NULL_MSG(connections_layer, "connections_layer is missing."); ERR_FAIL_NULL_MSG(connections_layer, "connections_layer is missing.");
for (Ref<Connection> &c : connection_map[p_from]) { for (Ref<Connection> &conn : connection_map[p_from]) {
if (c->from_node == p_from && c->from_port == p_from_port && c->to_node == p_to && c->to_port == p_to_port) { if (conn->from_node == p_from && conn->from_port == p_from_port && conn->to_node == p_to && conn->to_port == p_to_port) {
if (!Math::is_equal_approx(c->activity, p_activity)) { if (!Math::is_equal_approx(conn->activity, p_activity)) {
// Update only if changed. // Update only if changed.
minimap->queue_redraw(); minimap->queue_redraw();
c->_cache.dirty = true; conn->_cache.dirty = true;
connections_layer->queue_redraw(); connections_layer->queue_redraw();
callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred(); callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred();
} }
c->activity = p_activity; conn->activity = p_activity;
return; return;
} }
} }
@ -2098,8 +2106,8 @@ void GraphEdit::reset_all_connection_activity() {
void GraphEdit::clear_connections() { void GraphEdit::clear_connections() {
ERR_FAIL_NULL_MSG(connections_layer, "connections_layer is missing."); ERR_FAIL_NULL_MSG(connections_layer, "connections_layer is missing.");
for (Ref<Connection> &c : connections) { for (Ref<Connection> &conn : connections) {
c->_cache.line->queue_free(); conn->_cache.line->queue_free();
} }
connections.clear(); connections.clear();
@ -2246,8 +2254,20 @@ void GraphEdit::remove_valid_left_disconnect_type(int p_type) {
valid_left_disconnect_types.erase(p_type); valid_left_disconnect_types.erase(p_type);
} }
void GraphEdit::set_connections(const TypedArray<Dictionary> &p_connections) {
clear_connections();
bool is_editor = Engine::get_singleton()->is_editor_hint();
for (const Dictionary &d : p_connections) {
// Always keep the connection alive in case it is created using the inspector.
bool keep_alive = (is_editor && d.is_empty()) || d["keep_alive"];
connect_node(d["from_node"], d["from_port"], d["to_node"], d["to_port"], keep_alive);
}
}
TypedArray<Dictionary> GraphEdit::_get_connection_list() const { TypedArray<Dictionary> GraphEdit::_get_connection_list() const {
List<Ref<Connection>> conns = get_connection_list(); Vector<Ref<Connection>> conns = get_connections();
TypedArray<Dictionary> arr; TypedArray<Dictionary> arr;
for (const Ref<Connection> &conn : conns) { for (const Ref<Connection> &conn : conns) {
@ -2256,6 +2276,7 @@ TypedArray<Dictionary> GraphEdit::_get_connection_list() const {
d["from_port"] = conn->from_port; d["from_port"] = conn->from_port;
d["to_node"] = conn->to_node; d["to_node"] = conn->to_node;
d["to_port"] = conn->to_port; d["to_port"] = conn->to_port;
d["keep_alive"] = conn->keep_alive;
arr.push_back(d); arr.push_back(d);
} }
return arr; return arr;
@ -2269,6 +2290,7 @@ Dictionary GraphEdit::_get_closest_connection_at_point(const Vector2 &p_point, f
ret["from_port"] = c->from_port; ret["from_port"] = c->from_port;
ret["to_node"] = c->to_node; ret["to_node"] = c->to_node;
ret["to_port"] = c->to_port; ret["to_port"] = c->to_port;
ret["keep_alive"] = c->keep_alive;
} }
return ret; return ret;
} }
@ -2283,6 +2305,7 @@ TypedArray<Dictionary> GraphEdit::_get_connections_intersecting_with_rect(const
d["from_port"] = conn->from_port; d["from_port"] = conn->from_port;
d["to_node"] = conn->to_node; d["to_node"] = conn->to_node;
d["to_port"] = conn->to_port; d["to_port"] = conn->to_port;
d["keep_alive"] = conn->keep_alive;
arr.push_back(d); arr.push_back(d);
} }
return arr; return arr;
@ -2307,8 +2330,8 @@ void GraphEdit::_update_zoom_label() {
} }
void GraphEdit::_invalidate_connection_line_cache() { void GraphEdit::_invalidate_connection_line_cache() {
for (Ref<Connection> &c : connections) { for (Ref<Connection> &conn : connections) {
c->_cache.dirty = true; conn->_cache.dirty = true;
} }
} }
@ -2635,10 +2658,11 @@ void GraphEdit::arrange_nodes() {
} }
void GraphEdit::_bind_methods() { void GraphEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("connect_node", "from_node", "from_port", "to_node", "to_port"), &GraphEdit::connect_node); ClassDB::bind_method(D_METHOD("connect_node", "from_node", "from_port", "to_node", "to_port", "keep_alive"), &GraphEdit::connect_node, DEFVAL(false));
ClassDB::bind_method(D_METHOD("is_node_connected", "from_node", "from_port", "to_node", "to_port"), &GraphEdit::is_node_connected); ClassDB::bind_method(D_METHOD("is_node_connected", "from_node", "from_port", "to_node", "to_port"), &GraphEdit::is_node_connected);
ClassDB::bind_method(D_METHOD("disconnect_node", "from_node", "from_port", "to_node", "to_port"), &GraphEdit::disconnect_node); ClassDB::bind_method(D_METHOD("disconnect_node", "from_node", "from_port", "to_node", "to_port"), &GraphEdit::disconnect_node);
ClassDB::bind_method(D_METHOD("set_connection_activity", "from_node", "from_port", "to_node", "to_port", "amount"), &GraphEdit::set_connection_activity); ClassDB::bind_method(D_METHOD("set_connection_activity", "from_node", "from_port", "to_node", "to_port", "amount"), &GraphEdit::set_connection_activity);
ClassDB::bind_method(D_METHOD("set_connections", "connections"), &GraphEdit::set_connections);
ClassDB::bind_method(D_METHOD("get_connection_list"), &GraphEdit::_get_connection_list); ClassDB::bind_method(D_METHOD("get_connection_list"), &GraphEdit::_get_connection_list);
ClassDB::bind_method(D_METHOD("get_closest_connection_at_point", "point", "max_distance"), &GraphEdit::_get_closest_connection_at_point, DEFVAL(4.0)); ClassDB::bind_method(D_METHOD("get_closest_connection_at_point", "point", "max_distance"), &GraphEdit::_get_closest_connection_at_point, DEFVAL(4.0));
ClassDB::bind_method(D_METHOD("get_connections_intersecting_with_rect", "rect"), &GraphEdit::_get_connections_intersecting_with_rect); ClassDB::bind_method(D_METHOD("get_connections_intersecting_with_rect", "rect"), &GraphEdit::_get_connections_intersecting_with_rect);
@ -2750,6 +2774,7 @@ void GraphEdit::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "connection_lines_curvature"), "set_connection_lines_curvature", "get_connection_lines_curvature"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "connection_lines_curvature"), "set_connection_lines_curvature", "get_connection_lines_curvature");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "connection_lines_thickness", PROPERTY_HINT_RANGE, "0,100,0.1,suffix:px"), "set_connection_lines_thickness", "get_connection_lines_thickness"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "connection_lines_thickness", PROPERTY_HINT_RANGE, "0,100,0.1,suffix:px"), "set_connection_lines_thickness", "get_connection_lines_thickness");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "connection_lines_antialiased"), "set_connection_lines_antialiased", "is_connection_lines_antialiased"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "connection_lines_antialiased"), "set_connection_lines_antialiased", "is_connection_lines_antialiased");
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "connections", PROPERTY_HINT_ARRAY_TYPE, vformat("%s/%s:%s", Variant::DICTIONARY, PROPERTY_HINT_NONE, String())), "set_connections", "get_connection_list");
ADD_GROUP("Zoom", ""); ADD_GROUP("Zoom", "");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "zoom"), "set_zoom", "get_zoom"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "zoom"), "set_zoom", "get_zoom");

10
scene/gui/graph_edit.h
View file

@ -120,6 +120,7 @@ public:
int from_port = 0; int from_port = 0;
int to_port = 0; int to_port = 0;
float activity = 0.0; float activity = 0.0;
bool keep_alive = true;
private: private:
struct Cache { struct Cache {
@ -238,7 +239,7 @@ private:
bool updating = false; bool updating = false;
bool awaiting_scroll_offset_update = false; bool awaiting_scroll_offset_update = false;
List<Ref<Connection>> connections; Vector<Ref<Connection>> connections;
HashMap<StringName, List<Ref<Connection>>> connection_map; HashMap<StringName, List<Ref<Connection>>> connection_map;
Ref<Connection> hovered_connection; Ref<Connection> hovered_connection;
@ -339,6 +340,7 @@ private:
bool is_in_port_hotzone(const Vector2 &p_pos, const Vector2 &p_mouse_pos, const Vector2i &p_port_size, bool p_left); bool is_in_port_hotzone(const Vector2 &p_pos, const Vector2 &p_mouse_pos, const Vector2i &p_port_size, bool p_left);
void set_connections(const TypedArray<Dictionary> &p_connections);
TypedArray<Dictionary> _get_connection_list() const; TypedArray<Dictionary> _get_connection_list() const;
Dictionary _get_closest_connection_at_point(const Vector2 &p_point, float p_max_distance = 4.0) const; Dictionary _get_closest_connection_at_point(const Vector2 &p_point, float p_max_distance = 4.0) const;
TypedArray<Dictionary> _get_connections_intersecting_with_rect(const Rect2 &p_rect) const; TypedArray<Dictionary> _get_connections_intersecting_with_rect(const Rect2 &p_rect) const;
@ -397,13 +399,13 @@ public:
void _update_graph_frame(GraphFrame *p_frame); void _update_graph_frame(GraphFrame *p_frame);
// Connection related methods. // Connection related methods.
Error connect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port); Error connect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port, bool keep_alive = false);
bool is_node_connected(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port); bool is_node_connected(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port);
void disconnect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port); void disconnect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port);
void clear_connections();
void force_connection_drag_end(); void force_connection_drag_end();
const List<Ref<Connection>> &get_connection_list() const; const Vector<Ref<Connection>> &get_connections() const;
void clear_connections();
virtual PackedVector2Array get_connection_line(const Vector2 &p_from, const Vector2 &p_to) const; virtual PackedVector2Array get_connection_line(const Vector2 &p_from, const Vector2 &p_to) const;
Ref<Connection> get_closest_connection_at_point(const Vector2 &p_point, float p_max_distance = 4.0) const; Ref<Connection> get_closest_connection_at_point(const Vector2 &p_point, float p_max_distance = 4.0) const;
List<Ref<Connection>> get_connections_intersecting_with_rect(const Rect2 &p_rect) const; List<Ref<Connection>> get_connections_intersecting_with_rect(const Rect2 &p_rect) const;

6
scene/gui/graph_edit_arranger.cpp
View file

@ -65,7 +65,7 @@ void GraphEditArranger::arrange_nodes() {
float gap_v = 100.0f; float gap_v = 100.0f;
float gap_h = 100.0f; float gap_h = 100.0f;
List<Ref<GraphEdit::Connection>> connection_list = graph_edit->get_connection_list(); const Vector<Ref<GraphEdit::Connection>> connection_list = graph_edit->get_connections();
for (int i = graph_edit->get_child_count() - 1; i >= 0; i--) { for (int i = graph_edit->get_child_count() - 1; i >= 0; i--) {
GraphNode *graph_element = Object::cast_to<GraphNode>(graph_edit->get_child(i)); GraphNode *graph_element = Object::cast_to<GraphNode>(graph_edit->get_child(i));
@ -438,7 +438,7 @@ float GraphEditArranger::_calculate_threshold(const StringName &p_v, const Strin
if (p_v == p_w) { if (p_v == p_w) {
int min_order = MAX_ORDER; int min_order = MAX_ORDER;
Ref<GraphEdit::Connection> incoming; Ref<GraphEdit::Connection> incoming;
List<Ref<GraphEdit::Connection>> connection_list = graph_edit->get_connection_list(); const Vector<Ref<GraphEdit::Connection>> connection_list = graph_edit->get_connections();
for (const Ref<GraphEdit::Connection> &connection : connection_list) { for (const Ref<GraphEdit::Connection> &connection : connection_list) {
if (connection->to_node == p_w) { if (connection->to_node == p_w) {
ORDER(connection->from_node, r_layers); ORDER(connection->from_node, r_layers);
@ -469,7 +469,7 @@ float GraphEditArranger::_calculate_threshold(const StringName &p_v, const Strin
// This time, pick an outgoing edge and repeat as above! // This time, pick an outgoing edge and repeat as above!
int min_order = MAX_ORDER; int min_order = MAX_ORDER;
Ref<GraphEdit::Connection> outgoing; Ref<GraphEdit::Connection> outgoing;
List<Ref<GraphEdit::Connection>> connection_list = graph_edit->get_connection_list(); const Vector<Ref<GraphEdit::Connection>> connection_list = graph_edit->get_connections();
for (const Ref<GraphEdit::Connection> &connection : connection_list) { for (const Ref<GraphEdit::Connection> &connection : connection_list) {
if (connection->from_node == p_w) { if (connection->from_node == p_w) {
ORDER(connection->to_node, r_layers); ORDER(connection->to_node, r_layers);