mirror of
https://github.com/bevyengine/bevy
synced 2024-12-21 02:23:08 +00:00
bf53cf30c7
# Objective Fixes a regression in [previously merged but then reverted pr](https://github.com/bevyengine/bevy/pull/13714) that aligns lower-level `Scene` API with that in `DynamicScene`. Please look at the original pr for more details. The problem was `spawn_sync_internal` is used in `spawn_queued_scenes`. Since instance creation was moved up a level we need to make sure we add a specific instance to `SceneSpawner::spawned_instances` when using `spawn_sync_internal` (just like we do for `DynamicScene`). Please look at the last commit when reviewing. ## Testing `alien_cake_addict` and `deferred_rendering` examples look as expected. ## Changelog Changed `Scene::write_to_world_with` to take `entity_map` as an argument and no longer return an `InstanceInfo` ## Migration Guide `Scene::write_to_world_with` no longer returns an `InstanceInfo`. Before ```rust scene.write_to_world_with(world, ®istry) ``` After ```rust let mut entity_map = EntityHashMap::default(); scene.write_to_world_with(world, &mut entity_map, ®istry) ```
136 lines
5.4 KiB
Rust
136 lines
5.4 KiB
Rust
use crate::{DynamicScene, SceneSpawnError};
|
|
use bevy_asset::Asset;
|
|
use bevy_ecs::entity::{Entity, EntityHashMap};
|
|
use bevy_ecs::{
|
|
reflect::{AppTypeRegistry, ReflectComponent, ReflectMapEntities, ReflectResource},
|
|
world::World,
|
|
};
|
|
use bevy_reflect::TypePath;
|
|
|
|
/// To spawn a scene, you can use either:
|
|
/// * [`SceneSpawner::spawn`](crate::SceneSpawner::spawn)
|
|
/// * adding the [`SceneBundle`](crate::SceneBundle) to an entity
|
|
/// * adding the [`Handle<Scene>`](bevy_asset::Handle) to an entity (the scene will only be
|
|
/// visible if the entity already has [`Transform`](bevy_transform::components::Transform) and
|
|
/// [`GlobalTransform`](bevy_transform::components::GlobalTransform) components)
|
|
#[derive(Asset, TypePath, Debug)]
|
|
pub struct Scene {
|
|
/// The world of the scene, containing its entities and resources.
|
|
pub world: World,
|
|
}
|
|
|
|
impl Scene {
|
|
/// Creates a new scene with the given world.
|
|
pub fn new(world: World) -> Self {
|
|
Self { world }
|
|
}
|
|
|
|
/// Create a new scene from a given dynamic scene.
|
|
pub fn from_dynamic_scene(
|
|
dynamic_scene: &DynamicScene,
|
|
type_registry: &AppTypeRegistry,
|
|
) -> Result<Scene, SceneSpawnError> {
|
|
let mut world = World::new();
|
|
let mut entity_map = EntityHashMap::default();
|
|
dynamic_scene.write_to_world_with(&mut world, &mut entity_map, type_registry)?;
|
|
|
|
Ok(Self { world })
|
|
}
|
|
|
|
/// Clone the scene.
|
|
///
|
|
/// This method will return a [`SceneSpawnError`] if a type either is not registered in the
|
|
/// provided [`AppTypeRegistry`] or doesn't reflect the [`Component`](bevy_ecs::component::Component) trait.
|
|
pub fn clone_with(&self, type_registry: &AppTypeRegistry) -> Result<Scene, SceneSpawnError> {
|
|
let mut new_world = World::new();
|
|
let mut entity_map = EntityHashMap::default();
|
|
self.write_to_world_with(&mut new_world, &mut entity_map, type_registry)?;
|
|
Ok(Self { world: new_world })
|
|
}
|
|
|
|
/// Write the entities and their corresponding components to the given world.
|
|
///
|
|
/// This method will return a [`SceneSpawnError`] if a type either is not registered in the
|
|
/// provided [`AppTypeRegistry`] or doesn't reflect the [`Component`](bevy_ecs::component::Component) trait.
|
|
pub fn write_to_world_with(
|
|
&self,
|
|
world: &mut World,
|
|
entity_map: &mut EntityHashMap<Entity>,
|
|
type_registry: &AppTypeRegistry,
|
|
) -> Result<(), SceneSpawnError> {
|
|
let type_registry = type_registry.read();
|
|
|
|
// Resources archetype
|
|
for (component_id, resource_data) in self.world.storages().resources.iter() {
|
|
if !resource_data.is_present() {
|
|
continue;
|
|
}
|
|
|
|
let component_info = self
|
|
.world
|
|
.components()
|
|
.get_info(component_id)
|
|
.expect("component_ids in archetypes should have ComponentInfo");
|
|
|
|
let type_id = component_info
|
|
.type_id()
|
|
.expect("reflected resources must have a type_id");
|
|
|
|
let registration =
|
|
type_registry
|
|
.get(type_id)
|
|
.ok_or_else(|| SceneSpawnError::UnregisteredType {
|
|
std_type_name: component_info.name().to_string(),
|
|
})?;
|
|
let reflect_resource = registration.data::<ReflectResource>().ok_or_else(|| {
|
|
SceneSpawnError::UnregisteredResource {
|
|
type_path: registration.type_info().type_path().to_string(),
|
|
}
|
|
})?;
|
|
reflect_resource.copy(&self.world, world, &type_registry);
|
|
}
|
|
|
|
for archetype in self.world.archetypes().iter() {
|
|
for scene_entity in archetype.entities() {
|
|
let entity = entity_map
|
|
.entry(scene_entity.id())
|
|
.or_insert_with(|| world.spawn_empty().id());
|
|
for component_id in archetype.components() {
|
|
let component_info = self
|
|
.world
|
|
.components()
|
|
.get_info(component_id)
|
|
.expect("component_ids in archetypes should have ComponentInfo");
|
|
|
|
let reflect_component = type_registry
|
|
.get(component_info.type_id().unwrap())
|
|
.ok_or_else(|| SceneSpawnError::UnregisteredType {
|
|
std_type_name: component_info.name().to_string(),
|
|
})
|
|
.and_then(|registration| {
|
|
registration.data::<ReflectComponent>().ok_or_else(|| {
|
|
SceneSpawnError::UnregisteredComponent {
|
|
type_path: registration.type_info().type_path().to_string(),
|
|
}
|
|
})
|
|
})?;
|
|
reflect_component.copy(
|
|
&self.world,
|
|
world,
|
|
scene_entity.id(),
|
|
*entity,
|
|
&type_registry,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
for registration in type_registry.iter() {
|
|
if let Some(map_entities_reflect) = registration.data::<ReflectMapEntities>() {
|
|
map_entities_reflect.map_all_entities(world, entity_map);
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|