mirror of
https://github.com/bevyengine/bevy
synced 2024-11-22 12:43:34 +00:00
54006b107b
# Objective A big step in the migration to required components: meshes and materials! ## Solution As per the [selected proposal](https://hackmd.io/@bevy/required_components/%2Fj9-PnF-2QKK0on1KQ29UWQ): - Deprecate `MaterialMesh2dBundle`, `MaterialMeshBundle`, and `PbrBundle`. - Add `Mesh2d` and `Mesh3d` components, which wrap a `Handle<Mesh>`. - Add `MeshMaterial2d<M: Material2d>` and `MeshMaterial3d<M: Material>`, which wrap a `Handle<M>`. - Meshes *without* a mesh material should be rendered with a default material. The existence of a material is determined by `HasMaterial2d`/`HasMaterial3d`, which is required by `MeshMaterial2d`/`MeshMaterial3d`. This gets around problems with the generics. Previously: ```rust commands.spawn(MaterialMesh2dBundle { mesh: meshes.add(Circle::new(100.0)).into(), material: materials.add(Color::srgb(7.5, 0.0, 7.5)), transform: Transform::from_translation(Vec3::new(-200., 0., 0.)), ..default() }); ``` Now: ```rust commands.spawn(( Mesh2d(meshes.add(Circle::new(100.0))), MeshMaterial2d(materials.add(Color::srgb(7.5, 0.0, 7.5))), Transform::from_translation(Vec3::new(-200., 0., 0.)), )); ``` If the mesh material is missing, previously nothing was rendered. Now, it renders a white default `ColorMaterial` in 2D and a `StandardMaterial` in 3D (this can be overridden). Below, only every other entity has a material: ![Näyttökuva 2024-09-29 181746](https://github.com/user-attachments/assets/5c8be029-d2fe-4b8c-ae89-17a72ff82c9a) ![Näyttökuva 2024-09-29 181918](https://github.com/user-attachments/assets/58adbc55-5a1e-4c7d-a2c7-ed456227b909) Why white? This is still open for discussion, but I think white makes sense for a *default* material, while *invalid* asset handles pointing to nothing should have something like a pink material to indicate that something is broken (I don't handle that in this PR yet). This is kind of a mix of Godot and Unity: Godot just renders a white material for non-existent materials, while Unity renders nothing when no materials exist, but renders pink for invalid materials. I can also change the default material to pink if that is preferable though. ## Testing I ran some 2D and 3D examples to test if anything changed visually. I have not tested all examples or features yet however. If anyone wants to test more extensively, it would be appreciated! ## Implementation Notes - The relationship between `bevy_render` and `bevy_pbr` is weird here. `bevy_render` needs `Mesh3d` for its own systems, but `bevy_pbr` has all of the material logic, and `bevy_render` doesn't depend on it. I feel like the two crates should be refactored in some way, but I think that's out of scope for this PR. - I didn't migrate meshlets to required components yet. That can probably be done in a follow-up, as this is already a huge PR. - It is becoming increasingly clear to me that we really, *really* want to disallow raw asset handles as components. They caused me a *ton* of headache here already, and it took me a long time to find every place that queried for them or inserted them directly on entities, since there were no compiler errors for it. If we don't remove the `Component` derive, I expect raw asset handles to be a *huge* footgun for users as we transition to wrapper components, especially as handles as components have been the norm so far. I personally consider this to be a blocker for 0.15: we need to migrate to wrapper components for asset handles everywhere, and remove the `Component` derive. Also see https://github.com/bevyengine/bevy/issues/14124. --- ## Migration Guide Asset handles for meshes and mesh materials must now be wrapped in the `Mesh2d` and `MeshMaterial2d` or `Mesh3d` and `MeshMaterial3d` components for 2D and 3D respectively. Raw handles as components no longer render meshes. Additionally, `MaterialMesh2dBundle`, `MaterialMeshBundle`, and `PbrBundle` have been deprecated. Instead, use the mesh and material components directly. Previously: ```rust commands.spawn(MaterialMesh2dBundle { mesh: meshes.add(Circle::new(100.0)).into(), material: materials.add(Color::srgb(7.5, 0.0, 7.5)), transform: Transform::from_translation(Vec3::new(-200., 0., 0.)), ..default() }); ``` Now: ```rust commands.spawn(( Mesh2d(meshes.add(Circle::new(100.0))), MeshMaterial2d(materials.add(Color::srgb(7.5, 0.0, 7.5))), Transform::from_translation(Vec3::new(-200., 0., 0.)), )); ``` If the mesh material is missing, a white default material is now used. Previously, nothing was rendered if the material was missing. The `WithMesh2d` and `WithMesh3d` query filter type aliases have also been removed. Simply use `With<Mesh2d>` or `With<Mesh3d>`. --------- Co-authored-by: Tim Blackbird <justthecooldude@gmail.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
138 lines
5.4 KiB
Rust
138 lines
5.4 KiB
Rust
//! This example shows how to use the ECS and the [`AsyncComputeTaskPool`]
|
|
//! to spawn, poll, and complete tasks across systems and system ticks.
|
|
|
|
use bevy::{
|
|
ecs::{system::SystemState, world::CommandQueue},
|
|
prelude::*,
|
|
tasks::{block_on, futures_lite::future, AsyncComputeTaskPool, Task},
|
|
};
|
|
use rand::Rng;
|
|
use std::time::Duration;
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(Startup, (setup_env, add_assets, spawn_tasks))
|
|
.add_systems(Update, handle_tasks)
|
|
.run();
|
|
}
|
|
|
|
// Number of cubes to spawn across the x, y, and z axis
|
|
const NUM_CUBES: u32 = 6;
|
|
|
|
#[derive(Resource, Deref)]
|
|
struct BoxMeshHandle(Handle<Mesh>);
|
|
|
|
#[derive(Resource, Deref)]
|
|
struct BoxMaterialHandle(Handle<StandardMaterial>);
|
|
|
|
/// Startup system which runs only once and generates our Box Mesh
|
|
/// and Box Material assets, adds them to their respective Asset
|
|
/// Resources, and stores their handles as resources so we can access
|
|
/// them later when we're ready to render our Boxes
|
|
fn add_assets(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
|
) {
|
|
let box_mesh_handle = meshes.add(Cuboid::new(0.25, 0.25, 0.25));
|
|
commands.insert_resource(BoxMeshHandle(box_mesh_handle));
|
|
|
|
let box_material_handle = materials.add(Color::srgb(1.0, 0.2, 0.3));
|
|
commands.insert_resource(BoxMaterialHandle(box_material_handle));
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct ComputeTransform(Task<CommandQueue>);
|
|
|
|
/// This system generates tasks simulating computationally intensive
|
|
/// work that potentially spans multiple frames/ticks. A separate
|
|
/// system, [`handle_tasks`], will poll the spawned tasks on subsequent
|
|
/// frames/ticks, and use the results to spawn cubes
|
|
fn spawn_tasks(mut commands: Commands) {
|
|
let thread_pool = AsyncComputeTaskPool::get();
|
|
for x in 0..NUM_CUBES {
|
|
for y in 0..NUM_CUBES {
|
|
for z in 0..NUM_CUBES {
|
|
// Spawn new task on the AsyncComputeTaskPool; the task will be
|
|
// executed in the background, and the Task future returned by
|
|
// spawn() can be used to poll for the result
|
|
let entity = commands.spawn_empty().id();
|
|
let task = thread_pool.spawn(async move {
|
|
let duration = Duration::from_secs_f32(rand::thread_rng().gen_range(0.05..5.0));
|
|
|
|
// Pretend this is a time-intensive function. :)
|
|
async_std::task::sleep(duration).await;
|
|
|
|
// Such hard work, all done!
|
|
let transform = Transform::from_xyz(x as f32, y as f32, z as f32);
|
|
let mut command_queue = CommandQueue::default();
|
|
|
|
// we use a raw command queue to pass a FnOnce(&mut World) back to be
|
|
// applied in a deferred manner.
|
|
command_queue.push(move |world: &mut World| {
|
|
let (box_mesh_handle, box_material_handle) = {
|
|
let mut system_state = SystemState::<(
|
|
Res<BoxMeshHandle>,
|
|
Res<BoxMaterialHandle>,
|
|
)>::new(world);
|
|
let (box_mesh_handle, box_material_handle) =
|
|
system_state.get_mut(world);
|
|
|
|
(box_mesh_handle.clone(), box_material_handle.clone())
|
|
};
|
|
|
|
world
|
|
.entity_mut(entity)
|
|
// Add our new `Mesh3d` and `MeshMaterial3d` to our tagged entity
|
|
.insert((
|
|
Mesh3d(box_mesh_handle),
|
|
MeshMaterial3d(box_material_handle),
|
|
transform,
|
|
))
|
|
// Task is complete, so remove task component from entity
|
|
.remove::<ComputeTransform>();
|
|
});
|
|
|
|
command_queue
|
|
});
|
|
|
|
// Spawn new entity and add our new task as a component
|
|
commands.entity(entity).insert(ComputeTransform(task));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// This system queries for entities that have our Task<Transform> component. It polls the
|
|
/// tasks to see if they're complete. If the task is complete it takes the result, adds a
|
|
/// new [`Mesh3d`] and [`MeshMaterial3d`] to the entity using the result from the task's work, and
|
|
/// removes the task component from the entity.
|
|
fn handle_tasks(mut commands: Commands, mut transform_tasks: Query<&mut ComputeTransform>) {
|
|
for mut task in &mut transform_tasks {
|
|
if let Some(mut commands_queue) = block_on(future::poll_once(&mut task.0)) {
|
|
// append the returned command queue to have it execute later
|
|
commands.append(&mut commands_queue);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// This system is only used to setup light and camera for the environment
|
|
fn setup_env(mut commands: Commands) {
|
|
// Used to center camera on spawned cubes
|
|
let offset = if NUM_CUBES % 2 == 0 {
|
|
(NUM_CUBES / 2) as f32 - 0.5
|
|
} else {
|
|
(NUM_CUBES / 2) as f32
|
|
};
|
|
|
|
// lights
|
|
commands.spawn((PointLight::default(), Transform::from_xyz(4.0, 12.0, 15.0)));
|
|
|
|
// camera
|
|
commands.spawn(Camera3dBundle {
|
|
transform: Transform::from_xyz(offset, offset, 15.0)
|
|
.looking_at(Vec3::new(offset, offset, 0.0), Vec3::Y),
|
|
..default()
|
|
});
|
|
}
|