pbr: simplify imports

This commit is contained in:
Carter Anderson 2020-07-16 19:27:19 -07:00
parent e2d2b41c67
commit 2a6e75a27e
5 changed files with 12 additions and 5 deletions

View file

@ -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::{

View file

@ -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)]

View file

@ -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};

View file

@ -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},