From b0df4915599e58a5c7e1b2d9e28e4f57b5d4e57e Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Sun, 19 Jan 2020 12:43:18 -0800
Subject: [PATCH] make legacy rendergraph optional (and off by default)

---
 examples/entity_builder_comparison.rs     |  2 +-
 examples/instancing.rs                    |  2 +-
 examples/load_model.rs                    |  2 +-
 examples/parenting.rs                     |  2 +-
 examples/serializing.rs                   |  2 +-
 examples/shader_material.rs               |  2 +-
 examples/simple.rs                        |  2 +-
 examples/texture.rs                       |  2 +-
 examples/ui.rs                            |  2 +-
 src/app/app.rs                            | 23 +++++---
 src/app/app_builder.rs                    | 69 +++++++++++++----------
 src/render/render_graph_2/render_graph.rs | 37 +-----------
 src/render/render_graph_2/renderer.rs     |  8 ++-
 13 files changed, 73 insertions(+), 82 deletions(-)

diff --git a/examples/entity_builder_comparison.rs b/examples/entity_builder_comparison.rs
index 50a15cf1d0..651a0680ff 100644
--- a/examples/entity_builder_comparison.rs
+++ b/examples/entity_builder_comparison.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 
 fn main() {
-    AppBuilder::new().add_defaults().setup_world(setup).run();
+    AppBuilder::new().add_defaults_legacy().setup_world(setup).run();
 }
 
 #[allow(dead_code)]
