add_node_edges

bevyengine · Mar 16, 2023 · 94bcf89 · 94bcf89
1 parent 9a977b1
commit 94bcf89
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 31 deletions.
diff --git a/crates/bevy_core_pipeline/src/core_2d/mod.rs b/crates/bevy_core_pipeline/src/core_2d/mod.rs
@@ -92,15 +92,14 @@ impl Plugin for Core2dPlugin {
             graph::node::UPSCALING,
             UpscalingNode::IN_VIEW,
         );
-        draw_2d_graph.add_node_edge(graph::node::MAIN_PASS, graph::node::TONEMAPPING);
-        draw_2d_graph.add_node_edge(
+
+        draw_2d_graph.add_node_edges(&[
+            graph::node::MAIN_PASS,
             graph::node::TONEMAPPING,
             graph::node::END_MAIN_PASS_POST_PROCESSING,
-        );
-        draw_2d_graph.add_node_edge(
-            graph::node::END_MAIN_PASS_POST_PROCESSING,
             graph::node::UPSCALING,
-        );
+        ]);
+
         graph.add_sub_graph(graph::NAME, draw_2d_graph);
     }
 }

diff --git a/crates/bevy_core_pipeline/src/core_3d/mod.rs b/crates/bevy_core_pipeline/src/core_3d/mod.rs
@@ -119,16 +119,15 @@ impl Plugin for Core3dPlugin {
             graph::node::UPSCALING,
             UpscalingNode::IN_VIEW,
         );
-        draw_3d_graph.add_node_edge(graph::node::PREPASS, graph::node::MAIN_PASS);
-        draw_3d_graph.add_node_edge(graph::node::MAIN_PASS, graph::node::TONEMAPPING);
-        draw_3d_graph.add_node_edge(
+
+        draw_3d_graph.add_node_edges(&[
+            graph::node::PREPASS,
+            graph::node::MAIN_PASS,
             graph::node::TONEMAPPING,
             graph::node::END_MAIN_PASS_POST_PROCESSING,
-        );
-        draw_3d_graph.add_node_edge(
-            graph::node::END_MAIN_PASS_POST_PROCESSING,
             graph::node::UPSCALING,
-        );
+        ]);
+
         graph.add_sub_graph(graph::NAME, draw_3d_graph);
     }
 }

diff --git a/crates/bevy_core_pipeline/src/lib.rs b/crates/bevy_core_pipeline/src/lib.rs
@@ -86,7 +86,8 @@ pub fn add_node<T: Node + FromWorld>(
     let mut render_graph = render_app.world.resource_mut::<RenderGraph>();
 
     let graph = render_graph.get_sub_graph_mut(sub_graph_name).unwrap();
-    graph.add_node_with_edges(node_name, node, edges);
+    graph.add_node(node_name, node);
+    graph.add_node_edges(edges);
 
     graph.add_slot_edge(graph.input_node().id, output_slot, node_name, input_slot);
 }
diff --git a/crates/bevy_render/src/render_graph/graph.rs b/crates/bevy_render/src/render_graph/graph.rs
@@ -119,24 +119,12 @@ impl RenderGraph {
         id
     }
 
-    /// Adds the `node` with the `name` to the graph.
-    /// If the name is already present replaces it instead.
-    /// Also adds `node_edge` based on the order of the given `edges`.
-    pub fn add_node_with_edges<T>(
-        &mut self,
-        name: impl Into<Cow<'static, str>>,
-        node: T,
-        edges: &[&'static str],
-    ) -> NodeId
-    where
-        T: Node,
-    {
-        let id = self.add_node(name, node);
+    /// Add `node_edge` based on the order of the given `edges` array.
+    pub fn add_node_edges(&mut self, edges: &[&'static str]) {
         for window in edges.windows(2) {
             let [a, b] = window else { break; };
             self.add_node_edge(*a, *b);
         }
-        id
     }
 
     /// Removes the `node` with the `name` from the graph.
@@ -855,7 +843,7 @@ mod tests {
     }
 
     #[test]
-    fn test_add_node_with_edges() {
+    fn test_add_node_edges() {
         struct SimpleNode;
         impl Node for SimpleNode {
             fn run(
@@ -875,10 +863,10 @@ mod tests {
 
         let mut graph = RenderGraph::default();
         let a_id = graph.add_node("A", SimpleNode);
+        let b_id = graph.add_node("B", SimpleNode);
         let c_id = graph.add_node("C", SimpleNode);
 
-        // A and C need to exist first
-        let b_id = graph.add_node_with_edges("B", SimpleNode, &["A", "B", "C"]);
+        graph.add_node_edges(&["A", "B", "C"]);
 
         assert!(
             output_nodes("A", &graph) == HashSet::from_iter(vec![b_id]),