Skip to content

Compress default bundles #1588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Compress default bundles #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 9 additions & 20 deletions crates/bevy_pbr/src/entity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,29 @@ use crate::{light::Light, material::StandardMaterial, render_graph::FORWARD_PIPE
use bevy_asset::Handle;
use bevy_ecs::bundle::Bundle;
use bevy_render::{
draw::Draw,
mesh::Mesh,
pipeline::{RenderPipeline, RenderPipelines},
prelude::Visible,
render_graph::base::MainPass,
prelude::MeshBundle,
};
use bevy_transform::prelude::{GlobalTransform, Transform};

/// A component bundle for "pbr mesh" entities
#[derive(Bundle)]
pub struct PbrBundle {
pub mesh: Handle<Mesh>,
pub material: Handle<StandardMaterial>,
pub main_pass: MainPass,
pub draw: Draw,
pub visible: Visible,
pub render_pipelines: RenderPipelines,
pub transform: Transform,
pub global_transform: GlobalTransform,
#[bundle]
pub mesh: MeshBundle,
}

impl Default for PbrBundle {
fn default() -> Self {
Self {
render_pipelines: RenderPipelines::from_pipelines(vec![RenderPipeline::new(
FORWARD_PIPELINE_HANDLE.typed(),
)]),
mesh: Default::default(),
visible: Default::default(),
mesh: MeshBundle {
render_pipelines: RenderPipelines::from_pipelines(vec![RenderPipeline::new(
FORWARD_PIPELINE_HANDLE.typed(),
)]),
..Default::default()
},
material: Default::default(),
main_pass: Default::default(),
draw: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
}
}
}
Expand Down
34 changes: 16 additions & 18 deletions crates/bevy_render/src/entity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ use crate::{
use base::MainPass;
use bevy_asset::Handle;
use bevy_ecs::bundle::Bundle;
use bevy_transform::components::{GlobalTransform, Transform};
use bevy_transform::{components::Transform, TransformBundle};

/// A component bundle for "mesh" entities
#[derive(Bundle, Default)]
#[derive(Bundle, Default, Clone)]
pub struct MeshBundle {
pub mesh: Handle<Mesh>,
pub draw: Draw,
pub visible: Visible,
pub render_pipelines: RenderPipelines,
pub main_pass: MainPass,
pub transform: Transform,
pub global_transform: GlobalTransform,
#[bundle]
pub game_object: TransformBundle,
}

/// Component bundle for camera entities with perspective projection
Expand All @@ -33,8 +33,8 @@ pub struct PerspectiveCameraBundle {
pub camera: Camera,
pub perspective_projection: PerspectiveProjection,
pub visible_entities: VisibleEntities,
pub transform: Transform,
pub global_transform: GlobalTransform,
#[bundle]
pub game_object: TransformBundle,
}

impl PerspectiveCameraBundle {
Expand All @@ -50,8 +50,7 @@ impl PerspectiveCameraBundle {
},
perspective_projection: Default::default(),
visible_entities: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
game_object: Default::default(),
}
}
}
Expand All @@ -65,8 +64,7 @@ impl Default for PerspectiveCameraBundle {
},
perspective_projection: Default::default(),
visible_entities: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
game_object: Default::default(),
}
}
}
Expand All @@ -79,8 +77,8 @@ pub struct OrthographicCameraBundle {
pub camera: Camera,
pub orthographic_projection: OrthographicProjection,
pub visible_entities: VisibleEntities,
pub transform: Transform,
pub global_transform: GlobalTransform,
#[bundle]
pub transforms: TransformBundle,
}

impl OrthographicCameraBundle {
Expand All @@ -99,8 +97,10 @@ impl OrthographicCameraBundle {
..Default::default()
},
visible_entities: Default::default(),
transform: Transform::from_xyz(0.0, 0.0, far - 0.1),
global_transform: Default::default(),
transforms: TransformBundle {
transform: Transform::from_xyz(0.0, 0.0, far - 0.1),
global_transform: Default::default(),
},
}
}

Expand All @@ -116,8 +116,7 @@ impl OrthographicCameraBundle {
..Default::default()
},
visible_entities: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
transforms: Default::default(),
}
}

