[Merged by Bors] - Camera Driven Rendering

crates/bevy_core_pipeline/Cargo.toml

@@ -19,7 +19,12 @@ trace = []
 # bevy
 bevy_app = { path = "../bevy_app", version = "0.8.0-dev" }
 bevy_asset = { path = "../bevy_asset", version = "0.8.0-dev" }
+bevy_derive = { path = "../bevy_derive", version = "0.8.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.8.0-dev" }
+bevy_reflect = { path = "../bevy_reflect", version = "0.8.0-dev" }
 bevy_render = { path = "../bevy_render", version = "0.8.0-dev" }
+bevy_transform = { path = "../bevy_transform", version = "0.8.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
 
+serde = { version = "1", features = ["derive"] }
+

crates/bevy_core_pipeline/src/clear_color.rs

@@ -0,0 +1,40 @@
+use bevy_derive::{Deref, DerefMut};
+use bevy_ecs::prelude::*;
+use bevy_reflect::{Reflect, ReflectDeserialize};
+use bevy_render::{color::Color, extract_resource::ExtractResource, RenderWorld};
+use serde::{Deserialize, Serialize};
+
+#[derive(Reflect, Serialize, Deserialize, Clone, Debug)]
+#[reflect_value(Serialize, Deserialize)]
+pub enum ClearColorConfig {
+    Default,
+    Custom(Color),
+    None,
+}
+
+impl Default for ClearColorConfig {
+    fn default() -> Self {
+        ClearColorConfig::Default
+    }
+}
+
+/// When used as a resource, sets the color that is used to clear the screen between frames.
+///
+/// This color appears as the "background" color for simple apps, when
+/// there are portions of the screen with nothing rendered.
+#[derive(Component, Clone, Debug, Deref, DerefMut, ExtractResource)]
+pub struct ClearColor(pub Color);
+
+impl Default for ClearColor {
+    fn default() -> Self {
+        Self(Color::rgb(0.4, 0.4, 0.4))
+    }
+}
+
+pub fn extract_clear_color(clear_color: Res<ClearColor>, mut render_world: ResMut<RenderWorld>) {
+    // If the clear color has changed
+    if clear_color.is_changed() {
+        // Update the clear color resource in the render world
+        render_world.insert_resource(clear_color.clone());
+    }
+}

crates/bevy_core_pipeline/src/core_2d/camera_2d.rs

@@ -0,0 +1,82 @@
+use crate::clear_color::ClearColorConfig;
+use bevy_ecs::{prelude::*, query::QueryItem};
+use bevy_reflect::Reflect;
+use bevy_render::{
+    camera::{
+        Camera, CameraProjection, CameraRenderGraph, DepthCalculation, OrthographicProjection,
+    },
+    extract_component::ExtractComponent,
+    primitives::Frustum,
+    view::VisibleEntities,
+};
+use bevy_transform::prelude::{GlobalTransform, Transform};
+
+#[derive(Component, Default, Reflect, Clone)]
+#[reflect(Component)]
+pub struct Camera2d {
+    pub clear_color: ClearColorConfig,
+}
+
+impl ExtractComponent for Camera2d {
+    type Query = &'static Self;
+    type Filter = With<Camera>;
+
+    fn extract_component(item: QueryItem<Self::Query>) -> Self {
+        item.clone()
+    }
+}
+
+#[derive(Bundle)]
+pub struct Camera2dBundle {
+    pub camera: Camera,
+    pub camera_render_graph: CameraRenderGraph,
+    pub projection: OrthographicProjection,
+    pub visible_entities: VisibleEntities,
+    pub frustum: Frustum,
+    pub transform: Transform,
+    pub global_transform: GlobalTransform,
+    pub camera_2d: Camera2d,
+}
+
+impl Default for Camera2dBundle {
+    fn default() -> Self {
+        Self::new_with_far(1000.0)
+    }
+}
+
+impl Camera2dBundle {
+    /// Create an orthographic projection camera with a custom Z position.
+    ///
+    /// The camera is placed at `Z=far-0.1`, looking toward the world origin `(0,0,0)`.
+    /// Its orthographic projection extends from `0.0` to `-far` in camera view space,
+    /// corresponding to `Z=far-0.1` (closest to camera) to `Z=-0.1` (furthest away from
+    /// camera) in world space.
+    pub fn new_with_far(far: f32) -> Self {
+        // we want 0 to be "closest" and +far to be "farthest" in 2d, so we offset
+        // the camera's translation by far and use a right handed coordinate system
+        let projection = OrthographicProjection {
+            far,
+            depth_calculation: DepthCalculation::ZDifference,
+            ..Default::default()
+        };
+        let transform = Transform::from_xyz(0.0, 0.0, far - 0.1);
+        let view_projection =
+            projection.get_projection_matrix() * transform.compute_matrix().inverse();
+        let frustum = Frustum::from_view_projection(
+            &view_projection,
+            &transform.translation,
+            &transform.back(),
+            projection.far(),
+        );
+        Self {
+            camera_render_graph: CameraRenderGraph::new(crate::core_2d::graph::NAME),
+            projection,
+            visible_entities: VisibleEntities::default(),
+            frustum,
+            transform,
+            global_transform: Default::default(),
+            camera: Camera::default(),
+            camera_2d: Camera2d::default(),
+        }
+    }
+}

crates/bevy_core_pipeline/src/main_pass_2d.rs → crates/bevy_core_pipeline/src/core_2d/main_pass_2d_node.rs

@@ -1,4 +1,7 @@
-use crate::Transparent2d;
+use crate::{
+    clear_color::{ClearColor, ClearColorConfig},
+    core_2d::{camera_2d::Camera2d, Transparent2d},
+};
 use bevy_ecs::prelude::*;
 use bevy_render::{
     render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
@@ -9,16 +12,22 @@ use bevy_render::{
 };
 
 pub struct MainPass2dNode {
-    query:
-        QueryState<(&'static RenderPhase<Transparent2d>, &'static ViewTarget), With<ExtractedView>>,
+    query: QueryState<
+        (
+            &'static RenderPhase<Transparent2d>,
+            &'static ViewTarget,
+            &'static Camera2d,
+        ),
+        With<ExtractedView>,
+    >,
 }
 
 impl MainPass2dNode {
     pub const IN_VIEW: &'static str = "view";
 
     pub fn new(world: &mut World) -> Self {
         Self {
-            query: QueryState::new(world),
+            query: world.query_filtered(),
         }
     }
 }
@@ -39,20 +48,24 @@ impl Node for MainPass2dNode {
         world: &World,
     ) -> Result<(), NodeRunError> {
         let view_entity = graph.get_input_entity(Self::IN_VIEW)?;
-        // If there is no view entity, do not try to process the render phase for the view
-        let (transparent_phase, target) = match self.query.get_manual(world, view_entity) {
-            Ok(it) => it,
-            _ => return Ok(()),
-        };
-
-        if transparent_phase.items.is_empty() {
-            return Ok(());
-        }
+        let (transparent_phase, target, camera_2d) =
+            if let Ok(result) = self.query.get_manual(world, view_entity) {
+                result
+            } else {
+                // no target
+                return Ok(());
+            };
 
         let pass_descriptor = RenderPassDescriptor {
             label: Some("main_pass_2d"),
             color_attachments: &[target.get_color_attachment(Operations {
-                load: LoadOp::Load,
+                load: match camera_2d.clear_color {
+                    ClearColorConfig::Default => {
+                        LoadOp::Clear(world.resource::<ClearColor>().0.into())
+                    }
+                    ClearColorConfig::Custom(color) => LoadOp::Clear(color.into()),
+                    ClearColorConfig::None => LoadOp::Load,
+                },
                 store: true,
             })],
             depth_stencil_attachment: None,