mirror of
https://github.com/bevyengine/bevy
synced 2024-11-15 09:27:41 +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>
136 lines
4.8 KiB
Rust
136 lines
4.8 KiB
Rust
//! Meshlet rendering for dense high-poly scenes (experimental).
|
|
|
|
// Note: This example showcases the meshlet API, but is not the type of scene that would benefit from using meshlets.
|
|
|
|
#[path = "../helpers/camera_controller.rs"]
|
|
mod camera_controller;
|
|
|
|
use bevy::{
|
|
pbr::{
|
|
experimental::meshlet::{MaterialMeshletMeshBundle, MeshletPlugin},
|
|
CascadeShadowConfigBuilder, DirectionalLightShadowMap,
|
|
},
|
|
prelude::*,
|
|
render::render_resource::AsBindGroup,
|
|
};
|
|
use camera_controller::{CameraController, CameraControllerPlugin};
|
|
use std::{f32::consts::PI, path::Path, process::ExitCode};
|
|
|
|
const ASSET_URL: &str =
|
|
"https://raw.githubusercontent.com/JMS55/bevy_meshlet_asset/854eb98353ad94aea1104f355fc24dbe4fda679d/bunny.meshlet_mesh";
|
|
|
|
fn main() -> ExitCode {
|
|
if !Path::new("./assets/models/bunny.meshlet_mesh").exists() {
|
|
eprintln!("ERROR: Asset at path <bevy>/assets/models/bunny.meshlet_mesh is missing. Please download it from {ASSET_URL}");
|
|
return ExitCode::FAILURE;
|
|
}
|
|
|
|
App::new()
|
|
.insert_resource(DirectionalLightShadowMap { size: 4096 })
|
|
.add_plugins((
|
|
DefaultPlugins,
|
|
MeshletPlugin {
|
|
cluster_buffer_slots: 8192,
|
|
},
|
|
MaterialPlugin::<MeshletDebugMaterial>::default(),
|
|
CameraControllerPlugin,
|
|
))
|
|
.add_systems(Startup, setup)
|
|
.run();
|
|
|
|
ExitCode::SUCCESS
|
|
}
|
|
|
|
fn setup(
|
|
mut commands: Commands,
|
|
asset_server: Res<AssetServer>,
|
|
mut standard_materials: ResMut<Assets<StandardMaterial>>,
|
|
mut debug_materials: ResMut<Assets<MeshletDebugMaterial>>,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
) {
|
|
commands.spawn((
|
|
Camera3dBundle {
|
|
transform: Transform::from_translation(Vec3::new(1.8, 0.4, -0.1))
|
|
.looking_at(Vec3::ZERO, Vec3::Y),
|
|
msaa: Msaa::Off,
|
|
..default()
|
|
},
|
|
EnvironmentMapLight {
|
|
diffuse_map: asset_server.load("environment_maps/pisa_diffuse_rgb9e5_zstd.ktx2"),
|
|
specular_map: asset_server.load("environment_maps/pisa_specular_rgb9e5_zstd.ktx2"),
|
|
intensity: 150.0,
|
|
..default()
|
|
},
|
|
CameraController::default(),
|
|
));
|
|
|
|
commands.spawn((
|
|
DirectionalLight {
|
|
illuminance: light_consts::lux::FULL_DAYLIGHT,
|
|
shadows_enabled: true,
|
|
..default()
|
|
},
|
|
CascadeShadowConfigBuilder {
|
|
num_cascades: 1,
|
|
maximum_distance: 15.0,
|
|
..default()
|
|
}
|
|
.build(),
|
|
Transform::from_rotation(Quat::from_euler(EulerRot::ZYX, 0.0, PI * -0.15, PI * -0.15)),
|
|
));
|
|
|
|
// A custom file format storing a [`bevy_render::mesh::Mesh`]
|
|
// that has been converted to a [`bevy_pbr::meshlet::MeshletMesh`]
|
|
// using [`bevy_pbr::meshlet::MeshletMesh::from_mesh`], which is
|
|
// a function only available when the `meshlet_processor` cargo feature is enabled.
|
|
let meshlet_mesh_handle = asset_server.load("models/bunny.meshlet_mesh");
|
|
let debug_material = debug_materials.add(MeshletDebugMaterial::default());
|
|
|
|
for x in -2..=2 {
|
|
commands.spawn(MaterialMeshletMeshBundle {
|
|
meshlet_mesh: meshlet_mesh_handle.clone(),
|
|
material: standard_materials.add(StandardMaterial {
|
|
base_color: match x {
|
|
-2 => Srgba::hex("#dc2626").unwrap().into(),
|
|
-1 => Srgba::hex("#ea580c").unwrap().into(),
|
|
0 => Srgba::hex("#facc15").unwrap().into(),
|
|
1 => Srgba::hex("#16a34a").unwrap().into(),
|
|
2 => Srgba::hex("#0284c7").unwrap().into(),
|
|
_ => unreachable!(),
|
|
},
|
|
perceptual_roughness: (x + 2) as f32 / 4.0,
|
|
..default()
|
|
}),
|
|
transform: Transform::default()
|
|
.with_scale(Vec3::splat(0.2))
|
|
.with_translation(Vec3::new(x as f32 / 2.0, 0.0, -0.3)),
|
|
..default()
|
|
});
|
|
}
|
|
for x in -2..=2 {
|
|
commands.spawn(MaterialMeshletMeshBundle {
|
|
meshlet_mesh: meshlet_mesh_handle.clone(),
|
|
material: debug_material.clone(),
|
|
transform: Transform::default()
|
|
.with_scale(Vec3::splat(0.2))
|
|
.with_rotation(Quat::from_rotation_y(PI))
|
|
.with_translation(Vec3::new(x as f32 / 2.0, 0.0, 0.3)),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
commands.spawn((
|
|
Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
|
|
MeshMaterial3d(standard_materials.add(StandardMaterial {
|
|
base_color: Color::WHITE,
|
|
perceptual_roughness: 1.0,
|
|
..default()
|
|
})),
|
|
));
|
|
}
|
|
|
|
#[derive(Asset, TypePath, AsBindGroup, Clone, Default)]
|
|
struct MeshletDebugMaterial {
|
|
_dummy: (),
|
|
}
|
|
impl Material for MeshletDebugMaterial {}
|