Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 04:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename add_archetype to add_entity

Browse source
This commit is contained in:
Carter Anderson 2020-03-09 02:02:17 -07:00
parent a790332505
commit 8eec5653b6
8 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/custom_shader.rs
View file

@ -80,7 +80,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
world world
.build() .build()
// cube // cube
.add_archetype(MeshMaterialEntity::<MyMaterial> { .add_entity(MeshMaterialEntity::<MyMaterial> {
mesh: cube_handle, mesh: cube_handle,
renderable: Renderable { renderable: Renderable {
pipelines: vec![Handle::new(2)], // TODO: make this pipeline assignment cleaner pipelines: vec![Handle::new(2)], // TODO: make this pipeline assignment cleaner
@ -94,7 +94,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
..Default::default() ..Default::default()
}) })
// cube // cube
.add_archetype(MeshMaterialEntity::<MyMaterial> { .add_entity(MeshMaterialEntity::<MyMaterial> {
mesh: cube_handle, mesh: cube_handle,
renderable: Renderable { renderable: Renderable {
pipelines: vec![Handle::new(2)], // TODO: make this pipeline assignment cleaner pipelines: vec![Handle::new(2)], // TODO: make this pipeline assignment cleaner
@ -108,7 +108,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
..Default::default() ..Default::default()
}) })
// camera // camera
.add_archetype(CameraEntity { .add_entity(CameraEntity {
camera: Camera::new(CameraType::Projection { camera: Camera::new(CameraType::Projection {
fov: std::f32::consts::PI / 4.0, fov: std::f32::consts::PI / 4.0,
near: 1.0, near: 1.0,

8
examples/entity_builder_comparison.rs
View file

@ -122,7 +122,7 @@ fn create_entities_builder_archetype(
world world
.build() .build()
// plane // plane
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: plane_handle, mesh: plane_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(0.1, 0.2, 0.1, 1.0).into(), albedo: math::vec4(0.1, 0.2, 0.1, 1.0).into(),
@ -130,7 +130,7 @@ fn create_entities_builder_archetype(
..Default::default() ..Default::default()
}) })
// cube // cube
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(0.5, 0.3, 0.3, 1.0).into(), albedo: math::vec4(0.5, 0.3, 0.3, 1.0).into(),
@ -138,12 +138,12 @@ fn create_entities_builder_archetype(
..Default::default() ..Default::default()
}) })
// light // light
.add_archetype(LightEntity { .add_entity(LightEntity {
translation: Translation::new(4.0, -4.0, 5.0), translation: Translation::new(4.0, -4.0, 5.0),
..Default::default() ..Default::default()
}) })
// camera // camera
.add_archetype(CameraEntity { .add_entity(CameraEntity {
camera: Camera::new(CameraType::Projection { camera: Camera::new(CameraType::Projection {
fov: std::f32::consts::PI / 4.0, fov: std::f32::consts::PI / 4.0,
near: 1.0, near: 1.0,

8
examples/parenting.rs
View file

@ -29,7 +29,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
world world
.build() .build()
// parent cube // parent cube
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(0.5, 0.4, 0.3, 1.0).into(), albedo: math::vec4(0.5, 0.4, 0.3, 1.0).into(),
@ -40,7 +40,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
.add(Rotator) .add(Rotator)
.add_children(|child_builder| { .add_children(|child_builder| {
// cube // cube
child_builder.add_archetype(MeshEntity { child_builder.add_entity(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(0.5, 0.4, 0.3, 1.0).into(), albedo: math::vec4(0.5, 0.4, 0.3, 1.0).into(),
@ -50,13 +50,13 @@ fn setup(world: &mut World, resources: &mut Resources) {
}) })
}) })
// light // light
.add_archetype(LightEntity { .add_entity(LightEntity {
translation: Translation::new(4.0, -4.0, 5.0), translation: Translation::new(4.0, -4.0, 5.0),
rotation: Rotation::from_euler_angles(0.0, 0.0, 0.0), rotation: Rotation::from_euler_angles(0.0, 0.0, 0.0),
..Default::default() ..Default::default()
}) })
// camera // camera
.add_archetype(CameraEntity { .add_entity(CameraEntity {
camera: Camera::new(CameraType::Projection { camera: Camera::new(CameraType::Projection {
fov: std::f32::consts::PI / 4.0, fov: std::f32::consts::PI / 4.0,
near: 1.0, near: 1.0,

8
examples/simple.rs
View file

@ -12,7 +12,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
world world
.build() .build()
// plane // plane
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: plane_handle, mesh: plane_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(0.1, 0.2, 0.1, 1.0).into(), albedo: math::vec4(0.1, 0.2, 0.1, 1.0).into(),
@ -20,7 +20,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
..Default::default() ..Default::default()
}) })
// cube // cube
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(0.5, 0.4, 0.3, 1.0).into(), albedo: math::vec4(0.5, 0.4, 0.3, 1.0).into(),
@ -29,13 +29,13 @@ fn setup(world: &mut World, resources: &mut Resources) {
..Default::default() ..Default::default()
}) })
// light // light
.add_archetype(LightEntity { .add_entity(LightEntity {
translation: Translation::new(4.0, -4.0, 5.0), translation: Translation::new(4.0, -4.0, 5.0),
rotation: Rotation::from_euler_angles(0.0, 0.0, 0.0), rotation: Rotation::from_euler_angles(0.0, 0.0, 0.0),
..Default::default() ..Default::default()
}) })
// camera // camera
.add_archetype(CameraEntity { .add_entity(CameraEntity {
camera: Camera::new(CameraType::Projection { camera: Camera::new(CameraType::Projection {
fov: std::f32::consts::PI / 4.0, fov: std::f32::consts::PI / 4.0,
near: 1.0, near: 1.0,

12
examples/spawner.rs
View file

@ -69,7 +69,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
let mut builder = world let mut builder = world
.build() .build()
// plane // plane
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: plane_handle, mesh: plane_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(0.1, 0.2, 0.1, 1.0).into(), albedo: math::vec4(0.1, 0.2, 0.1, 1.0).into(),
@ -77,7 +77,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
..Default::default() ..Default::default()
}) })
// cube // cube
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(1.0, 1.0, 1.0, 1.0).into(), albedo: math::vec4(1.0, 1.0, 1.0, 1.0).into(),
@ -85,7 +85,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
translation: Translation::new(0.0, 0.0, 1.0), translation: Translation::new(0.0, 0.0, 1.0),
..Default::default() ..Default::default()
}) })
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(0.0, 1.0, 0.0, 1.0).into(), albedo: math::vec4(0.0, 1.0, 0.0, 1.0).into(),
@ -94,12 +94,12 @@ fn setup(world: &mut World, resources: &mut Resources) {
..Default::default() ..Default::default()
}) })
// light // light
.add_archetype(LightEntity { .add_entity(LightEntity {
translation: Translation::new(4.0, -4.0, 5.0), translation: Translation::new(4.0, -4.0, 5.0),
..Default::default() ..Default::default()
}) })
// camera // camera
.add_archetype(CameraEntity { .add_entity(CameraEntity {
camera: Camera::new(CameraType::Projection { camera: Camera::new(CameraType::Projection {
fov: std::f32::consts::PI / 4.0, fov: std::f32::consts::PI / 4.0,
near: 1.0, near: 1.0,
@ -116,7 +116,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
let mut rng = StdRng::from_entropy(); let mut rng = StdRng::from_entropy();
for _ in 0..10000 { for _ in 0..10000 {
builder = builder.add_archetype(MeshEntity { builder = builder.add_entity(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4( albedo: math::vec4(

6
examples/texture.rs
View file

@ -17,7 +17,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
world world
.build() .build()
// cube // cube
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: texture_handle.into(), albedo: texture_handle.into(),
@ -26,12 +26,12 @@ fn setup(world: &mut World, resources: &mut Resources) {
..Default::default() ..Default::default()
}) })
// light // light
.add_archetype(LightEntity { .add_entity(LightEntity {
translation: Translation::new(4.0, 4.0, 5.0), translation: Translation::new(4.0, 4.0, 5.0),
..Default::default() ..Default::default()
}) })
// camera // camera
.add_archetype(CameraEntity { .add_entity(CameraEntity {
camera: Camera::new(CameraType::Projection { camera: Camera::new(CameraType::Projection {
fov: std::f32::consts::PI / 4.0, fov: std::f32::consts::PI / 4.0,
near: 1.0, near: 1.0,

26
examples/ui.rs
View file

@ -11,7 +11,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
world world
.build() .build()
// cube // cube
.add_archetype(MeshEntity { .add_entity(MeshEntity {
mesh: cube_handle, mesh: cube_handle,
material: StandardMaterial { material: StandardMaterial {
albedo: math::vec4(0.5, 0.3, 0.3, 1.0).into(), albedo: math::vec4(0.5, 0.3, 0.3, 1.0).into(),
@ -20,12 +20,12 @@ fn setup(world: &mut World, resources: &mut Resources) {
..Default::default() ..Default::default()
}) })
// light // light
.add_archetype(LightEntity { .add_entity(LightEntity {
translation: Translation::new(4.0, -4.0, 5.0), translation: Translation::new(4.0, -4.0, 5.0),
..Default::default() ..Default::default()
}) })
// 3d camera // 3d camera
.add_archetype(CameraEntity { .add_entity(CameraEntity {
camera: Camera::new(CameraType::Projection { camera: Camera::new(CameraType::Projection {
fov: std::f32::consts::PI / 4.0, fov: std::f32::consts::PI / 4.0,
near: 1.0, near: 1.0,
@ -40,7 +40,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
)), )),
}) })
// 2d camera // 2d camera
.add_archetype(Camera2dEntity { .add_entity(Camera2dEntity {
camera: Camera::new(CameraType::Orthographic { camera: Camera::new(CameraType::Orthographic {
left: 0.0, left: 0.0,
right: 0.0, right: 0.0,
@ -52,7 +52,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
active_camera_2d: ActiveCamera2d, active_camera_2d: ActiveCamera2d,
}) })
// bottom left anchor with vertical fill // bottom left anchor with vertical fill
.add_archetype(UiEntity { .add_entity(UiEntity {
node: Node::new( node: Node::new(
math::vec2(0.0, 0.0), math::vec2(0.0, 0.0),
Anchors::new(0.0, 0.0, 0.0, 1.0), Anchors::new(0.0, 0.0, 0.0, 1.0),
@ -61,7 +61,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
), ),
}) })
// top right anchor with vertical fill // top right anchor with vertical fill
.add_archetype(UiEntity { .add_entity(UiEntity {
node: Node::new( node: Node::new(
math::vec2(0.0, 0.0), math::vec2(0.0, 0.0),
Anchors::new(1.0, 1.0, 0.0, 1.0), Anchors::new(1.0, 1.0, 0.0, 1.0),
@ -70,7 +70,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
), ),
}) })
// render order test: reddest in the back, whitest in the front // render order test: reddest in the back, whitest in the front
.add_archetype(UiEntity { .add_entity(UiEntity {
node: Node::new( node: Node::new(
math::vec2(75.0, 75.0), math::vec2(75.0, 75.0),
Anchors::new(0.5, 0.5, 0.5, 0.5), Anchors::new(0.5, 0.5, 0.5, 0.5),
@ -78,7 +78,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
math::vec4(1.0, 0.1, 0.1, 1.0), math::vec4(1.0, 0.1, 0.1, 1.0),
), ),
}) })
.add_archetype(UiEntity { .add_entity(UiEntity {
node: Node::new( node: Node::new(
math::vec2(50.0, 50.0), math::vec2(50.0, 50.0),
Anchors::new(0.5, 0.5, 0.5, 0.5), Anchors::new(0.5, 0.5, 0.5, 0.5),
@ -86,7 +86,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
math::vec4(1.0, 0.3, 0.3, 1.0), math::vec4(1.0, 0.3, 0.3, 1.0),
), ),
}) })
.add_archetype(UiEntity { .add_entity(UiEntity {
node: Node::new( node: Node::new(
math::vec2(100.0, 100.0), math::vec2(100.0, 100.0),
Anchors::new(0.5, 0.5, 0.5, 0.5), Anchors::new(0.5, 0.5, 0.5, 0.5),
@ -94,7 +94,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
math::vec4(1.0, 0.5, 0.5, 1.0), math::vec4(1.0, 0.5, 0.5, 1.0),
), ),
}) })
.add_archetype(UiEntity { .add_entity(UiEntity {
node: Node::new( node: Node::new(
math::vec2(150.0, 150.0), math::vec2(150.0, 150.0),
Anchors::new(0.5, 0.5, 0.5, 0.5), Anchors::new(0.5, 0.5, 0.5, 0.5),
@ -103,7 +103,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
), ),
}) })
// parenting // parenting
.add_archetype(UiEntity { .add_entity(UiEntity {
node: Node::new( node: Node::new(
math::vec2(300.0, 300.0), math::vec2(300.0, 300.0),
Anchors::new(0.0, 0.0, 0.0, 0.0), Anchors::new(0.0, 0.0, 0.0, 0.0),
@ -112,7 +112,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
), ),
}) })
.add_children(|child_builder| { .add_children(|child_builder| {
child_builder.add_archetype(UiEntity { child_builder.add_entity(UiEntity {
node: Node::new( node: Node::new(
math::vec2(0.0, 0.0), math::vec2(0.0, 0.0),
Anchors::new(0.0, 1.0, 0.0, 1.0), Anchors::new(0.0, 1.0, 0.0, 1.0),
@ -122,7 +122,7 @@ fn setup(world: &mut World, resources: &mut Resources) {
}) })
}) })
// alpha test // alpha test
.add_archetype(UiEntity { .add_entity(UiEntity {
node: Node::new( node: Node::new(
math::vec2(200.0, 200.0), math::vec2(200.0, 200.0),
Anchors::new(0.5, 0.5, 0.5, 0.5), Anchors::new(0.5, 0.5, 0.5, 0.5),

2
src/ecs/world_builder.rs
View file

@ -65,7 +65,7 @@ impl<'a> WorldBuilder<'a> {
self self
} }
pub fn add_archetype(mut self, entity_archetype: impl EntityArchetype) -> Self { pub fn add_entity(mut self, entity_archetype: impl EntityArchetype) -> Self {
let current_entity = entity_archetype.insert(self.world); let current_entity = entity_archetype.insert(self.world);
self.current_entity = Some(current_entity); self.current_entity = Some(current_entity);
self.add_parent_to_current_entity(); self.add_parent_to_current_entity();