forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove "asset scopes" now that resources are separate from world

Browse Source
This commit is contained in:
Carter Anderson 2020-03-09 01:40:04 -07:00
parent f6dd6a5ca9
commit 91a6c0d9db
9 changed files with 26 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/custom_shader.rs
View File

@ -74,10 +74,8 @@ fn main() {
} }
fn setup(world: &mut World, resources: &mut Resources) { fn setup(world: &mut World, resources: &mut Resources) {
let cube_handle = { let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap(); let cube_handle = mesh_storage.add(Mesh::load(MeshType::Cube));
mesh_storage.add(Mesh::load(MeshType::Cube))
};
world world
.build() .build()

10
examples/entity_builder_comparison.rs
View File

@ -161,13 +161,9 @@ fn create_entities_builder_archetype(
} }
fn setup(world: &mut World, resources: &mut Resources) { fn setup(world: &mut World, resources: &mut Resources) {
let cube = Mesh::load(MeshType::Cube); let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
let plane = Mesh::load(MeshType::Plane { size: 10.0 }); let cube_handle = mesh_storage.add(Mesh::load(MeshType::Cube));
let plane_handle = mesh_storage.add(Mesh::load(MeshType::Plane { size: 10.0 }));
let (cube_handle, plane_handle) = {
let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
(mesh_storage.add(cube), mesh_storage.add(plane))
};
// no-archetype precompile: 1.24 sec // no-archetype precompile: 1.24 sec
// archetype precompile: 1.07 sec // archetype precompile: 1.07 sec

7
examples/instancing.rs
View File

@ -30,11 +30,8 @@ fn main() {
} }
fn setup(world: &mut World, resources: &mut Resources) { fn setup(world: &mut World, resources: &mut Resources) {
let cube = Mesh::load(MeshType::Cube); let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
let cube_handle = { let cube_handle = mesh_storage.add(Mesh::load(MeshType::Cube));
let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
mesh_storage.add(cube)
};
world.insert( world.insert(
(), (),

3
examples/parenting.rs
View File

@ -23,9 +23,8 @@ fn build_rotator_system() -> Box<dyn Schedulable> {
} }
fn setup(world: &mut World, resources: &mut Resources) { fn setup(world: &mut World, resources: &mut Resources) {
let cube = Mesh::load(MeshType::Cube);
let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap(); let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
let cube_handle = mesh_storage.add(cube); let cube_handle = mesh_storage.add(Mesh::load(MeshType::Cube));
world world
.build() .build()

10
examples/plugin_loading/example_plugin/src/lib.rs
View File

@ -15,13 +15,9 @@ impl AppPlugin for ExamplePlugin {
} }
pub fn setup(world: &mut World, resources: &mut Resources) { pub fn setup(world: &mut World, resources: &mut Resources) {
let cube = Mesh::load(MeshType::Cube); let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
let plane = Mesh::load(MeshType::Plane { size: 10.0 }); let cube_handle = mesh_storage.add(Mesh::load(MeshType::Cube));
let plane_handle = mesh_storage.add(Mesh::load(MeshType::Plane { size: 10.0 }));
let (cube_handle, plane_handle) = {
let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
(mesh_storage.add(cube), mesh_storage.add(plane))
};
world.build() world.build()
// plane // plane

10
examples/simple.rs
View File

@ -5,13 +5,9 @@ fn main() {
} }
fn setup(world: &mut World, resources: &mut Resources) { fn setup(world: &mut World, resources: &mut Resources) {
let cube = Mesh::load(MeshType::Cube); let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
let plane = Mesh::load(MeshType::Plane { size: 10.0 }); let cube_handle = mesh_storage.add(Mesh::load(MeshType::Cube));
let plane_handle = mesh_storage.add(Mesh::load(MeshType::Plane { size: 10.0 }));
let (cube_handle, plane_handle) = {
let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
(mesh_storage.add(cube), mesh_storage.add(plane))
};
world world
.build() .build()

10
examples/spawner.rs
View File

@ -62,13 +62,9 @@ fn build_print_status_system() -> Box<dyn Schedulable> {
} }
fn setup(world: &mut World, resources: &mut Resources) { fn setup(world: &mut World, resources: &mut Resources) {
let cube = Mesh::load(MeshType::Cube); let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
let plane = Mesh::load(MeshType::Plane { size: 10.0 }); let cube_handle = mesh_storage.add(Mesh::load(MeshType::Cube));
let plane_handle = mesh_storage.add(Mesh::load(MeshType::Plane { size: 10.0 }));
let (cube_handle, plane_handle) = {
let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
(mesh_storage.add(cube), mesh_storage.add(plane))
};
let mut builder = world let mut builder = world
.build() .build()

18
examples/texture.rs
View File

@ -5,18 +5,14 @@ fn main() {
} }
fn setup(world: &mut World, resources: &mut Resources) { fn setup(world: &mut World, resources: &mut Resources) {
let cube_handle = { let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap(); let cube_handle = mesh_storage.add(Mesh::load(MeshType::Cube));
mesh_storage.add(Mesh::load(MeshType::Cube))
};
let texture_handle = { let mut texture_storage = resources.get_mut::<AssetStorage<Texture>>().unwrap();
let mut texture_storage = resources.get_mut::<AssetStorage<Texture>>().unwrap(); let texture = Texture::load(TextureType::Png(
let texture = Texture::load(TextureType::Png( concat!(env!("CARGO_MANIFEST_DIR"), "/assets/temp_bevy_logo.png").to_string(),
concat!(env!("CARGO_MANIFEST_DIR"), "/assets/temp_bevy_logo.png").to_string(), ));
)); let texture_handle = texture_storage.add(texture);
texture_storage.add(texture)
};
world world
.build() .build()

7
examples/ui.rs
View File

@ -5,11 +5,8 @@ fn main() {
} }
fn setup(world: &mut World, resources: &mut Resources) { fn setup(world: &mut World, resources: &mut Resources) {
let cube = Mesh::load(MeshType::Cube); let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
let cube_handle = { let cube_handle = mesh_storage.add(Mesh::load(MeshType::Cube));
let mut mesh_storage = resources.get_mut::<AssetStorage<Mesh>>().unwrap();
mesh_storage.add(cube)
};
world world
.build() .build()