diff --git a/crates/bevy_input/src/lib.rs b/crates/bevy_input/src/lib.rs index ad0ed7cb19..7b63d88f7c 100644 --- a/crates/bevy_input/src/lib.rs +++ b/crates/bevy_input/src/lib.rs @@ -5,6 +5,10 @@ pub mod system; pub use input::*; +pub mod prelude { + pub use crate::{keyboard::KeyCode, mouse::MouseButton, Input}; +} + use bevy_app::prelude::*; use keyboard::{keyboard_input_system, KeyCode, KeyboardInput, KeyboardInputState}; use mouse::{ diff --git a/crates/bevy_pbr/src/lib.rs b/crates/bevy_pbr/src/lib.rs index b2bf3800c1..147f9b9161 100644 --- a/crates/bevy_pbr/src/lib.rs +++ b/crates/bevy_pbr/src/lib.rs @@ -3,9 +3,11 @@ pub mod light; pub mod material; pub mod nodes; pub mod pipelines; +pub mod render_graph; -mod forward_pbr_render_graph; -pub use forward_pbr_render_graph::*; +pub mod prelude { + pub use crate::{entity::*, light::Light, material::StandardMaterial}; +} use bevy_app::prelude::*; use bevy_asset::AddAsset; @@ -14,6 +16,7 @@ use bevy_render::{render_graph::RenderGraph, shader}; use bevy_type_registry::RegisterType; use light::Light; use material::StandardMaterial; +use render_graph::ForwardPbrRenderGraphBuilder; /// NOTE: this isn't PBR yet. consider this name "aspirational" :) #[derive(Default)] diff --git a/crates/bevy_pbr/src/nodes/lights_node.rs b/crates/bevy_pbr/src/nodes/lights_node.rs index 7efc7202d2..e7b052f8a6 100644 --- a/crates/bevy_pbr/src/nodes/lights_node.rs +++ b/crates/bevy_pbr/src/nodes/lights_node.rs @@ -1,6 +1,6 @@ use crate::{ light::{Light, LightRaw}, - uniform, + render_graph::uniform, }; use bevy_core::{AsBytes, Byteable}; use bevy_ecs::{Commands, IntoQuerySystem, Local, Query, Res, ResMut, Resources, System, World}; diff --git a/crates/bevy_pbr/src/forward_pbr_render_graph.rs b/crates/bevy_pbr/src/render_graph.rs similarity index 100% rename from crates/bevy_pbr/src/forward_pbr_render_graph.rs rename to crates/bevy_pbr/src/render_graph.rs diff --git a/src/prelude.rs b/src/prelude.rs index 3b803ec039..56cd2dd829 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -4,9 +4,9 @@ pub use crate::{ audio::prelude::*, core::prelude::*, ecs::prelude::*, - input::{keyboard::KeyCode, mouse::MouseButton, Input}, + input::prelude::*, math::prelude::*, - pbr::{entity::*, light::Light, material::StandardMaterial}, + pbr::prelude::*, property::{DynamicProperties, Properties, PropertiesVal, Property, PropertyVal}, render::prelude::*, scene::{Scene, SceneSpawner},