add prelude

This commit is contained in:
Carter Anderson 2020-01-13 19:20:58 -08:00
parent 32f196c7c2
commit 5433ba7ea1
20 changed files with 48 additions and 56 deletions

View File

@ -1,4 +1,4 @@
use bevy::*; use bevy::prelude::*;
fn main() { fn main() {
AppBuilder::new().add_defaults().run(); AppBuilder::new().add_defaults().run();

View File

@ -1,9 +1,4 @@
use bevy::{ use bevy::prelude::*;
asset::*,
math::{Mat4, Vec3},
render::*,
Schedulable, *,
};
use rand::{random, rngs::StdRng, Rng, SeedableRng}; use rand::{random, rngs::StdRng, Rng, SeedableRng};
use std::collections::VecDeque; use std::collections::VecDeque;

View File

@ -1,4 +1,4 @@
use bevy::*; use bevy::{prelude::*, asset};
fn main() { fn main() {
asset::load_gltf("examples/assets/Box.gltf").unwrap(); asset::load_gltf("examples/assets/Box.gltf").unwrap();

View File

@ -1,9 +1,4 @@
use bevy::{ use bevy::prelude::*;
asset::*,
math::{Mat4, Quat, Vec3},
render::*,
Parent, Schedulable, *,
};
struct Rotator; struct Rotator;

View File

@ -1,9 +1,4 @@
use bevy::{ use bevy::prelude::*;
asset::*,
math::{Mat4, Vec3},
render::*,
*,
};
fn main() { fn main() {
AppBuilder::new().add_defaults().setup_world(setup).run(); AppBuilder::new().add_defaults().setup_world(setup).run();

View File

@ -1,9 +1,4 @@
use bevy::{ use bevy::{asset, prelude::*};
asset::*,
math::{Mat4, Vec3},
render::*,
*,
};
fn main() { fn main() {
AppBuilder::new().add_defaults().setup_world(setup).run(); AppBuilder::new().add_defaults().setup_world(setup).run();
@ -18,7 +13,7 @@ fn setup(world: &mut World) {
let texture_handle = { let texture_handle = {
let mut texture_storage = world.resources.get_mut::<AssetStorage<Texture>>().unwrap(); let mut texture_storage = world.resources.get_mut::<AssetStorage<Texture>>().unwrap();
let texture = Texture::load(TextureType::Data(create_texels(256))); let texture = Texture::load(TextureType::Data(asset::create_texels(256)));
(texture_storage.add(texture)) (texture_storage.add(texture))
}; };

View File

@ -1,10 +1,4 @@
use bevy::{ use bevy::prelude::*;
asset::*,
math::{Mat4, Vec3},
render::*,
ui::*,
*,
};
fn main() { fn main() {
AppBuilder::new().add_defaults().setup_world(setup).run(); AppBuilder::new().add_defaults().setup_world(setup).run();

View File

@ -5,7 +5,7 @@ use crate::{
schedule::Builder, schedule::Builder,
}, },
render::{passes::*, *}, render::{passes::*, *},
transform_system_bundle, ui, App, Time, transform_system_bundle, ui, app::App, core::Time,
}; };
pub struct AppBuilder { pub struct AppBuilder {

View File

@ -10,7 +10,7 @@ use winit::{
use legion::prelude::*; use legion::prelude::*;
use crate::{render::*, Time}; use crate::{render::*, core::Time};
pub struct App { pub struct App {
pub world: World, pub world: World,

View File

@ -1,4 +1,4 @@
use crate::{legion::system::SubWorld, Children, Entity, World}; use crate::prelude::{Children, Entity, World, SubWorld};
pub fn run_on_hierarchy<T>( pub fn run_on_hierarchy<T>(
world: &mut World, world: &mut World,
entity: Entity, entity: Entity,

View File

@ -1,19 +1,13 @@
mod app; pub mod app;
pub mod asset; pub mod asset;
mod core; pub mod core;
pub mod ecs; pub mod ecs;
pub mod render; pub mod render;
pub mod ui; pub mod ui;
pub mod prelude;
pub use crate::core::*; pub use wgpu;
pub use app::{App, AppBuilder};
pub use ecs::*;
pub use glam as math; pub use glam as math;
pub use legion; pub use legion;
pub use legion::prelude::*;
pub use legion::schedule::{Builder, Schedulable};
pub use legion_transform; pub use legion_transform;
pub use legion_transform::prelude::*; use legion_transform::transform_system_bundle;
pub use legion_transform::transform_system_bundle;
pub use wgpu;

17
src/prelude.rs Normal file
View File

@ -0,0 +1,17 @@
pub use crate::{
app::{App, AppBuilder},
asset::{Asset, AssetStorage, Handle, Mesh, MeshType, Texture, TextureType},
core::Time,
ecs,
render::{Albedo, Camera, CameraType, ActiveCamera, ActiveCamera2d, Instanced, Light, Material},
ui::{Node, Anchors, Margins},
};
pub use glam as math;
pub use legion::{
prelude::*,
schedule::{Builder, Schedulable},
system::SubWorld,
system::SystemBuilder,
};
pub use legion_transform::prelude::*;
pub use math::{Mat3, Mat4, Vec2, Vec3, Vec4, Quat};

View File

@ -1,4 +1,4 @@
use crate::{math, render::camera, Translation}; use crate::{math, prelude::Translation, render::camera};
use std::ops::Range; use std::ops::Range;
use zerocopy::{AsBytes, FromBytes}; use zerocopy::{AsBytes, FromBytes};

View File

@ -1,7 +1,7 @@
use crate::{ use crate::{
asset::*, asset::*,
render::{instancing::InstanceBufferInfo, *}, render::{instancing::InstanceBufferInfo, *},
LocalToWorld, prelude::LocalToWorld,
}; };
use legion::prelude::*; use legion::prelude::*;
use std::{collections::HashMap, mem}; use std::{collections::HashMap, mem};

View File

@ -1,4 +1,8 @@
use crate::{render::passes::shadow, render::*, LocalToWorld, Translation}; use crate::{
prelude::{LocalToWorld, Translation},
render::passes::shadow,
render::*,
};
use legion::prelude::*; use legion::prelude::*;
use std::mem; use std::mem;

View File

@ -3,7 +3,7 @@ use crate::{
ecs, math, ecs, math,
render::{instancing::InstanceBufferInfo, *}, render::{instancing::InstanceBufferInfo, *},
ui::Node, ui::Node,
Parent, prelude::Parent,
}; };
use legion::prelude::*; use legion::prelude::*;
use wgpu::SwapChainOutput; use wgpu::SwapChainOutput;

View File

@ -1,4 +1,4 @@
use crate::{math, render::passes::ForwardUniforms, render::*, LocalToWorld}; use crate::{math, prelude::LocalToWorld, render::passes::ForwardUniforms, render::*};
use legion::prelude::*; use legion::prelude::*;
use std::mem; use std::mem;

View File

@ -1,4 +1,7 @@
use crate::{render::*, LocalToWorld, Translation}; use crate::{
prelude::{LocalToWorld, Translation},
render::*,
};
use legion::prelude::*; use legion::prelude::*;
use std::mem; use std::mem;

View File

@ -1,4 +1,4 @@
use crate::{render::*, LocalToWorld}; use crate::{prelude::LocalToWorld, render::*};
use legion::prelude::*; use legion::prelude::*;
use std::mem; use std::mem;

View File

@ -1,4 +1,4 @@
use crate::{legion::system::SubWorld, math::Vec2, ui::Node, *}; use crate::prelude::*;
use winit::window::Window; use winit::window::Window;
pub fn build_ui_update_system() -> Box<dyn Schedulable> { pub fn build_ui_update_system() -> Box<dyn Schedulable> {