
# Objective A step in the migration to required components: scenes! ## Solution As per the [selected proposal](https://hackmd.io/@bevy/required_components/%2FPJtNGVMMQhyM0zIvCJSkbA): - Deprecate `SceneBundle` and `DynamicSceneBundle`. - Add `SceneRoot` and `DynamicSceneRoot` components, which wrap a `Handle<Scene>` and `Handle<DynamicScene>` respectively. ## Migration Guide Asset handles for scenes and dynamic scenes must now be wrapped in the `SceneRoot` and `DynamicSceneRoot` components. Raw handles as components no longer spawn scenes. Additionally, `SceneBundle` and `DynamicSceneBundle` have been deprecated. Instead, use the scene components directly. Previously: ```rust let model_scene = asset_server.load(GltfAssetLabel::Scene(0).from_asset("model.gltf")); commands.spawn(SceneBundle { scene: model_scene, transform: Transform::from_xyz(-4.0, 0.0, -3.0), ..default() }); ``` Now: ```rust let model_scene = asset_server.load(GltfAssetLabel::Scene(0).from_asset("model.gltf")); commands.spawn(( SceneRoot(model_scene), Transform::from_xyz(-4.0, 0.0, -3.0), )); ```
189 lines
6.8 KiB
Rust
189 lines
6.8 KiB
Rust
#![expect(deprecated)]
|
|
|
|
use bevy_derive::{Deref, DerefMut};
|
|
use bevy_ecs::{
|
|
bundle::Bundle,
|
|
change_detection::ResMut,
|
|
entity::Entity,
|
|
prelude::{Changed, Component, Without},
|
|
system::{Commands, Query},
|
|
};
|
|
#[cfg(feature = "bevy_render")]
|
|
use bevy_render::prelude::{InheritedVisibility, ViewVisibility, Visibility};
|
|
use bevy_transform::components::{GlobalTransform, Transform};
|
|
|
|
use crate::{DynamicSceneRoot, InstanceId, SceneRoot, SceneSpawner};
|
|
|
|
/// [`InstanceId`] of a spawned scene. It can be used with the [`SceneSpawner`] to
|
|
/// interact with the spawned scene.
|
|
#[derive(Component, Deref, DerefMut)]
|
|
pub struct SceneInstance(pub(crate) InstanceId);
|
|
|
|
/// A component bundle for a [`Scene`](crate::Scene) root.
|
|
///
|
|
/// The scene from `scene` will be spawned as a child of the entity with this component.
|
|
/// Once it's spawned, the entity will have a [`SceneInstance`] component.
|
|
#[derive(Default, Bundle, Clone)]
|
|
#[deprecated(
|
|
since = "0.15.0",
|
|
note = "Use the `SceneRoot` component instead. Inserting `SceneRoot` will also insert the other components required by scenes automatically."
|
|
)]
|
|
pub struct SceneBundle {
|
|
/// Handle to the scene to spawn.
|
|
pub scene: SceneRoot,
|
|
/// Transform of the scene root entity.
|
|
pub transform: Transform,
|
|
/// Global transform of the scene root entity.
|
|
pub global_transform: GlobalTransform,
|
|
|
|
/// User-driven visibility of the scene root entity.
|
|
#[cfg(feature = "bevy_render")]
|
|
pub visibility: Visibility,
|
|
/// Inherited visibility of the scene root entity.
|
|
#[cfg(feature = "bevy_render")]
|
|
pub inherited_visibility: InheritedVisibility,
|
|
/// Algorithmically-computed visibility of the scene root entity for rendering.
|
|
#[cfg(feature = "bevy_render")]
|
|
pub view_visibility: ViewVisibility,
|
|
}
|
|
|
|
/// A component bundle for a [`DynamicScene`](crate::DynamicScene) root.
|
|
///
|
|
/// The dynamic scene from `scene` will be spawn as a child of the entity with this component.
|
|
/// Once it's spawned, the entity will have a [`SceneInstance`] component.
|
|
#[derive(Default, Bundle, Clone)]
|
|
#[deprecated(
|
|
since = "0.15.0",
|
|
note = "Use the `DynamicSceneRoot` component instead. Inserting `DynamicSceneRoot` will also insert the other components required by scenes automatically."
|
|
)]
|
|
pub struct DynamicSceneBundle {
|
|
/// Handle to the scene to spawn.
|
|
pub scene: DynamicSceneRoot,
|
|
/// Transform of the scene root entity.
|
|
pub transform: Transform,
|
|
/// Global transform of the scene root entity.
|
|
pub global_transform: GlobalTransform,
|
|
|
|
/// User-driven visibility of the scene root entity.
|
|
#[cfg(feature = "bevy_render")]
|
|
pub visibility: Visibility,
|
|
/// Inherited visibility of the scene root entity.
|
|
#[cfg(feature = "bevy_render")]
|
|
pub inherited_visibility: InheritedVisibility,
|
|
/// Algorithmically-computed visibility of the scene root entity for rendering.
|
|
#[cfg(feature = "bevy_render")]
|
|
pub view_visibility: ViewVisibility,
|
|
}
|
|
|
|
/// System that will spawn scenes from the [`SceneRoot`] and [`DynamicSceneRoot`] components.
|
|
pub fn scene_spawner(
|
|
mut commands: Commands,
|
|
mut scene_to_spawn: Query<
|
|
(Entity, &SceneRoot, Option<&mut SceneInstance>),
|
|
(Changed<SceneRoot>, Without<DynamicSceneRoot>),
|
|
>,
|
|
mut dynamic_scene_to_spawn: Query<
|
|
(Entity, &DynamicSceneRoot, Option<&mut SceneInstance>),
|
|
(Changed<DynamicSceneRoot>, Without<SceneRoot>),
|
|
>,
|
|
mut scene_spawner: ResMut<SceneSpawner>,
|
|
) {
|
|
for (entity, scene, instance) in &mut scene_to_spawn {
|
|
let new_instance = scene_spawner.spawn_as_child(scene.0.clone(), entity);
|
|
if let Some(mut old_instance) = instance {
|
|
scene_spawner.despawn_instance(**old_instance);
|
|
*old_instance = SceneInstance(new_instance);
|
|
} else {
|
|
commands.entity(entity).insert(SceneInstance(new_instance));
|
|
}
|
|
}
|
|
for (entity, dynamic_scene, instance) in &mut dynamic_scene_to_spawn {
|
|
let new_instance = scene_spawner.spawn_dynamic_as_child(dynamic_scene.0.clone(), entity);
|
|
if let Some(mut old_instance) = instance {
|
|
scene_spawner.despawn_instance(**old_instance);
|
|
*old_instance = SceneInstance(new_instance);
|
|
} else {
|
|
commands.entity(entity).insert(SceneInstance(new_instance));
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{DynamicScene, DynamicSceneRoot, ScenePlugin, SceneSpawner};
|
|
use bevy_app::{App, ScheduleRunnerPlugin};
|
|
use bevy_asset::{AssetPlugin, Assets};
|
|
use bevy_ecs::{
|
|
component::Component,
|
|
entity::Entity,
|
|
prelude::{AppTypeRegistry, ReflectComponent, World},
|
|
};
|
|
use bevy_hierarchy::{Children, HierarchyPlugin};
|
|
use bevy_reflect::Reflect;
|
|
|
|
#[derive(Component, Reflect, Default)]
|
|
#[reflect(Component)]
|
|
struct ComponentA {
|
|
pub x: f32,
|
|
pub y: f32,
|
|
}
|
|
|
|
#[test]
|
|
fn spawn_and_delete() {
|
|
let mut app = App::new();
|
|
|
|
app.add_plugins(ScheduleRunnerPlugin::default())
|
|
.add_plugins(HierarchyPlugin)
|
|
.add_plugins(AssetPlugin::default())
|
|
.add_plugins(ScenePlugin)
|
|
.register_type::<ComponentA>();
|
|
app.update();
|
|
|
|
let mut scene_world = World::new();
|
|
|
|
// create a new DynamicScene manually
|
|
let type_registry = app.world().resource::<AppTypeRegistry>().clone();
|
|
scene_world.insert_resource(type_registry);
|
|
scene_world.spawn(ComponentA { x: 3.0, y: 4.0 });
|
|
let scene = DynamicScene::from_world(&scene_world);
|
|
let scene_handle = app
|
|
.world_mut()
|
|
.resource_mut::<Assets<DynamicScene>>()
|
|
.add(scene);
|
|
|
|
// spawn the scene as a child of `entity` using `DynamicSceneRoot`
|
|
let entity = app
|
|
.world_mut()
|
|
.spawn(DynamicSceneRoot(scene_handle.clone()))
|
|
.id();
|
|
|
|
// run the app's schedule once, so that the scene gets spawned
|
|
app.update();
|
|
|
|
// make sure that the scene was added as a child of the root entity
|
|
let (scene_entity, scene_component_a) = app
|
|
.world_mut()
|
|
.query::<(Entity, &ComponentA)>()
|
|
.single(app.world());
|
|
assert_eq!(scene_component_a.x, 3.0);
|
|
assert_eq!(scene_component_a.y, 4.0);
|
|
assert_eq!(
|
|
app.world().entity(entity).get::<Children>().unwrap().len(),
|
|
1
|
|
);
|
|
|
|
// let's try to delete the scene
|
|
let mut scene_spawner = app.world_mut().resource_mut::<SceneSpawner>();
|
|
scene_spawner.despawn(&scene_handle);
|
|
|
|
// run the scene spawner system to despawn the scene
|
|
app.update();
|
|
|
|
// the scene entity does not exist anymore
|
|
assert!(app.world().get_entity(scene_entity).is_none());
|
|
|
|
// the root entity does not have any children anymore
|
|
assert!(app.world().entity(entity).get::<Children>().is_none());
|
|
}
|
|
}
|