GH-722 Correctly copy node state using ui_copy action

CraterCrash · Aug 12, 2024 · c2f475d · c2f475d
1 parent c7c0df6
commit c2f475d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/editor/graph/graph_edit.cpp b/src/editor/graph/graph_edit.cpp
@@ -1898,8 +1898,7 @@ void OrchestratorGraphEdit::_on_copy_nodes_request()
 
             const int id = script_node->get_id();
             _clipboard->positions[id] = script_node->get_position();
-            // Be sure to clone to create new copies of pins
-            _clipboard->nodes[id] = script_node->duplicate(true);
+            _clipboard->nodes[id] = _script_graph->copy_node(id, true);
         }
     });
 

diff --git a/src/script/graph.cpp b/src/script/graph.cpp
@@ -359,6 +359,25 @@ void OScriptGraph::move_node_to(const Ref<OScriptNode>& p_node, const Ref<OScrip
     p_target->add_node(p_node);
 }
 
+Ref<OScriptNode> OScriptGraph::copy_node(int p_node_id, bool p_duplicate_resources)
+{
+    const Ref<OScriptNode> node = get_node(p_node_id);
+    if (!node.is_valid())
+    {
+        ERR_PRINT("Cannot copy node with id " + itos(p_node_id));
+        return nullptr;
+    }
+
+    // Duplicate node
+    Ref<OScriptNode> duplicate = node->duplicate(p_duplicate_resources);
+
+    // Partially initialize, only so state gets copied/set
+    duplicate->_orchestration = _orchestration;
+    duplicate->post_initialize();
+
+    return duplicate;
+}
+
 Ref<OScriptNode> OScriptGraph::duplicate_node(int p_node_id, const Vector2& p_delta, bool p_duplicate_resources)
 {
     const Ref<OScriptNode> node = get_node(p_node_id);

diff --git a/src/script/graph.h b/src/script/graph.h
@@ -175,6 +175,12 @@ class OScriptGraph : public Resource
     /// @param p_target the target graph
     void move_node_to(const Ref<OScriptNode>& p_node, const Ref<OScriptGraph>& p_target);
 
+    /// Creates a copy of the specified node
+    /// @param p_node_id the node to copy
+    /// @param p_duplicate_resources whether to duplicate sub-resources, defaults o false
+    /// @return the copied node reference
+    Ref<OScriptNode> copy_node(int p_node_id, bool p_duplicate_resources = false);
+
     /// Duplicate the specified node
     /// @param p_node_id the node to duplicate
     /// @param p_delta the position to add to the existing node's position