Skip to content

Commit

Permalink
Merge pull request #60124 from KoBeWi/sepyt_noitcennoc_dilav
Browse files Browse the repository at this point in the history
  • Loading branch information
akien-mga authored Apr 11, 2022
2 parents 596e529 + b29aff8 commit f44e5db
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions scene/gui/graph_edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
for (int j = 0; j < gn->get_connection_output_count(); j++) {
Vector2 pos = gn->get_connection_output_position(j) + gn->get_position();
int type = gn->get_connection_output_type(j);
if ((type == connecting_type || valid_connection_types.has(ConnType(type, connecting_type))) && is_in_output_hotzone(gn, j, mpos, port_size)) {
if ((type == connecting_type || valid_connection_types.has(ConnType(connecting_type, type))) && is_in_output_hotzone(gn, j, mpos, port_size)) {
connecting_target = true;
connecting_to = pos;
connecting_target_to = gn->get_name();
Expand All @@ -708,7 +708,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
for (int j = 0; j < gn->get_connection_input_count(); j++) {
Vector2 pos = gn->get_connection_input_position(j) + gn->get_position();
int type = gn->get_connection_input_type(j);
if ((type == connecting_type || valid_connection_types.has(ConnType(type, connecting_type))) && is_in_input_hotzone(gn, j, mpos, port_size)) {
if ((type == connecting_type || valid_connection_types.has(ConnType(connecting_type, type))) && is_in_input_hotzone(gn, j, mpos, port_size)) {
connecting_target = true;
connecting_to = pos;
connecting_target_to = gn->get_name();
Expand Down Expand Up @@ -1568,26 +1568,17 @@ void GraphEdit::_update_zoom_label() {
}

void GraphEdit::add_valid_connection_type(int p_type, int p_with_type) {
ConnType ct;
ct.type_a = p_type;
ct.type_b = p_with_type;

ConnType ct(p_type, p_with_type);
valid_connection_types.insert(ct);
}

void GraphEdit::remove_valid_connection_type(int p_type, int p_with_type) {
ConnType ct;
ct.type_a = p_type;
ct.type_b = p_with_type;

ConnType ct(p_type, p_with_type);
valid_connection_types.erase(ct);
}

bool GraphEdit::is_valid_connection_type(int p_type, int p_with_type) const {
ConnType ct;
ct.type_a = p_type;
ct.type_b = p_with_type;

ConnType ct(p_type, p_with_type);
return valid_connection_types.has(ct);
}

Expand Down

0 comments on commit f44e5db

Please sign in to comment.