diff --git a/examples/instancing.rs b/examples/instancing.rs
index b4f5a1080b..0336a09fd4 100644
--- a/examples/instancing.rs
+++ b/examples/instancing.rs
@@ -21,7 +21,7 @@ struct Wander {
 
 fn main() {
     AppBuilder::new()
-        .add_defaults()
+        .add_defaults_legacy()
         .setup_world(setup)
         .add_system(build_wander_system())
         .add_system(build_navigate_system())
diff --git a/examples/load_model.rs b/examples/load_model.rs
index 5384d5a72a..0ccc3ab137 100644
--- a/examples/load_model.rs
+++ b/examples/load_model.rs
@@ -2,5 +2,5 @@ use bevy::{asset, prelude::*};
 
 fn main() {
     asset::load_gltf("examples/assets/Box.gltf").unwrap();
-    AppBuilder::new().add_defaults().run();
+    AppBuilder::new().add_defaults_legacy().run();
 }
diff --git a/examples/parenting.rs b/examples/parenting.rs
index 6da5ab5b28..1dca75b192 100644
--- a/examples/parenting.rs
+++ b/examples/parenting.rs
@@ -4,7 +4,7 @@ struct Rotator;
 
 fn main() {
     AppBuilder::new()
-        .add_defaults()
+        .add_defaults_legacy()
         .setup_world(setup)
         .add_system(build_rotator_system())
         .run();
diff --git a/examples/serializing.rs b/examples/serializing.rs
index 3f1af2febb..e6a19949c7 100644
--- a/examples/serializing.rs
+++ b/examples/serializing.rs
@@ -2,7 +2,7 @@ use bevy::{prelude::*, serialization::*};
 use serde::{Deserialize, Serialize};
 use type_uuid::TypeUuid;
 fn main() {
-    let app = AppBuilder::new().add_defaults().setup_world(setup).build();
+    let app = AppBuilder::new().add_defaults_legacy().setup_world(setup).build();
 
     let comp_registrations = [ComponentRegistration::of::<Test>()];
 
diff --git a/examples/shader_material.rs b/examples/shader_material.rs
index 0e8eb518a1..bbe0644e0c 100644
--- a/examples/shader_material.rs
+++ b/examples/shader_material.rs
@@ -1,7 +1,7 @@
 use bevy::{prelude::*, asset, render::{Albedo, render_graph_2::{StandardMaterial, ShaderMaterials, ShaderMaterial, ShaderValue}}};
 
 fn main() {
-    AppBuilder::new().add_defaults().setup_world(setup).run();
+    AppBuilder::new().add_defaults_legacy().setup_world(setup).run();
 }
 
 fn setup(world: &mut World) {
diff --git a/examples/simple.rs b/examples/simple.rs
index 42220a3929..0a22908cc0 100644
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 
 fn main() {
-    AppBuilder::new().add_defaults().setup_world(setup).run();
+    AppBuilder::new().add_defaults_legacy().setup_world(setup).run();
 }
 
 fn setup(world: &mut World) {
diff --git a/examples/texture.rs b/examples/texture.rs
index ac24f47f76..231ba59847 100644
--- a/examples/texture.rs
+++ b/examples/texture.rs
@@ -1,7 +1,7 @@
 use bevy::{asset, prelude::*};
 
 fn main() {
-    AppBuilder::new().add_defaults().setup_world(setup).run();
+    AppBuilder::new().add_defaults_legacy().setup_world(setup).run();
 }
 
 fn setup(world: &mut World) {
diff --git a/examples/ui.rs b/examples/ui.rs
index 7afb424024..6eb01f3a5c 100644
--- a/examples/ui.rs
+++ b/examples/ui.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 
 fn main() {
-    AppBuilder::new().add_defaults().setup_world(setup).run();
+    AppBuilder::new().add_defaults_legacy().setup_world(setup).run();
 }
 
 fn setup(world: &mut World) {
diff --git a/src/app/app.rs b/src/app/app.rs
index b9e087b174..2cb333233a 100644
--- a/src/app/app.rs
+++ b/src/app/app.rs
@@ -11,7 +11,7 @@ use crate::{core::Time, render::*, app::AppBuilder};
 pub struct App {
     pub universe: Universe,
     pub world: World,
-    pub render_graph: RenderGraph,
+    pub legacy_render_graph: Option<RenderGraph>,
     pub schedule: Schedule,
 }
 
@@ -20,13 +20,13 @@ impl App {
         universe: Universe,
         world: World,
         schedule: Schedule,
-        render_graph: RenderGraph,
+        legacy_render_graph: Option<RenderGraph>,
     ) -> App {
         App {
             universe,
             world,
             schedule: schedule,
-            render_graph,
+            legacy_render_graph: legacy_render_graph,
         }
     }
 
@@ -39,7 +39,12 @@ impl App {
             time.start();
         }
         self.schedule.execute(&mut self.world);
-        self.render_graph.render(&mut self.world);
+
+        // TODO: remove me
+        if let Some(ref mut render_graph) = self.legacy_render_graph {
+            render_graph.render(&mut self.world);
+        }
+
         if let Some(mut time) = self.world.resources.get_mut::<Time>() {
             time.stop();
         }
@@ -59,7 +64,9 @@ impl App {
         self.world.resources.insert(window);
 
         log::info!("Initializing the example...");
-        self.render_graph.initialize(&mut self.world);
+        if let Some(ref mut render_graph) = self.legacy_render_graph {
+            render_graph.initialize(&mut self.world);
+        }
 
         log::info!("Entering render loop...");
         event_loop.run(move |event, _, control_flow| {
@@ -73,8 +80,10 @@ impl App {
                     event: WindowEvent::Resized(size),
                     ..
                 } => {
-                    self.render_graph
-                        .resize(size.width, size.height, &mut self.world);
+                    if let Some(ref mut render_graph) = self.legacy_render_graph {
+                        render_graph
+                            .resize(size.width, size.height, &mut self.world);
+                    }
                 }
                 event::Event::WindowEvent { event, .. } => match event {
                     WindowEvent::KeyboardInput {
diff --git a/src/app/app_builder.rs b/src/app/app_builder.rs
index e0d17759f1..eac720e1ee 100644
--- a/src/app/app_builder.rs
+++ b/src/app/app_builder.rs
@@ -15,7 +15,7 @@ pub const UPDATE: &str = "update";
 pub struct AppBuilder {
     pub world: World,
     pub universe: Universe,
-    pub render_graph: RenderGraph,
+    pub legacy_render_graph: Option<RenderGraph>,
     pub system_stages: HashMap<String, Vec<Box<dyn Schedulable>>>,
     pub runnable_stages: HashMap<String, Vec<Box<dyn Runnable>>>,
     pub stage_order: Vec<String>,
@@ -28,7 +28,7 @@ impl AppBuilder {
         AppBuilder {
             universe,
             world,
-            render_graph: RenderGraph::new(),
+            legacy_render_graph: None,
             system_stages: HashMap::new(),
             runnable_stages: HashMap::new(),
             stage_order: Vec::new(),
@@ -59,7 +59,7 @@ impl AppBuilder {
             self.universe,
             self.world,
             schedule_builder.build(),
-            self.render_graph,
+            self.legacy_render_graph,
         )
     }
 
@@ -107,33 +107,42 @@ impl AppBuilder {
         self
     }
 
+    pub fn with_legacy_render_graph(mut self) -> Self {
+        self.legacy_render_graph = Some(RenderGraph::new());
+        self
+    }
+
     pub fn add_default_passes(mut self) -> Self {
         let msaa_samples = 4;
-        let render_graph = &mut self.render_graph;
-        render_graph
-            .add_render_resource_manager(Box::new(render_resources::MaterialResourceManager));
-        render_graph
-            .add_render_resource_manager(Box::new(render_resources::LightResourceManager::new(10)));
-        render_graph.add_render_resource_manager(Box::new(render_resources::GlobalResourceManager));
-        render_graph
-            .add_render_resource_manager(Box::new(render_resources::Global2dResourceManager));
+        {
+            let render_graph = &mut self.legacy_render_graph.as_mut().unwrap();
+            render_graph
+                .add_render_resource_manager(Box::new(render_resources::MaterialResourceManager));
+            render_graph.add_render_resource_manager(Box::new(
+                render_resources::LightResourceManager::new(10),
+            ));
+            render_graph
+                .add_render_resource_manager(Box::new(render_resources::GlobalResourceManager));
+            render_graph
+                .add_render_resource_manager(Box::new(render_resources::Global2dResourceManager));
 
-        let depth_format = wgpu::TextureFormat::Depth32Float;
-        render_graph.set_pass(
-            "forward",
-            Box::new(ForwardPass::new(depth_format, msaa_samples)),
-        );
-        render_graph.set_pipeline(
-            "forward",
-            "forward",
-            Box::new(ForwardPipeline::new(msaa_samples)),
-        );
-        render_graph.set_pipeline(
-            "forward",
-            "forward_instanced",
-            Box::new(ForwardInstancedPipeline::new(depth_format, msaa_samples)),
-        );
-        render_graph.set_pipeline("forward", "ui", Box::new(UiPipeline::new(msaa_samples)));
+            let depth_format = wgpu::TextureFormat::Depth32Float;
+            render_graph.set_pass(
+                "forward",
+                Box::new(ForwardPass::new(depth_format, msaa_samples)),
+            );
+            render_graph.set_pipeline(
+                "forward",
+                "forward",
+                Box::new(ForwardPipeline::new(msaa_samples)),
+            );
+            render_graph.set_pipeline(
+                "forward",
+                "forward_instanced",
+                Box::new(ForwardInstancedPipeline::new(depth_format, msaa_samples)),
+            );
+            render_graph.set_pipeline("forward", "ui", Box::new(UiPipeline::new(msaa_samples)));
+        }
 
         self
     }
@@ -155,8 +164,10 @@ impl AppBuilder {
         self
     }
 
-    pub fn add_defaults(self) -> Self {
-        self.add_default_resources()
+    pub fn add_defaults_legacy(self) -> Self {
+        self
+            .with_legacy_render_graph()
+            .add_default_resources()
             .add_default_passes()
             .add_default_systems()
     }
diff --git a/src/render/render_graph_2/render_graph.rs b/src/render/render_graph_2/render_graph.rs
index 9c5f2422d6..9220ba395f 100644
--- a/src/render/render_graph_2/render_graph.rs
+++ b/src/render/render_graph_2/render_graph.rs
@@ -1,8 +1,6 @@
 use crate::render::render_graph_2::{PassDescriptor, PipelineDescriptor};
 use std::collections::HashMap;
 
-// holds on to passes, pipeline descriptions, instances
-// passes: shadow, forward
 pub struct RenderGraph {
     pub pipeline_descriptors: HashMap<String, PipelineDescriptor>,
     pub pass_descriptors: HashMap<String, PassDescriptor>,
@@ -62,37 +60,4 @@ impl RenderGraphBuilder {
     pub fn build(self) -> RenderGraph {
         self.render_graph
     }
-}
-
-/*
-RenderGraph::build()
-.AddPass("forward", Pass {
-
-})
-.AddPipeline(Pipeline::build()
-  .with_vertex_shader("pbr.vert")
-  .with_fragment_shader("pbr.frag")
-  .add_vertex_layout(Vertex::get_layout()) // maybe someday reflect this using spirv-reflect
-  .add_uniform_binding("camera_resource", "shader_camera") // if a uniform is not bound directly, and no uniforms are set on entity, produce an error
-  .add_texture_binding("some_texture", "shader_texture") // if a uniform is not bound directly, and no uniforms are set on entity, produce an error
-  .add_draw_target(MeshDrawTarget)
-  .add_draw_target(InstancedMeshDrawTarget)
-)
-.AddPipeline(Pipeline::build()
-  .with_vertex_shader("ui.vert")
-  .with_fragment_shader("ui.frag")
-  .with_vertex_layout(Vertex::get_layout())
-  .with_draw_target(UiDrawTarget)
-)
-.AddPass("shadow", Pass {
-    render_target: Null
-    depth_target: DepthTexture (TextureView)
-})
-.AddPipeline(Pipeline::build()
-  .with_vertex_shader("pbr.vert")
-  .with_fragment_shader("pbr.frag")
-  .with_vertex_layout(Vertex::get_layout())
-  .with_draw_target(ShadowedMeshDrawTarget)
-  .with_draw_target(ShadowedInstancedMeshDrawTarget)
-)
-*/
+}
\ No newline at end of file
diff --git a/src/render/render_graph_2/renderer.rs b/src/render/render_graph_2/renderer.rs
index c47b2f5eb5..6c438dd1c1 100644
--- a/src/render/render_graph_2/renderer.rs
+++ b/src/render/render_graph_2/renderer.rs
@@ -209,4 +209,10 @@ impl<'a, 'b, 'c> RenderPass for WgpuRenderPass<'a, 'b, 'c> {
     fn set_index_buffer(&mut self, buffer: &wgpu::Buffer, offset: wgpu::BufferAddress) {
         self.render_pass.set_index_buffer(buffer, offset);
     }
-}
\ No newline at end of file
+}
+
+// pub trait RenderResources {
+//     fn get_buffer(name: &str) -> Option<Buffer>;
+//     fn get_texture(name: &str) -> Option<Texture>;
+//     fn get_sampler(name: &str) -> Option<Sampler>;
+// }
\ No newline at end of file