Expand All @@ -129,8 +128,7 @@ impl OrthographicCameraBundle {
},
orthographic_projection: Default::default(),
visible_entities: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
transforms: Default::default(),
}
}
}
62 changes: 23 additions & 39 deletions crates/bevy_sprite/src/entity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,34 @@ use crate::{
use bevy_asset::Handle;
use bevy_ecs::bundle::Bundle;
use bevy_render::{
mesh::Mesh,
pipeline::{RenderPipeline, RenderPipelines},
prelude::{Draw, Visible},
render_graph::base::MainPass,
prelude::{MeshBundle, Visible},
};
use bevy_transform::prelude::{GlobalTransform, Transform};

#[derive(Bundle, Clone)]
pub struct SpriteBundle {
pub sprite: Sprite,
pub mesh: Handle<Mesh>, // TODO: maybe abstract this out
pub material: Handle<ColorMaterial>,
pub main_pass: MainPass,
pub draw: Draw,
pub visible: Visible,
pub render_pipelines: RenderPipelines,
pub transform: Transform,
pub global_transform: GlobalTransform,
#[bundle]
pub mesh: MeshBundle,
}

impl Default for SpriteBundle {
fn default() -> Self {
Self {
mesh: QUAD_HANDLE.typed(),
render_pipelines: RenderPipelines::from_pipelines(vec![RenderPipeline::new(
SPRITE_PIPELINE_HANDLE.typed(),
)]),
visible: Visible {
is_transparent: true,
mesh: MeshBundle {
mesh: QUAD_HANDLE.typed(),
render_pipelines: RenderPipelines::from_pipelines(vec![RenderPipeline::new(
SPRITE_PIPELINE_HANDLE.typed(),
)]),
visible: Visible {
is_transparent: true,
..Default::default()
},
..Default::default()
},
main_pass: MainPass,
draw: Default::default(),
sprite: Default::default(),
material: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
}
}
}
Expand All @@ -54,33 +45,26 @@ pub struct SpriteSheetBundle {
pub sprite: TextureAtlasSprite,
/// A handle to the texture atlas that holds the sprite images
pub texture_atlas: Handle<TextureAtlas>,
/// Data pertaining to how the sprite is drawn on the screen
pub draw: Draw,
pub visible: Visible,
pub render_pipelines: RenderPipelines,
pub main_pass: MainPass,
pub mesh: Handle<Mesh>, // TODO: maybe abstract this out
pub transform: Transform,
pub global_transform: GlobalTransform,
#[bundle]
pub mesh: MeshBundle,
}

impl Default for SpriteSheetBundle {
fn default() -> Self {
Self {
render_pipelines: RenderPipelines::from_pipelines(vec![RenderPipeline::new(
SPRITE_SHEET_PIPELINE_HANDLE.typed(),
)]),
visible: Visible {
is_transparent: true,
mesh: MeshBundle {
mesh: QUAD_HANDLE.typed(),
render_pipelines: RenderPipelines::from_pipelines(vec![RenderPipeline::new(
SPRITE_SHEET_PIPELINE_HANDLE.typed(),
)]),
visible: Visible {
is_transparent: true,
..Default::default()
},
..Default::default()
},
main_pass: MainPass,
mesh: QUAD_HANDLE.typed(),
draw: Default::default(),
sprite: Default::default(),
texture_atlas: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
}
}
}
9 changes: 4 additions & 5 deletions crates/bevy_text/src/text2d.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use bevy_render::{
renderer::RenderResourceBindings,
};
use bevy_sprite::{TextureAtlas, QUAD_HANDLE};
use bevy_transform::prelude::{GlobalTransform, Transform};
use bevy_transform::{components::GlobalTransform, TransformBundle};
use bevy_window::Windows;
use glyph_brush_layout::{HorizontalAlign, VerticalAlign};

Expand All @@ -28,8 +28,8 @@ pub struct Text2dBundle {
pub draw: Draw,
pub visible: Visible,
pub text: Text,
pub transform: Transform,
pub global_transform: GlobalTransform,
#[bundle]
pub transforms: TransformBundle,
pub main_pass: MainPass,
pub calculated_size: CalculatedSize,
}
Expand All @@ -45,8 +45,7 @@ impl Default for Text2dBundle {
..Default::default()
},
text: Default::default(),
transform: Default::default(),
global_transform: Default::default(),
transforms: Default::default(),
main_pass: MainPass {},
calculated_size: CalculatedSize {
size: Size::default(),
Expand Down
10 changes: 9 additions & 1 deletion crates/bevy_transform/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ pub mod hierarchy;
pub mod transform_propagate_system;

pub mod prelude {
pub use crate::{components::*, hierarchy::*, TransformPlugin};
pub use crate::{components::*, hierarchy::*, TransformBundle, TransformPlugin};
}

use bevy_app::prelude::*;
use bevy_ecs::{
bundle::Bundle,
schedule::{ParallelSystemDescriptorCoercion, SystemLabel},
system::IntoSystem,
};
Expand All @@ -22,6 +23,13 @@ pub enum TransformSystem {
ParentUpdate,
}

// TODO: Bikeshed this name
#[derive(Default, Bundle, Clone, Debug)]
pub struct TransformBundle {
pub transform: Transform,
pub global_transform: GlobalTransform,
}

impl Plugin for TransformPlugin {
fn build(&self, app: &mut AppBuilder) {
app.register_type::<Children>()
Expand Down
Loading