@woosh/meep-engine 2.46.14 → 2.46.16

package/package.json

@@ -4,7 +4,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.46.14",
+  "version": "2.46.16",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "scripts": {

package/src/core/model/node-graph/NodeGraph.js

@@ -84,8 +84,55 @@ export class NodeGraph {
 
         this.reset();
 
-        const other_nodes = other.nodes.asArray();
-        const node_count = other_nodes.length;
+        this.merge(other);
+
+    }
+
+    /**
+     *
+     * @returns {NodeGraph}
+     */
+    clone() {
+        const r = new NodeGraph();
+
+        r.copy(this);
+
+        return r;
+    }
+
+    /**
+     * Merge another graph into this one
+     * Supplied graph does not change as a result
+     * @see {@link #mergeFragment}
+     * @param {NodeGraph} other
+     * @returns {{connections:Connection[], nodes:NodeInstance[]}}
+     */
+    merge(other) {
+        if (other === this) {
+            // can't merge with self, invalid operation
+            throw new Error("Can't merge with self, invalid operation");
+        }
+
+        return this.mergeFragment({
+            nodes: other.nodes.asArray(),
+            connections: other.connections.asArray()
+        });
+    }
+
+    /**
+     * Merge foreign nodes and associated connections into this graph
+     * New node instances and connections will be created to reflect these inside this graph
+     * @param {NodeInstance[]} nodes
+     * @param {Connection[]} [connections]
+     * @returns {{connections:Connection[], nodes:NodeInstance[]}} local created instances
+     */
+    mergeFragment({ nodes, connections = [] }) {
+
+        const previous_node_count = this.nodes.length;
+        const previous_connection_count = this.connections.length;
+
+        const other_nodes = nodes;
+        const additional_node_count = other_nodes.length;
 
         /**
          * Mapping from original IDs to IDs in this graph
@@ -93,16 +140,16 @@ export class NodeGraph {
          */
         const this_nodes = {};
 
-        for (let i = 0; i < node_count; i++) {
+        for (let i = 0; i < additional_node_count; i++) {
             const other_node = other_nodes[i];
             this_nodes[other_node.id] = this.createNode(other_node.description);
         }
 
         // create connections
-        const other_connections = other.connections.asArray();
-        const connection_count = other_connections.length;
+        const other_connections = connections;
+        const additional_connection_count = other_connections.length;
 
-        for (let i = 0; i < connection_count; i++) {
+        for (let i = 0; i < additional_connection_count; i++) {
             const other_connection = other_connections[i];
 
             const other_source = other_connection.source;
@@ -121,18 +168,10 @@ export class NodeGraph {
             );
         }
 
-    }
-
-    /**
-     *
-     * @returns {NodeGraph}
-     */
-    clone() {
-        const r = new NodeGraph();
-
-        r.copy(this);
-
-        return r;
+        return {
+            connections: this.connections.asArray().slice(previous_connection_count, previous_connection_count + additional_connection_count),
+            nodes: this.nodes.asArray().slice(previous_node_count, previous_node_count + additional_node_count)
+        };
     }
 
     /**

package/src/core/model/node-graph/util/graph_clone_by_node_subset.js

@@ -18,39 +18,13 @@ export function graph_clone_by_node_subset({ graph, nodes }) {
 
     const result = new NodeGraph();
 
-    /**
-     * Maps from source node IDs to result node IDs
-     * @type {Object<number,number>}
-     */
-    const cloned_nodes = {};
+    const connections = graph_collect_connections_amongst_nodes({ graph, nodes });
 
-    nodes.forEach(n => {
-
-        if (!graph.hasNode(n)) {
-            throw new Error(`Referenced node ${n} is not a found in the graph`);
-        }
-
-        const id = result.createNode(n.description);
-
-        cloned_nodes[n.id] = id;
+    result.mergeFragment({
+        nodes,
+        connections
     });
 
-    graph_collect_connections_amongst_nodes({ graph, nodes })
-        .forEach(connection => {
-
-            const source_node_id = cloned_nodes[connection.source.instance.id];
-            const source_endpoint = result.getNode(source_node_id).getEndpoint(connection.source.port.id);
-
-            const target_node_id = cloned_nodes[connection.target.instance.id];
-            const target_endpoint = result.getNode(target_node_id).getEndpoint(connection.target.port.id);
-
-            result.createConnection(
-                source_node_id, source_endpoint.id,
-                target_node_id, target_endpoint.id
-            );
-
-        });
-
     return result;
 
 }